Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af2a85fd authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Chris Ball
Browse files

mmc: at91_mci.c: use resource_size() 



[cjb: rebased patch against Linus]
Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: <linux-mmc@vger.kernel.org>
Acked-by: default avatarJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent ab34c02a

drivers/mmc/host/at91_mci.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -928,7 +928,7 @@ static int __init at91_mci_probe(struct platform_device *pdev) 
	if (!res)

	if (!res)

		return -ENXIO;

		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;

		return -EBUSY;





	mmc = mmc_alloc_host(sizeof(struct at91mci_host), &pdev->dev);

	mmc = mmc_alloc_host(sizeof(struct at91mci_host), &pdev->dev);
@@ -1017,7 +1017,7 @@ static int __init at91_mci_probe(struct platform_device *pdev) 
	/*

	/*

	 * Map I/O region

	 * 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) {

	if (!host->baseaddr) {

		ret = -ENOMEM;

		ret = -ENOMEM;

		goto fail1;

		goto fail1;
@@ -1093,7 +1093,7 @@ fail4b: 
fail5:

fail5:

	mmc_free_host(mmc);

	mmc_free_host(mmc);

fail6:

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);

	dev_err(&pdev->dev, "probe failed, err %d\n", ret);

	return ret;

	return ret;

}

}
@@ -1138,7 +1138,7 @@ static int __exit at91_mci_remove(struct platform_device *pdev) 




	iounmap(host->baseaddr);

	iounmap(host->baseaddr);

	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	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);

	mmc_free_host(mmc);

	platform_set_drvdata(pdev, NULL);

	platform_set_drvdata(pdev, NULL);