rtc: simplify devm_request_mem_region/devm_ioremap

Convert the composition of devm_request_mem_region and devm_ioremap to a
single call to devm_ioremap_resource.  The associated call to
platform_get_resource is also simplified and moved next to the new call
to devm_ioremap_resource.

This was done using a combination of the semantic patches
devm_ioremap_resource.cocci and devm_request_and_ioremap.cocci, found in
the scripts/coccinelle/api directory.

In rtc-lpc32xx.c and rtc-mv.c, the local variable size is no longer needed.

In rtc-ds1511.c the size field of the local structure is not useful any
more, and is deleted.

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 5 insertions, 12 deletions

diff --git a/drivers/rtc/rtc-ds1511.c b/drivers/rtc/rtc-ds1511.c
index 308a8fefe76f..bc7b4fcf603c 100644
--- a/drivers/rtc/rtc-ds1511.c
+++ b/drivers/rtc/rtc-ds1511.c
@@ -89,7 +89,6 @@ enum ds1511reg {
 struct rtc_plat_data {
         struct rtc_device *rtc;
         void __iomem *ioaddr;           /* virtual base address */
-        int size;                               /* amount of memory mapped */
         int irq;
         unsigned int irqen;
         int alrm_sec;
@@ -479,20 +478,14 @@ static int ds1511_rtc_probe(struct platform_device *pdev)
         struct rtc_plat_data *pdata;
         int ret = 0;
 
-        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        if (!res)
-                return -ENODEV;
-
         pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
         if (!pdata)
                 return -ENOMEM;
-        pdata->size = resource_size(res);
-        if (!devm_request_mem_region(&pdev->dev, res->start, pdata->size,
-                        pdev->name))
-                return -EBUSY;
-        ds1511_base = devm_ioremap(&pdev->dev, res->start, pdata->size);
-        if (!ds1511_base)
-                return -ENOMEM;
+
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        ds1511_base = devm_ioremap_resource(&pdev->dev, res);
+        if (IS_ERR(ds1511_base))
+                return PTR_ERR(ds1511_base);
         pdata->ioaddr = ds1511_base;
         pdata->irq = platform_get_irq(pdev, 0);