aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/dma/imx-dma.c
diff options
context:
space:
mode:
authorThierry Reding <thierry.reding@avionic-design.de>2013-01-21 05:09:00 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-25 15:21:46 -0500
commit7331205a9662a730799470fdd9ecbff0ea073606 (patch)
treeb314ae443a4b788456a44237a4fdadf3dd27c25f /drivers/dma/imx-dma.c
parent93316e263a321de6ef268a2a66c322626bd65cf1 (diff)
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>
Diffstat (limited to 'drivers/dma/imx-dma.c')
-rw-r--r--drivers/dma/imx-dma.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/dma/imx-dma.c b/drivers/dma/imx-dma.c
index dbf0e6f8de8a..84ae49101407 100644
--- a/drivers/dma/imx-dma.c
+++ b/drivers/dma/imx-dma.c
@@ -14,6 +14,7 @@
14 * http://www.opensource.org/licenses/gpl-license.html 14 * http://www.opensource.org/licenses/gpl-license.html
15 * http://www.gnu.org/copyleft/gpl.html 15 * http://www.gnu.org/copyleft/gpl.html
16 */ 16 */
17#include <linux/err.h>
17#include <linux/init.h> 18#include <linux/init.h>
18#include <linux/types.h> 19#include <linux/types.h>
19#include <linux/mm.h> 20#include <linux/mm.h>
@@ -1011,9 +1012,9 @@ static int __init imxdma_probe(struct platform_device *pdev)
1011 imxdma->devtype = pdev->id_entry->driver_data; 1012 imxdma->devtype = pdev->id_entry->driver_data;
1012 1013
1013 res = platform_get_resource(pdev, IORESOURCE_MEM, 0); 1014 res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
1014 imxdma->base = devm_request_and_ioremap(&pdev->dev, res); 1015 imxdma->base = devm_ioremap_resource(&pdev->dev, res);
1015 if (!imxdma->base) 1016 if (IS_ERR(imxdma->base))
1016 return -EADDRNOTAVAIL; 1017 return PTR_ERR(imxdma->base);
1017 1018
1018 irq = platform_get_irq(pdev, 0); 1019 irq = platform_get_irq(pdev, 0);
1019 if (irq < 0) 1020 if (irq < 0)