diff options
author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2009-12-14 14:10:26 -0500 |
---|---|---|
committer | Chris Ball <cjb@laptop.org> | 2010-10-23 09:11:10 -0400 |
commit | af2a85fd9a4be83469a00f257563dfb77b9daad0 (patch) | |
tree | 531c953d1cdcac1bb8dc88ec074f429f91095584 /drivers/mmc/host/at91_mci.c | |
parent | ab34c02afeafd047a831e6fe2a4dd875ce86bee0 (diff) |
mmc: at91_mci.c: use resource_size()
[cjb: rebased patch against Linus]
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: <linux-mmc@vger.kernel.org>
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc/host/at91_mci.c')
-rw-r--r-- | 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 87226cd202a..339e5913e5c 100644 --- a/drivers/mmc/host/at91_mci.c +++ b/drivers/mmc/host/at91_mci.c | |||
@@ -928,7 +928,7 @@ static int __init at91_mci_probe(struct platform_device *pdev) | |||
928 | if (!res) | 928 | if (!res) |
929 | return -ENXIO; | 929 | return -ENXIO; |
930 | 930 | ||
931 | if (!request_mem_region(res->start, res->end - res->start + 1, DRIVER_NAME)) | 931 | if (!request_mem_region(res->start, resource_size(res), DRIVER_NAME)) |
932 | return -EBUSY; | 932 | return -EBUSY; |
933 | 933 | ||
934 | mmc = mmc_alloc_host(sizeof(struct at91mci_host), &pdev->dev); | 934 | 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 | /* | 1017 | /* |
1018 | * Map I/O region | 1018 | * Map I/O region |
1019 | */ | 1019 | */ |
1020 | host->baseaddr = ioremap(res->start, res->end - res->start + 1); | 1020 | host->baseaddr = ioremap(res->start, resource_size(res)); |
1021 | if (!host->baseaddr) { | 1021 | if (!host->baseaddr) { |
1022 | ret = -ENOMEM; | 1022 | ret = -ENOMEM; |
1023 | goto fail1; | 1023 | goto fail1; |
@@ -1093,7 +1093,7 @@ fail4b: | |||
1093 | fail5: | 1093 | fail5: |
1094 | mmc_free_host(mmc); | 1094 | mmc_free_host(mmc); |
1095 | fail6: | 1095 | fail6: |
1096 | release_mem_region(res->start, res->end - res->start + 1); | 1096 | release_mem_region(res->start, resource_size(res)); |
1097 | dev_err(&pdev->dev, "probe failed, err %d\n", ret); | 1097 | dev_err(&pdev->dev, "probe failed, err %d\n", ret); |
1098 | return ret; | 1098 | return ret; |
1099 | } | 1099 | } |
@@ -1138,7 +1138,7 @@ static int __exit at91_mci_remove(struct platform_device *pdev) | |||
1138 | 1138 | ||
1139 | iounmap(host->baseaddr); | 1139 | iounmap(host->baseaddr); |
1140 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 1140 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
1141 | release_mem_region(res->start, res->end - res->start + 1); | 1141 | release_mem_region(res->start, resource_size(res)); |
1142 | 1142 | ||
1143 | mmc_free_host(mmc); | 1143 | mmc_free_host(mmc); |
1144 | platform_set_drvdata(pdev, NULL); | 1144 | platform_set_drvdata(pdev, NULL); |