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>

1 files changed, 4 insertions, 3 deletions

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);