diff options
author | Thierry Reding <thierry.reding@avionic-design.de> | 2013-01-21 05:09:00 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-25 15:21:46 -0500 |
commit | 7331205a9662a730799470fdd9ecbff0ea073606 (patch) | |
tree | b314ae443a4b788456a44237a4fdadf3dd27c25f /drivers/dma/mmp_pdma.c | |
parent | 93316e263a321de6ef268a2a66c322626bd65cf1 (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/mmp_pdma.c')
-rw-r--r-- | drivers/dma/mmp_pdma.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/dma/mmp_pdma.c b/drivers/dma/mmp_pdma.c index c6d98c00f05c..dc7466563507 100644 --- a/drivers/dma/mmp_pdma.c +++ b/drivers/dma/mmp_pdma.c | |||
@@ -5,6 +5,7 @@ | |||
5 | * it under the terms of the GNU General Public License version 2 as | 5 | * it under the terms of the GNU General Public License version 2 as |
6 | * published by the Free Software Foundation. | 6 | * published by the Free Software Foundation. |
7 | */ | 7 | */ |
8 | #include <linux/err.h> | ||
8 | #include <linux/module.h> | 9 | #include <linux/module.h> |
9 | #include <linux/init.h> | 10 | #include <linux/init.h> |
10 | #include <linux/types.h> | 11 | #include <linux/types.h> |
@@ -782,9 +783,9 @@ static int mmp_pdma_probe(struct platform_device *op) | |||
782 | if (!iores) | 783 | if (!iores) |
783 | return -EINVAL; | 784 | return -EINVAL; |
784 | 785 | ||
785 | pdev->base = devm_request_and_ioremap(pdev->dev, iores); | 786 | pdev->base = devm_ioremap_resource(pdev->dev, iores); |
786 | if (!pdev->base) | 787 | if (IS_ERR(pdev->base)) |
787 | return -EADDRNOTAVAIL; | 788 | return PTR_ERR(pdev->base); |
788 | 789 | ||
789 | of_id = of_match_device(mmp_pdma_dt_ids, pdev->dev); | 790 | of_id = of_match_device(mmp_pdma_dt_ids, pdev->dev); |
790 | if (of_id) | 791 | if (of_id) |