uio: uio_mf624: use devm_kzalloc() for uio_info object (6b76c98b) · Commits · 戴 / test

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

Greg Kroah-Hartman <gregkh@linuxfoundation.org>

drivers/uio/uio_mf624.c

+2 −6

Original line number	Diff line number	Diff line
		@@ -136,12 +136,12 @@ static int mf624_pci_probe(struct pci_dev dev, const struct pci_device_id id)
		{
		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, "mf624"))
		goto out_disable;
		@@ -189,8 +189,6 @@ out_release:
		out_disable:
		pci_disable_device(dev);

		out_free:
		kfree(info);
		return -ENODEV;
		}

		@@ -207,8 +205,6 @@ static void mf624_pci_remove(struct pci_dev *dev)
		iounmap(info->mem[0].internal_addr);
		iounmap(info->mem[1].internal_addr);
		iounmap(info->mem[2].internal_addr);

		kfree(info);
		}

		static const struct pci_device_id mf624_pci_id[] = {

Admin message