hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Alexandru Ardelean 2020-11-20 10:42:06 +02:00 committed by Greg Kroah-Hartman
parent 023c9c6dc2
commit 6b76c98b96
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/uio/uio_mf624.c
View File

@ -136,12 +136,12 @@ static int mf624_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
{ {
struct uio_info *info; 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) if (!info)
return -ENOMEM; return -ENOMEM;
if (pci_enable_device(dev)) if (pci_enable_device(dev))
goto out_free; return -ENODEV;
if (pci_request_regions(dev, "mf624")) if (pci_request_regions(dev, "mf624"))
goto out_disable; goto out_disable;
@ -189,8 +189,6 @@ out_release:
out_disable: out_disable:
pci_disable_device(dev); pci_disable_device(dev);
out_free:
kfree(info);
return -ENODEV; return -ENODEV;
} }
@ -207,8 +205,6 @@ static void mf624_pci_remove(struct pci_dev *dev)
iounmap(info->mem[0].internal_addr); iounmap(info->mem[0].internal_addr);
iounmap(info->mem[1].internal_addr); iounmap(info->mem[1].internal_addr);
iounmap(info->mem[2].internal_addr); iounmap(info->mem[2].internal_addr);
kfree(info);
} }
static const struct pci_device_id mf624_pci_id[] = { static const struct pci_device_id mf624_pci_id[] = {