uio: uio_sercos3: use device-managed functions for simple allocs (023c9c6d) · Commits · 戴 / test

This change converts the simple allocations [kzalloc()] to devm_kzalloc() tying the life-time of these objects to the PCI device object. It cleans up the error and exit path and bit, and does a minor correction that -ENOMEM is returned (vs -ENODEV) in case the 'priv' object cannot be allocated. Signed-off-by:

Alexandru Ardelean <alexandru.ardelean@analog.com> Link: https://lore.kernel.org/r/20201120084207.50736-1-alexandru.ardelean@analog.com Signed-off-by:

Greg Kroah-Hartman <gregkh@linuxfoundation.org>

drivers/uio/uio_sercos3.c

+4 −10

Original line number	Diff line number	Diff line
		@@ -124,16 +124,16 @@ static int sercos3_pci_probe(struct pci_dev *dev,
		struct sercos3_priv *priv;
		int i;

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

		priv = kzalloc(sizeof(struct sercos3_priv), GFP_KERNEL);
		priv = devm_kzalloc(&dev->dev, sizeof(struct sercos3_priv), GFP_KERNEL);
		if (!priv)
		goto out_free;
		return -ENOMEM;

		if (pci_enable_device(dev))
		goto out_free_priv;
		return -ENODEV;

		if (pci_request_regions(dev, "sercos3"))
		goto out_disable;
		@@ -174,10 +174,6 @@ out_unmap:
		pci_release_regions(dev);
		out_disable:
		pci_disable_device(dev);
		out_free_priv:
		kfree(priv);
		out_free:
		kfree(info);
		return -ENODEV;
		}

		@@ -193,8 +189,6 @@ static void sercos3_pci_remove(struct pci_dev *dev)
		if (info->mem[i].internal_addr)
		iounmap(info->mem[i].internal_addr);
		}
		kfree(info->priv);
		kfree(info);
		}

		static struct pci_device_id sercos3_pci_ids[] = {

Admin message