lkml.org 
[lkml]   [2017]   [Mar]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 3/5] drivers/rtc/rtc-pl031.c: Convert to use devm_*()
Date
Convert driver to use devm_*() APIs so rely on driver model core layer
to manage resources. This eliminates error path boilerplate and makes
code neat.

Signed-off-by: Leo Yan <leo.yan@linaro.org>
---
drivers/rtc/rtc-pl031.c | 59 +++++++++++++------------------------------------
1 file changed, 15 insertions(+), 44 deletions(-)

diff --git a/drivers/rtc/rtc-pl031.c b/drivers/rtc/rtc-pl031.c
index e1687e1..1699a17 100644
--- a/drivers/rtc/rtc-pl031.c
+++ b/drivers/rtc/rtc-pl031.c
@@ -304,15 +304,8 @@ static int pl031_set_alarm(struct device *dev, struct rtc_wkalrm *alarm)

static int pl031_remove(struct amba_device *adev)
{
- struct pl031_local *ldata = dev_get_drvdata(&adev->dev);
-
dev_pm_clear_wake_irq(&adev->dev);
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;
}
@@ -325,23 +318,15 @@ static int pl031_probe(struct amba_device *adev, const struct amba_id *id)
struct rtc_class_ops *ops = &vendor->ops;
unsigned long time, data;

- ret = amba_request_regions(adev, NULL);
- if (ret)
- goto err_req;
+ ldata = devm_kzalloc(&adev->dev, sizeof(*ldata), GFP_KERNEL);
+ if (!ldata)
+ return -ENOMEM;

- ldata = kzalloc(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));
-
- if (!ldata->base) {
- ret = -ENOMEM;
- goto out_no_remap;
- }
+ ldata->base = devm_ioremap_resource(&adev->dev, &adev->res);
+ if (IS_ERR(ldata->base))
+ return PTR_ERR(ldata->base);

amba_set_drvdata(adev, ldata);

@@ -374,32 +359,18 @@ static int pl031_probe(struct amba_device *adev, const struct amba_id *id)
}

device_init_wakeup(&adev->dev, true);
- ldata->rtc = rtc_device_register("pl031", &adev->dev, ops,
- THIS_MODULE);
- if (IS_ERR(ldata->rtc)) {
- ret = PTR_ERR(ldata->rtc);
- goto out_no_rtc;
- }
+ ldata->rtc = devm_rtc_device_register(&adev->dev, "pl031", ops,
+ THIS_MODULE);
+ if (IS_ERR(ldata->rtc))
+ return PTR_ERR(ldata->rtc);
+
+ ret = devm_request_irq(&adev->dev, adev->irq[0], pl031_interrupt,
+ vendor->irqflags, "rtc-pl031", ldata);
+ if (ret)
+ return ret;

- if (request_irq(adev->irq[0], pl031_interrupt,
- vendor->irqflags, "rtc-pl031", ldata)) {
- ret = -EIO;
- goto out_no_irq;
- }
dev_pm_set_wake_irq(&adev->dev, adev->irq[0]);
return 0;
-
-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:
-
- return ret;
}

/* Operations for the original ARM version */
--
2.7.4
\
 
 \ /
  Last update: 2017-03-26 16:44    [W:0.111 / U:11.308 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site