linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/2] dma: sh: use devm_ioremap_resource() instead of devm_request_and_ioremap()
@ 2013-09-02  1:23 Jingoo Han
  2013-09-02  1:25 ` PATCH 2/2] dma: k3dma: " Jingoo Han
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: Jingoo Han @ 2013-09-02  1:23 UTC (permalink / raw)
  To: 'Vinod Koul'
  Cc: 'Dan Williams', linux-kernel, 'Simon Horman',
	'Guennadi Liakhovetski', 'Jingoo Han'

Use devm_ioremap_resource() because devm_request_and_ioremap() is
obsoleted by devm_ioremap_resource().

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
 drivers/dma/sh/sudmac.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/dma/sh/sudmac.c b/drivers/dma/sh/sudmac.c
index bf85b8e..7c1ffaa 100644
--- a/drivers/dma/sh/sudmac.c
+++ b/drivers/dma/sh/sudmac.c
@@ -358,9 +358,9 @@ static int sudmac_probe(struct platform_device *pdev)
 
 	dma_dev = &su_dev->shdma_dev.dma_dev;
 
-	su_dev->chan_reg = devm_request_and_ioremap(&pdev->dev, chan);
-	if (!su_dev->chan_reg)
-		return err;
+	su_dev->chan_reg = devm_ioremap_resource(&pdev->dev, chan);
+	if (IS_ERR(su_dev->chan_reg))
+		return PTR_ERR(su_dev->chan_reg);
 
 	dma_cap_set(DMA_SLAVE, dma_dev->cap_mask);
 
-- 
1.7.10.4



^ permalink raw reply related	[flat|nested] 6+ messages in thread

* PATCH 2/2] dma: k3dma: use devm_ioremap_resource() instead of devm_request_and_ioremap()
  2013-09-02  1:23 [PATCH 1/2] dma: sh: use devm_ioremap_resource() instead of devm_request_and_ioremap() Jingoo Han
@ 2013-09-02  1:25 ` Jingoo Han
  2013-09-02  1:26 ` [PATCH " Jingoo Han
  2013-09-02  6:34 ` [PATCH 1/2] dma: sh: " Vinod Koul
  2 siblings, 0 replies; 6+ messages in thread
From: Jingoo Han @ 2013-09-02  1:25 UTC (permalink / raw)
  To: 'Vinod Koul'
  Cc: 'Dan Williams', linux-kernel, 'Zhangfei Gao',
	'Kai Yang', 'Jingoo Han'

Use devm_ioremap_resource() because devm_request_and_ioremap() is
obsoleted by devm_ioremap_resource().

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
 drivers/dma/k3dma.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/dma/k3dma.c b/drivers/dma/k3dma.c
index ef7bc85..a2c330f 100644
--- a/drivers/dma/k3dma.c
+++ b/drivers/dma/k3dma.c
@@ -673,9 +673,9 @@ static int k3_dma_probe(struct platform_device *op)
 	if (!d)
 		return -ENOMEM;
 
-	d->base = devm_request_and_ioremap(&op->dev, iores);
-	if (!d->base)
-		return -EADDRNOTAVAIL;
+	d->base = devm_ioremap_resource(&op->dev, iores);
+	if (IS_ERR(d->base))
+		return PTR_ERR(d->base);
 
 	of_id = of_match_device(k3_pdma_dt_ids, &op->dev);
 	if (of_id) {
-- 
1.7.10.4



^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH 2/2] dma: k3dma: use devm_ioremap_resource() instead of devm_request_and_ioremap()
  2013-09-02  1:23 [PATCH 1/2] dma: sh: use devm_ioremap_resource() instead of devm_request_and_ioremap() Jingoo Han
  2013-09-02  1:25 ` PATCH 2/2] dma: k3dma: " Jingoo Han
@ 2013-09-02  1:26 ` Jingoo Han
  2013-09-02  2:30   ` zhangfei
  2013-09-02  6:34 ` [PATCH 1/2] dma: sh: " Vinod Koul
  2 siblings, 1 reply; 6+ messages in thread
From: Jingoo Han @ 2013-09-02  1:26 UTC (permalink / raw)
  To: 'Vinod Koul'
  Cc: 'Dan Williams', linux-kernel, 'Zhangfei Gao',
	'Kai Yang', 'Jingoo Han'

Use devm_ioremap_resource() because devm_request_and_ioremap() is
obsoleted by devm_ioremap_resource().

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
 drivers/dma/k3dma.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/dma/k3dma.c b/drivers/dma/k3dma.c
index ef7bc85..a2c330f 100644
--- a/drivers/dma/k3dma.c
+++ b/drivers/dma/k3dma.c
@@ -673,9 +673,9 @@ static int k3_dma_probe(struct platform_device *op)
 	if (!d)
 		return -ENOMEM;
 
