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/mach-tegra/tegra2_emc.c b/arch/arm/mach-tegra/tegra2_emc.c
index e18aa2f83ebf..ce7ce42a1ac9 100644
--- a/arch/arm/mach-tegra/tegra2_emc.c
+++ b/arch/arm/mach-tegra/tegra2_emc.c
@@ -312,11 +312,9 @@ static int tegra_emc_probe(struct platform_device *pdev)
                 return -ENOMEM;
         }
 
-        emc_regbase = devm_request_and_ioremap(&pdev->dev, res);
-        if (!emc_regbase) {
-                dev_err(&pdev->dev, "failed to remap registers\n");
-                return -ENOMEM;
-        }
+        emc_regbase = devm_ioremap_resource(&pdev->dev, res);
+        if (IS_ERR(emc_regbase))
+                return PTR_ERR(emc_regbase);
 
         pdata = pdev->dev.platform_data;