提交 af2a85fd 编写于 作者: H H Hartley Sweeten 提交者: Chris Ball

mmc: at91_mci.c: use resource_size()

[cjb: rebased patch against Linus]
Signed-off-by: NH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: <linux-mmc@vger.kernel.org>
Acked-by: NJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: NNicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: NChris Ball <cjb@laptop.org>
上级 ab34c02a
...@@ -928,7 +928,7 @@ static int __init at91_mci_probe(struct platform_device *pdev) ...@@ -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) ...@@ -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 @@ static int __init at91_mci_probe(struct platform_device *pdev) ...@@ -1093,7 +1093,7 @@ static int __init at91_mci_probe(struct platform_device *pdev)
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) ...@@ -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);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册