memory: 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.

devm_ioremap_resource() provides its own error messages so all explicit
error messages can be removed from the failure code paths.

Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

3 files changed, 11 insertions, 11 deletions

diff --git a/drivers/memory/emif.c b/drivers/memory/emif.c
index 06d31c99e6ac..df0873694858 100644
--- a/drivers/memory/emif.c
+++ b/drivers/memory/emif.c
@@ -10,6 +10,7 @@
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
+#include <linux/err.h>
 #include <linux/kernel.h>
 #include <linux/reboot.h>
 #include <linux/platform_data/emif_plat.h>
@@ -1468,12 +1469,9 @@ static int __init_or_module emif_probe(struct platform_device *pdev)
                 goto error;
         }
 
-        emif->base = devm_request_and_ioremap(emif->dev, res);
-        if (!emif->base) {
-                dev_err(emif->dev, "%s: devm_request_and_ioremap() failed\n",
-                        __func__);
+        emif->base = devm_ioremap_resource(emif->dev, res);
+        if (IS_ERR(emif->base))
                 goto error;
-        }
 
         irq = platform_get_irq(pdev, 0);
         if (irq < 0) {
diff --git a/drivers/memory/tegra20-mc.c b/drivers/memory/tegra20-mc.c
index 186f27d9e5f1..2ca5f2814f4a 100644
--- a/drivers/memory/tegra20-mc.c
+++ b/drivers/memory/tegra20-mc.c
@@ -17,6 +17,7 @@
  * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include <linux/err.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/ratelimit.h>
@@ -216,9 +217,9 @@ static int tegra20_mc_probe(struct platform_device *pdev)
                 res = platform_get_resource(pdev, IORESOURCE_MEM, i);
                 if (!res)
                         return -ENODEV;
-                mc->regs[i] = devm_request_and_ioremap(&pdev->dev, res);
-                if (!mc->regs[i])
-                        return -EBUSY;
+                mc->regs[i] = devm_ioremap_resource(&pdev->dev, res);
+                if (IS_ERR(mc->regs[i]))
+                        return PTR_ERR(mc->regs[i]);
         }
 
         irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
diff --git a/drivers/memory/tegra30-mc.c b/drivers/memory/tegra30-mc.c
index 0b7ab9332a18..0b975986777d 100644
--- a/drivers/memory/tegra30-mc.c
+++ b/drivers/memory/tegra30-mc.c
@@ -17,6 +17,7 @@
  * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include <linux/err.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/ratelimit.h>
@@ -336,9 +337,9 @@ static int tegra30_mc_probe(struct platform_device *pdev)
                 res = platform_get_resource(pdev, IORESOURCE_MEM, i);
                 if (!res)
                         return -ENODEV;
-                mc->regs[i] = devm_request_and_ioremap(&pdev->dev, res);
-                if (!mc->regs[i])
-                        return -EBUSY;
+                mc->regs[i] = devm_ioremap_resource(&pdev->dev, res);
+                if (IS_ERR(mc->regs[i]))
+                        return PTR_ERR(mc->regs[i]);
         }
 
         irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);