-	d->base = devm_request_and_ioremap(&op->dev, iores);
-	if (!d->base)
-		return -EADDRNOTAVAIL;
+	d->base = devm_ioremap_resource(&op->dev, iores);
+	if (IS_ERR(d->base))
+		return PTR_ERR(d->base);
 
 	of_id = of_match_device(k3_pdma_dt_ids, &op->dev);
 	if (of_id) {
-- 
1.7.10.4



^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH 2/2] dma: k3dma: use devm_ioremap_resource() instead of devm_request_and_ioremap()
  2013-09-02  1:26 ` [PATCH " Jingoo Han
@ 2013-09-02  2:30   ` zhangfei
  0 siblings, 0 replies; 6+ messages in thread
From: zhangfei @ 2013-09-02  2:30 UTC (permalink / raw)
  To: Jingoo Han
  Cc: 'Vinod Koul', 'Dan Williams',
	linux-kernel, 'Kai Yang'

On 13-09-02 09:26 AM, Jingoo Han wrote:
> Use devm_ioremap_resource() because devm_request_and_ioremap() is
> obsoleted by devm_ioremap_resource().
>
> Signed-off-by: Jingoo Han <jg1.han@samsung.com>

Thanks Jingoo for point out.

Acked-by: Zhangfei Gao <zhangfei.gao@linaro.org>

> ---
>   drivers/dma/k3dma.c |    6 +++---
>   1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/dma/k3dma.c b/drivers/dma/k3dma.c
> index ef7bc85..a2c330f 100644
> --- a/drivers/dma/k3dma.c
> +++ b/drivers/dma/k3dma.c
> @@ -673,9 +673,9 @@ static int k3_dma_probe(struct platform_device *op)
>   	if (!d)
>   		return -ENOMEM;
>
> -	d->base = devm_request_and_ioremap(&op->dev, iores);
> -	if (!d->base)
> -		return -EADDRNOTAVAIL;
> +	d->base = devm_ioremap_resource(&op->dev, iores);
> +	if (IS_ERR(d->base))
> +		return PTR_ERR(d->base);
>
>   	of_id = of_match_device(k3_pdma_dt_ids, &op->dev);
>   	if (of_id) {
>


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH 1/2] dma: sh: use devm_ioremap_resource() instead of devm_request_and_ioremap()
  2013-09-02  1:23 [PATCH 1/2] dma: sh: use devm_ioremap_resource() instead of devm_request_and_ioremap() Jingoo Han
  2013-09-02  1:25 ` PATCH 2/2] dma: k3dma: " Jingoo Han
  2013-09-02  1:26 ` [PATCH " Jingoo Han
@ 2013-09-02  6:34 ` Vinod Koul
  2013-09-02 12:09   ` Vinod Koul
  2 siblings, 1 reply; 6+ messages in thread
From: Vinod Koul @ 2013-09-02  6:34 UTC (permalink / raw)
  To: Jingoo Han
  Cc: 'Dan Williams', linux-kernel, 'Simon Horman',
	'Guennadi Liakhovetski'

On Mon, Sep 02, 2013 at 10:23:15AM +0900, Jingoo Han wrote:
> Use devm_ioremap_resource() because devm_request_and_ioremap() is
> obsoleted by devm_ioremap_resource().
Applied both, Thanks

~Vinod

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH 1/2] dma: sh: use devm_ioremap_resource() instead of devm_request_and_ioremap()
  2013-09-02  6:34 ` [PATCH 1/2] dma: sh: " Vinod Koul
@ 2013-09-02 12:09   ` Vinod Koul
  0 siblings, 0 replies; 6+ messages in thread
From: Vinod Koul @ 2013-09-02 12:09 UTC (permalink / raw)
  To: Jingoo Han
  Cc: 'Dan Williams', linux-kernel, 'Simon Horman',
	'Guennadi Liakhovetski'

On Mon, Sep 02, 2013 at 12:04:29PM +0530, Vinod Koul wrote:
> On Mon, Sep 02, 2013 at 10:23:15AM +0900, Jingoo Han wrote:
> > Use devm_ioremap_resource() because devm_request_and_ioremap() is
> > obsoleted by devm_ioremap_resource().
> Applied both, Thanks
I have removed this one and reapplied patch 2. This was duplicate of Julia's
patch which was sent earlier, so I have applied that one

~Vinod
-- 

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2013-09-02 12:55 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-09-02  1:23 [PATCH 1/2] dma: sh: use devm_ioremap_resource() instead of devm_request_and_ioremap() Jingoo Han
2013-09-02  1:25 ` PATCH 2/2] dma: k3dma: " Jingoo Han
2013-09-02  1:26 ` [PATCH " Jingoo Han
2013-09-02  2:30   ` zhangfei
2013-09-02  6:34 ` [PATCH 1/2] dma: sh: " Vinod Koul
2013-09-02 12:09   ` Vinod Koul

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).