uio: uio_cif: use devm_kzalloc() for uio_info object
authorAlexandru Ardelean <alexandru.ardelean@analog.com>
Thu, 19 Nov 2020 15:49:00 +0000 (17:49 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 9 Dec 2020 18:59:00 +0000 (19:59 +0100)
The uio_info object is free'd last, so it's life-time is tied PCI device
object. Using devm_kzalloc() cleans up the error path a bit and the exit
path.

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

index ab60186..653f842 100644 (file)
@@ -43,12 +43,12 @@ static int hilscher_pci_probe(struct pci_dev *dev,
 {
        struct uio_info *info;
 
-       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, "hilscher"))
                goto out_disable;
@@ -92,8 +92,6 @@ out_release:
        pci_release_regions(dev);
 out_disable:
        pci_disable_device(dev);
-out_free:
-       kfree (info);
        return -ENODEV;
 }
 
@@ -105,8 +103,6 @@ static void hilscher_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 hilscher_pci_ids[] = {