lkml.org 
[lkml]   [2013]   [Jan]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 1/1] dma: pl330: Convert to devm_ioremap_resource()
On Thu, Jan 31, 2013 at 12:37:04PM +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 <sachin.kamat@linaro.org>
> Cc: Vinod Koul <vinod.koul@intel.com>
> Cc: Thierry Reding <thierry.reding@avionic-design.de>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> ---
> This change is based against linux-next tree (20130128).
> This change however introduces the followign sparse warning:
> drivers/dma/pl330.c:2883:22: warning: incorrect type in argument 1 (different address spaces)
> drivers/dma/pl330.c:2883:22: expected void const *ptr
> drivers/dma/pl330.c:2883:22: got void [noderef] <asn:2>*base
> drivers/dma/pl330.c:2884:34: warning: incorrect type in argument 1 (different address spaces)
> drivers/dma/pl330.c:2884:34: expected void const *ptr
> drivers/dma/pl330.c:2884:34: got void [noderef] <asn:2>*base
> ---
> 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 316a43e..142fe4d 100644
> --- a/drivers/dma/pl330.c
> +++ b/drivers/dma/pl330.c
> @@ -25,6 +25,7 @@
> #include <linux/amba/pl330.h>
> #include <linux/scatterlist.h>
> #include <linux/of.h>
> +#include <linux/err.h>
>
> #include "dmaengine.h"
> #define PL330_MAX_CHAN 8
> @@ -2878,9 +2879,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);
>

Reviewed-by: Thierry Reding <thierry.reding@avionic-design.de>
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2013-01-31 09:43    [W:0.041 / U:0.840 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site