uio: uio_netx: use devm_kzalloc() for or uio_info object
authorAlexandru Ardelean <alexandru.ardelean@analog.com>
Fri, 20 Nov 2020 08:42:07 +0000 (10:42 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 9 Dec 2020 18:58:54 +0000 (19:58 +0100)
This change uses the devm_kzalloc() function to tie the life-time of the
uio_info object to PCI device. This cleans up the exit & error path a bit.

Signed-off-by: Alexandru Ardelean <alexandru.ardelean@analog.com>
Link: https://lore.kernel.org/r/20201120084207.50736-3-alexandru.ardelean@analog.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/uio/uio_netx.c

index 9ae29ff..2319d6d 100644 (file)
@@ -53,12 +53,12 @@ static int netx_pci_probe(struct pci_dev *dev,
        struct uio_info *info;
        int bar;
 
-       info = kzalloc(sizeof(struct uio_info), GFP_KERNEL);
+       info = devm_kzalloc(&dev->dev, sizeof(struct uio_info), GFP_KERNEL);
        if (!info)
                return -ENOMEM;
 
        if (pci_enable_device(dev))
-               goto out_free;
+               return -ENODEV;
 
        if (pci_request_regions(dev, "netx"))
                goto out_disable;
@@ -112,8 +112,6 @@ out_release:
        pci_release_regions(dev);
 out_disable:
        pci_disable_device(dev);
-out_free:
-       kfree(info);
        return -ENODEV;
 }
 
@@ -127,8 +125,6 @@ static void netx_pci_remove(struct pci_dev *dev)
        pci_release_regions(dev);
        pci_disable_device(dev);
        iounmap(info->mem[0].internal_addr);
-
-       kfree(info);
 }
 
 static struct pci_device_id netx_pci_ids[] = {