dma: 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>
Cc: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 4 insertions, 6 deletions

diff --git a/drivers/dma/tegra20-apb-dma.c b/drivers/dma/tegra20-apb-dma.c
index c39e61bc8172..7d6d8b4679e9 100644
--- a/drivers/dma/tegra20-apb-dma.c
+++ b/drivers/dma/tegra20-apb-dma.c
@@ -21,6 +21,7 @@
 #include <linux/delay.h>
 #include <linux/dmaengine.h>
 #include <linux/dma-mapping.h>
+#include <linux/err.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
@@ -1236,12 +1237,9 @@ static int tegra_dma_probe(struct platform_device *pdev)
                 return -EINVAL;
         }
 
-        tdma->base_addr = devm_request_and_ioremap(&pdev->dev, res);
-        if (!tdma->base_addr) {
-                dev_err(&pdev->dev,
-                        "Cannot request memregion/iomap dma address\n");
-                return -EADDRNOTAVAIL;
-        }
+        tdma->base_addr = devm_ioremap_resource(&pdev->dev, res);
+        if (IS_ERR(tdma->base_addr))
+                return PTR_ERR(tdma->base_addr);
 
         tdma->dma_clk = devm_clk_get(&pdev->dev, NULL);
         if (IS_ERR(tdma->dma_clk)) {