ARM: Convert to devm_ioremap_resource()

Convert all uses of devm_request_and_ioremap() to the newly introduced
devm_ioremap_resource() which provides more consistent error handling.

Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
Cc: Russell King <linux@arm.linux.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 3 insertions, 5 deletions

diff --git a/arch/arm/plat-omap/dmtimer.c b/arch/arm/plat-omap/dmtimer.c
index 7b433f3bddca..a0daa2fb5de6 100644
--- a/arch/arm/plat-omap/dmtimer.c
+++ b/arch/arm/plat-omap/dmtimer.c
@@ -808,11 +808,9 @@ static int omap_dm_timer_probe(struct platform_device *pdev)
                 return  -ENOMEM;
         }
 
-        timer->io_base = devm_request_and_ioremap(dev, mem);
-        if (!timer->io_base) {
-                dev_err(dev, "%s: region already claimed.\n", __func__);
-                return -ENOMEM;
-        }
+        timer->io_base = devm_ioremap_resource(dev, mem);
+        if (IS_ERR(timer->io_base))
+                return PTR_ERR(timer->io_base);
 
         if (dev->of_node) {
                 if (of_find_property(dev->of_node, "ti,timer-alwon", NULL))