diff options
| author | Alexandru Ardelean <alexandru.ardelean@analog.com> | 2020-11-20 10:42:06 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-12-09 19:58:54 +0100 |
| commit | 6b76c98b96bd619092a89da1c1e25e5cb0ccc46a (patch) | |
| tree | 45f475315918fcbd5ba5a2767cbaf8e3574560b6 | |
| parent | 023c9c6dc2c414f1bef2e9ee649fb2e459f52326 (diff) | |
uio: uio_mf624: use devm_kzalloc() for uio_info object
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>
| -rw-r--r-- | drivers/uio/uio_mf624.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/uio/uio_mf624.c b/drivers/uio/uio_mf624.c index b6a406986667..5065c6a073a8 100644 --- a/drivers/uio/uio_mf624.c +++ b/drivers/uio/uio_mf624.c @@ -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[] = { |