diff options
author | Julia Lawall <Julia.Lawall@lip6.fr> | 2013-08-14 05:11:21 -0400 |
---|---|---|
committer | Alexandre Belloni <alexandre.belloni@free-electrons.com> | 2015-06-24 19:13:40 -0400 |
commit | e044253b3b4fb5a8b275202511a4d9765ac0a982 (patch) | |
tree | 9e78c4ac9b33cbf7ade90a34bc3b26de011e8a75 /drivers/rtc/rtc-ds1286.c | |
parent | 538330ccb93849530f5617d1fa870237496caa60 (diff) |
rtc: simplify use of devm_ioremap_resource
Remove unneeded error handling on the result of a call to
platform_get_resource when the value is passed to devm_ioremap_resource.
Move the call to platform_get_resource adjacent to the call to
devm_ioremap_resource to make the connection between them more clear.
A simplified version of the semantic patch that makes this change is as
follows: (http://coccinelle.lip6.fr/)
// <smpl>
@@
expression pdev,res,n,e,e1;
expression ret != 0;
identifier l;
@@
- res = platform_get_resource(pdev, IORESOURCE_MEM, n);
... when != res
- if (res == NULL) { ... \(goto l;\|return ret;\) }
... when != res
+ res = platform_get_resource(pdev, IORESOURCE_MEM, n);
e = devm_ioremap_resource(e1, res);
// </smpl>
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
[viresh.kumar@linaro.org: acked rtc-spear]
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Diffstat (limited to 'drivers/rtc/rtc-ds1286.c')
-rw-r--r-- | drivers/rtc/rtc-ds1286.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/rtc/rtc-ds1286.c b/drivers/rtc/rtc-ds1286.c index 2fe537f4e2bd..8247a29a4eb4 100644 --- a/drivers/rtc/rtc-ds1286.c +++ b/drivers/rtc/rtc-ds1286.c | |||
@@ -332,13 +332,11 @@ static int ds1286_probe(struct platform_device *pdev) | |||
332 | struct resource *res; | 332 | struct resource *res; |
333 | struct ds1286_priv *priv; | 333 | struct ds1286_priv *priv; |
334 | 334 | ||
335 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); | ||
336 | if (!res) | ||
337 | return -ENODEV; | ||
338 | priv = devm_kzalloc(&pdev->dev, sizeof(struct ds1286_priv), GFP_KERNEL); | 335 | priv = devm_kzalloc(&pdev->dev, sizeof(struct ds1286_priv), GFP_KERNEL); |
339 | if (!priv) | 336 | if (!priv) |
340 | return -ENOMEM; | 337 | return -ENOMEM; |
341 | 338 | ||
339 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); | ||
342 | priv->rtcregs = devm_ioremap_resource(&pdev->dev, res); | 340 | priv->rtcregs = devm_ioremap_resource(&pdev->dev, res); |
343 | if (IS_ERR(priv->rtcregs)) | 341 | if (IS_ERR(priv->rtcregs)) |
344 | return PTR_ERR(priv->rtcregs); | 342 | return PTR_ERR(priv->rtcregs); |