| Message ID | E1dYKiF-0001kS-1w@rmk-PC.armlinux.org.uk |
|---|---|
| State | Changes Requested |
| Headers | show |
On Fri, Jul 21, 2017 at 1:18 AM, Russell King <rmk+kernel@armlinux.org.uk> wrote: > Use the devm_* APIs for allocating memory and mapping the memory in > the probe function to relieve the driver from having to deal with > this in the cleanup paths. > > Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Yours, Linus Walleij
Hi Russell, On 21/07/2017 at 00:18:31 +0100, Russell King wrote: > Use the devm_* APIs for allocating memory and mapping the memory in > the probe function to relieve the driver from having to deal with > this in the cleanup paths. > > Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> > --- > drivers/rtc/rtc-pl031.c | 19 +++++++------------ > 1 file changed, 7 insertions(+), 12 deletions(-) > > diff --git a/drivers/rtc/rtc-pl031.c b/drivers/rtc/rtc-pl031.c > index 0d87b90b1903..5960fbd08b05 100644 > --- a/drivers/rtc/rtc-pl031.c > +++ b/drivers/rtc/rtc-pl031.c > @@ -310,8 +310,6 @@ static int pl031_remove(struct amba_device *adev) > device_init_wakeup(&adev->dev, false); > free_irq(adev->irq[0], ldata); > rtc_device_unregister(ldata->rtc); > - iounmap(ldata->base); > - kfree(ldata); > amba_release_regions(adev); > > return 0; > @@ -322,25 +320,26 @@ static int pl031_probe(struct amba_device *adev, const struct amba_id *id) > int ret; > struct pl031_local *ldata; > struct pl031_vendor_data *vendor = id->data; > - struct rtc_class_ops *ops = &vendor->ops; > + struct rtc_class_ops *ops; This change should probably go in patch 3/4
diff --git a/drivers/rtc/rtc-pl031.c b/drivers/rtc/rtc-pl031.c index 0d87b90b1903..5960fbd08b05 100644 --- a/drivers/rtc/rtc-pl031.c +++ b/drivers/rtc/rtc-pl031.c @@ -310,8 +310,6 @@ static int pl031_remove(struct amba_device *adev) device_init_wakeup(&adev->dev, false); free_irq(adev->irq[0], ldata); rtc_device_unregister(ldata->rtc); - iounmap(ldata->base); - kfree(ldata); amba_release_regions(adev); return 0; @@ -322,25 +320,26 @@ static int pl031_probe(struct amba_device *adev, const struct amba_id *id) int ret; struct pl031_local *ldata; struct pl031_vendor_data *vendor = id->data; - struct rtc_class_ops *ops = &vendor->ops; + struct rtc_class_ops *ops; unsigned long time, data; ret = amba_request_regions(adev, NULL); if (ret) goto err_req; - ldata = kzalloc(sizeof(struct pl031_local), GFP_KERNEL); + ldata = devm_kzalloc(&adev->dev, sizeof(struct pl031_local), + GFP_KERNEL); if (!ldata) { ret = -ENOMEM; goto out; } ldata->vendor = vendor; - ldata->base = ioremap(adev->res.start, resource_size(&adev->res)); - + ldata->base = devm_ioremap(&adev->dev, adev->res.start, + resource_size(&adev->res)); if (!ldata->base) { ret = -ENOMEM; - goto out_no_remap; + goto out; } amba_set_drvdata(adev, ldata); @@ -378,7 +377,7 @@ static int pl031_probe(struct amba_device *adev, const struct amba_id *id) THIS_MODULE); if (IS_ERR(ldata->rtc)) { ret = PTR_ERR(ldata->rtc); - goto out_no_rtc; + goto out; } if (request_irq(adev->irq[0], pl031_interrupt, @@ -391,10 +390,6 @@ static int pl031_probe(struct amba_device *adev, const struct amba_id *id) out_no_irq: rtc_device_unregister(ldata->rtc); -out_no_rtc: - iounmap(ldata->base); -out_no_remap: - kfree(ldata); out: amba_release_regions(adev); err_req:
Use the devm_* APIs for allocating memory and mapping the memory in the probe function to relieve the driver from having to deal with this in the cleanup paths. Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> --- drivers/rtc/rtc-pl031.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-)