2020-11-19 15:47:39

by Alexandru Ardelean

Subject: [PATCH 1/4] uio: uio_cif: use devm_kzalloc() for uio_info object

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 <[email protected]>
---
drivers/uio/uio_cif.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/drivers/uio/uio_cif.c b/drivers/uio/uio_cif.c
index ab60186f9759..653f842a1491 100644
--- a/drivers/uio/uio_cif.c
+++ b/drivers/uio/uio_cif.c
@@ -43,12 +43,12 @@ static int hilscher_pci_probe(struct pci_dev *dev,
{
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, "hilscher"))
goto out_disable;
@@ -92,8 +92,6 @@ static int hilscher_pci_probe(struct pci_dev *dev,
pci_release_regions(dev);
out_disable:
pci_disable_device(dev);
-out_free:
- kfree (info);
return -ENODEV;
}

@@ -105,8 +103,6 @@ static void hilscher_pci_remove(struct pci_dev *dev)
pci_release_regions(dev);
pci_disable_device(dev);
iounmap(info->mem[0].internal_addr);
-
- kfree (info);
}

static struct pci_device_id hilscher_pci_ids[] = {
--
2.17.1

2020-11-19 15:48:00

by Alexandru Ardelean

Subject: [PATCH 4/4] uio: uio_hv_generic: use devm_kzalloc() for private data alloc

This is a minor cleanup for the management of the private object of this
driver. The allocation can be tied to the life-time of the hv_device
object.
This cleans up a bit the exit & error paths, since the object doesn't need
to be explicitly free'd anymore.

Signed-off-by: Alexandru Ardelean <[email protected]>
---
drivers/uio/uio_hv_generic.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/drivers/uio/uio_hv_generic.c b/drivers/uio/uio_hv_generic.c
index 4dae2320b103..0330ba99730e 100644
--- a/drivers/uio/uio_hv_generic.c
+++ b/drivers/uio/uio_hv_generic.c
@@ -247,14 +247,14 @@ hv_uio_probe(struct hv_device *dev,
return -ENOTSUPP;
}

- pdata = kzalloc(sizeof(*pdata), GFP_KERNEL);
+ pdata = devm_kzalloc(&dev->device, sizeof(*pdata), GFP_KERNEL);
if (!pdata)
return -ENOMEM;

ret = vmbus_alloc_ring(channel, HV_RING_SIZE * PAGE_SIZE,
HV_RING_SIZE * PAGE_SIZE);
if (ret)
- goto fail;
+ return ret;

set_channel_read_mode(channel, HV_CALL_ISR);

@@ -347,8 +347,6 @@ hv_uio_probe(struct hv_device *dev,

fail_close:
hv_uio_cleanup(dev, pdata);
-fail:
- kfree(pdata);

return ret;
}
@@ -364,10 +362,8 @@ hv_uio_remove(struct hv_device *dev)
sysfs_remove_bin_file(&dev->channel->kobj, &ring_buffer_bin_attr);
uio_unregister_device(&pdata->info);
hv_uio_cleanup(dev, pdata);
- hv_set_drvdata(dev, NULL);

vmbus_free_ring(dev->channel);
- kfree(pdata);
return 0;
}

--
2.17.1