2011-06-01 22:10:48

by Hartley Sweeten

Subject: [PATCH] dma: ipu_idmac.c: use resource_size in ioremap

Signed-off-by: H Hartley Sweeten <[email protected]>
Cc: Dan Williams <[email protected]>
Cc: Vinod Koul <[email protected]>
Cc: Guennadi Liakhovetski <[email protected]>
Cc: Anatolij Gustschin <[email protected]>

---

diff --git a/drivers/dma/ipu/ipu_idmac.c b/drivers/dma/ipu/ipu_idmac.c
index c1a125e..25447a8 100644
--- a/drivers/dma/ipu/ipu_idmac.c
+++ b/drivers/dma/ipu/ipu_idmac.c
@@ -1705,16 +1705,14 @@ static int __init ipu_probe(struct platform_device *pdev)
ipu_data.irq_fn, ipu_data.irq_err, ipu_data.irq_base);

/* Remap IPU common registers */
- ipu_data.reg_ipu = ioremap(mem_ipu->start,
- mem_ipu->end - mem_ipu->start + 1);
+ ipu_data.reg_ipu = ioremap(mem_ipu->start, resource_size(mem_ipu));
if (!ipu_data.reg_ipu) {
ret = -ENOMEM;
goto err_ioremap_ipu;
}

/* Remap Image Converter and Image DMA Controller registers */
- ipu_data.reg_ic = ioremap(mem_ic->start,
- mem_ic->end - mem_ic->start + 1);
+ ipu_data.reg_ic = ioremap(mem_ic->start, resource_size(mem_ic));
if (!ipu_data.reg_ic) {
ret = -ENOMEM;
goto err_ioremap_ic;

2011-06-06 08:50:20

by Vinod Koul

Subject: Re: [PATCH] dma: ipu_idmac.c: use resource_size in ioremap

On Wed, 2011-06-01 at 15:10 -0700, H Hartley Sweeten wrote:
> Signed-off-by: H Hartley Sweeten <[email protected]>
> Cc: Dan Williams <[email protected]>
> Cc: Vinod Koul <[email protected]>
> Cc: Guennadi Liakhovetski <[email protected]>
> Cc: Anatolij Gustschin <[email protected]>
>
> ---
>
> diff --git a/drivers/dma/ipu/ipu_idmac.c b/drivers/dma/ipu/ipu_idmac.c
> index c1a125e..25447a8 100644
> --- a/drivers/dma/ipu/ipu_idmac.c
> +++ b/drivers/dma/ipu/ipu_idmac.c
> @@ -1705,16 +1705,14 @@ static int __init ipu_probe(struct platform_device *pdev)
> ipu_data.irq_fn, ipu_data.irq_err, ipu_data.irq_base);
>
> /* Remap IPU common registers */
> - ipu_data.reg_ipu = ioremap(mem_ipu->start,
> - mem_ipu->end - mem_ipu->start + 1);
> + ipu_data.reg_ipu = ioremap(mem_ipu->start, resource_size(mem_ipu));
> if (!ipu_data.reg_ipu) {
> ret = -ENOMEM;
> goto err_ioremap_ipu;
> }
>
> /* Remap Image Converter and Image DMA Controller registers */
> - ipu_data.reg_ic = ioremap(mem_ic->start,
> - mem_ic->end - mem_ic->start + 1);
> + ipu_data.reg_ic = ioremap(mem_ic->start, resource_size(mem_ic));
> if (!ipu_data.reg_ic) {
> ret = -ENOMEM;
> goto err_ioremap_ic;
Applied, Thanks

--
~Vinod