]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
staging: axis-fifo: Use devm_kasprintf for device name allocation
authorOvidiu Panait <ovidiu.panait.oss@gmail.com>
Sat, 27 Dec 2025 21:26:34 +0000 (23:26 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 11 Jan 2026 12:54:12 +0000 (13:54 +0100)
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>
drivers/staging/axis-fifo/axis-fifo.c

index b9b2700410b86c9d5adb233cac11e3f10ccd1534..d49bb401a227505e9b9e2a493d4d86b7a3302a2c 100644 (file)
@@ -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);