uio: uio_aec: use devm_kzalloc() for uio_info object (16d546c4) · Commits · 戴 / test

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-2-alexandru.ardelean@analog.com Signed-off-by:

Greg Kroah-Hartman <gregkh@linuxfoundation.org>

drivers/uio/uio_aec.c

+2 −6

Original line number	Diff line number	Diff line
		@@ -71,12 +71,12 @@ static int probe(struct pci_dev pdev, const struct pci_device_id id)
		struct uio_info *info;
		int ret;

		info = kzalloc(sizeof(struct uio_info), GFP_KERNEL);
		info = devm_kzalloc(&pdev->dev, sizeof(struct uio_info), GFP_KERNEL);
		if (!info)
		return -ENOMEM;

		if (pci_enable_device(pdev))
		goto out_free;
		return -ENODEV;

		if (pci_request_regions(pdev, "aectc"))
		goto out_disable;
		@@ -117,8 +117,6 @@ out_release:
		pci_release_regions(pdev);
		out_disable:
		pci_disable_device(pdev);
		out_free:
		kfree(info);
		return -ENODEV;
		}

		@@ -136,8 +134,6 @@ static void remove(struct pci_dev *pdev)
		pci_release_regions(pdev);
		pci_disable_device(pdev);
		iounmap(info->priv);

		kfree(info);
		}

		static struct pci_driver pci_driver = {

Admin message