mmc: sdhci-pltfm: use devm_request_mem_region()

Use the managed variant of request_mem_region().

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

1 files changed, 4 insertions, 7 deletions

diff --git a/drivers/mmc/host/sdhci-pltfm.c b/drivers/mmc/host/sdhci-pltfm.c
index 24377a34db41..8527a7cfd486 100644
--- a/drivers/mmc/host/sdhci-pltfm.c
+++ b/drivers/mmc/host/sdhci-pltfm.c
@@ -152,8 +152,9 @@ struct sdhci_host *sdhci_pltfm_init(struct platform_device *pdev,
                 goto err_request;
         }
 
-        if (!request_mem_region(iomem->start, resource_size(iomem),
-                mmc_hostname(host->mmc))) {
+        if (!devm_request_mem_region(&pdev->dev, iomem->start,
+                                     resource_size(iomem),
+                                     mmc_hostname(host->mmc))) {
                 dev_err(&pdev->dev, "cannot request region\n");
                 ret = -EBUSY;
                 goto err_request;
@@ -163,7 +164,7 @@ struct sdhci_host *sdhci_pltfm_init(struct platform_device *pdev,
         if (!host->ioaddr) {
                 dev_err(&pdev->dev, "failed to remap registers\n");
                 ret = -ENOMEM;
-                goto err_remap;
+                goto err_request;
         }
 
         /*
@@ -177,8 +178,6 @@ struct sdhci_host *sdhci_pltfm_init(struct platform_device *pdev,
 
         return host;
 
-err_remap:
-        release_mem_region(iomem->start, resource_size(iomem));
 err_request:
         sdhci_free_host(host);
 err:
@@ -190,10 +189,8 @@ EXPORT_SYMBOL_GPL(sdhci_pltfm_init);
 void sdhci_pltfm_free(struct platform_device *pdev)
 {
         struct sdhci_host *host = platform_get_drvdata(pdev);
-        struct resource *iomem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 
         iounmap(host->ioaddr);
-        release_mem_region(iomem->start, resource_size(iomem));
         sdhci_free_host(host);
 }
 EXPORT_SYMBOL_GPL(sdhci_pltfm_free);