[PATCH RESEND] at91_mci.c: use resource_size()

Matt Fleming matt at console-pimps.org
Fri Aug 27 15:24:17 EDT 2010


[Adding maintainer to CC]

On Fri, Aug 27, 2010 at 08:08:13PM +0100, Chris Ball wrote:
> From: H Hartley Sweeten <hsweeten at visionengravers.com>
> Date: Mon, 14 Dec 2009 14:10:26 -0500
> 
> Use resource_size().
> 
> Signed-off-by: H Hartley Sweeten <hsweeten at visionengravers.com>
> [cjb: rebased patch against Linus]
> Signed-off-by: Chris Ball <cjb at laptop.org>
> ---
>  drivers/mmc/host/at91_mci.c |    8 ++++----
>  1 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/mmc/host/at91_mci.c b/drivers/mmc/host/at91_mci.c
> index 5f3a599..3995db3 100644
> --- a/drivers/mmc/host/at91_mci.c
> +++ b/drivers/mmc/host/at91_mci.c
> @@ -927,7 +927,7 @@ static int __init at91_mci_probe(struct platform_device *pdev)
>  	if (!res)
>  		return -ENXIO;
>  
> -	if (!request_mem_region(res->start, res->end - res->start + 1, DRIVER_NAME))
> +	if (!request_mem_region(res->start, resource_size(res), DRIVER_NAME))
>  		return -EBUSY;
>  
>  	mmc = mmc_alloc_host(sizeof(struct at91mci_host), &pdev->dev);
> @@ -1016,7 +1016,7 @@ static int __init at91_mci_probe(struct platform_device *pdev)
>  	/*
>  	 * Map I/O region
>  	 */
> -	host->baseaddr = ioremap(res->start, res->end - res->start + 1);
> +	host->baseaddr = ioremap(res->start, resource_size(res));
>  	if (!host->baseaddr) {
>  		ret = -ENOMEM;
>  		goto fail1;
> @@ -1092,7 +1092,7 @@ fail4b:
>  fail5:
>  	mmc_free_host(mmc);
>  fail6:
> -	release_mem_region(res->start, res->end - res->start + 1);
> +	release_mem_region(res->start, resource_size(res));
>  	dev_err(&pdev->dev, "probe failed, err %d\n", ret);
>  	return ret;
>  }
> @@ -1137,7 +1137,7 @@ static int __exit at91_mci_remove(struct platform_device *pdev)
>  
>  	iounmap(host->baseaddr);
>  	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> -	release_mem_region(res->start, res->end - res->start + 1);
> +	release_mem_region(res->start, resource_size(res));
>  
>  	mmc_free_host(mmc);
>  	platform_set_drvdata(pdev, NULL);
> -- 
> 1.7.0.1
> 
> -- 
> Chris Ball   <cjb at laptop.org>   <http://printf.net/>
> One Laptop Per Child
> --
> To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html



More information about the linux-arm-kernel mailing list