summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOvidiu Panait <ovidiu.panait.oss@gmail.com>2025-12-28 00:26:34 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2026-01-11 15:54:12 +0300
commiteb12093d42bae0522c3358cdae44319f9ada1b56 (patch)
tree2a953e027eb831cafc6e1ed2f8c9985c4a1c9f56
parentc83d8445f3b6272f712494e0ab2124c000903811 (diff)
downloadlinux-eb12093d42bae0522c3358cdae44319f9ada1b56.tar.xz
staging: axis-fifo: Use devm_kasprintf for device name allocation
Replace manual kzalloc + snprintf with devm_kasprintf, which is cleaner and purpose-built for this use case. Signed-off-by: Ovidiu Panait <ovidiu.panait.oss@gmail.com> Link: https://patch.msgid.link/20251227212640.3321310-3-ovidiu.panait.oss@gmail.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/axis-fifo/axis-fifo.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/drivers/staging/axis-fifo/axis-fifo.c b/drivers/staging/axis-fifo/axis-fifo.c
index b9b2700410b8..d49bb401a227 100644
--- a/drivers/staging/axis-fifo/axis-fifo.c
+++ b/drivers/staging/axis-fifo/axis-fifo.c
@@ -537,7 +537,6 @@ static int axis_fifo_probe(struct platform_device *pdev)
struct resource *r_mem; /* IO mem resources */
struct device *dev = &pdev->dev; /* OS device (from device tree) */
struct axis_fifo *fifo = NULL;
- char *device_name;
int rc = 0; /* error return value */
int irq;
@@ -546,10 +545,6 @@ static int axis_fifo_probe(struct platform_device *pdev)
* ----------------------------
*/
- device_name = devm_kzalloc(dev, 32, GFP_KERNEL);
- if (!device_name)
- return -ENOMEM;
-
/* allocate device wrapper memory */
fifo = devm_kzalloc(dev, sizeof(*fifo), GFP_KERNEL);
if (!fifo)
@@ -612,13 +607,17 @@ static int axis_fifo_probe(struct platform_device *pdev)
if (fifo->id < 0)
return fifo->id;
- snprintf(device_name, 32, "%s%d", DRIVER_NAME, fifo->id);
-
/* create character device */
fifo->miscdev.fops = &fops;
fifo->miscdev.minor = MISC_DYNAMIC_MINOR;
- fifo->miscdev.name = device_name;
fifo->miscdev.parent = dev;
+ fifo->miscdev.name = devm_kasprintf(dev, GFP_KERNEL, "%s%d",
+ DRIVER_NAME, fifo->id);
+ if (!fifo->miscdev.name) {
+ ida_free(&axis_fifo_ida, fifo->id);
+ return -ENOMEM;
+ }
+
rc = misc_register(&fifo->miscdev);
if (rc < 0) {
ida_free(&axis_fifo_ida, fifo->id);