2013-03-04 09:16:59

by Sachin Kamat

Subject: [PATCH Resend] dma: pl330: Convert to devm_ioremap_resource()

Use the newly introduced devm_ioremap_resource() instead of
devm_request_and_ioremap() which provides more consistent error handling.

Signed-off-by: Sachin Kamat <[email protected]>
Reviewed-by: Thierry Reding <[email protected]>
---
drivers/dma/pl330.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c
index 7181531..10005ec 100644
--- a/drivers/dma/pl330.c
+++ b/drivers/dma/pl330.c
@@ -26,6 +26,7 @@
#include <linux/scatterlist.h>
#include <linux/of.h>
#include <linux/of_dma.h>
+#include <linux/err.h>

#include "dmaengine.h"
#define PL330_MAX_CHAN 8
@@ -2904,9 +2905,9 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id)
pi->mcbufsz = pdat ? pdat->mcbuf_sz : 0;

res = &adev->res;
- pi->base = devm_request_and_ioremap(&adev->dev, res);
- if (!pi->base)
- return -ENXIO;
+ pi->base = devm_ioremap_resource(&adev->dev, res);
+ if (IS_ERR(pi->base))
+ return PTR_ERR(pi->base);

amba_set_drvdata(adev, pdmac);

--
1.7.4.1

2013-03-21 06:53:24

by Vinod Koul

Subject: Re: [PATCH Resend] dma: pl330: Convert to devm_ioremap_resource()

On Mon, Mar 04, 2013 at 02:36:27PM +0530, Sachin Kamat wrote:
> Use the newly introduced devm_ioremap_resource() instead of
> devm_request_and_ioremap() which provides more consistent error handling.
>
> Signed-off-by: Sachin Kamat <[email protected]>
> Reviewed-by: Thierry Reding <[email protected]>
Applied thanks
> ---
> drivers/dma/pl330.c | 7 ++++---
> 1 files changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c
> index 7181531..10005ec 100644
> --- a/drivers/dma/pl330.c
> +++ b/drivers/dma/pl330.c
> @@ -26,6 +26,7 @@
> #include <linux/scatterlist.h>
> #include <linux/of.h>
> #include <linux/of_dma.h>
> +#include <linux/err.h>
>
> #include "dmaengine.h"
> #define PL330_MAX_CHAN 8
> @@ -2904,9 +2905,9 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id)
> pi->mcbufsz = pdat ? pdat->mcbuf_sz : 0;
>
> res = &adev->res;
> - pi->base = devm_request_and_ioremap(&adev->dev, res);
> - if (!pi->base)
> - return -ENXIO;
> + pi->base = devm_ioremap_resource(&adev->dev, res);
> + if (IS_ERR(pi->base))
> + return PTR_ERR(pi->base);
>
> amba_set_drvdata(adev, pdmac);
>
> --
> 1.7.4.1
>