mmc: sdhci-pltfm: use devm_request_mem_region()

[cascardo/linux.git] / drivers / mmc / host / sdhci-pltfm.c

diff --git a/drivers/mmc/host/sdhci-pltfm.c b/drivers/mmc/host/sdhci-pltfm.c
index 072bb27..8527a7c 100644 (file)
--- a/drivers/mmc/host/sdhci-pltfm.c
+++ b/drivers/mmc/host/sdhci-pltfm.c
@@ -127,9 +127,6 @@ struct sdhci_host *sdhci_pltfm_init(struct platform_device *pdev,
                goto err;
        }
 
-       if (resource_size(iomem) < 0x100)
-               dev_err(&pdev->dev, "Invalid iomem size!\n");
-
        host = sdhci_alloc_host(&pdev->dev,
                sizeof(struct sdhci_pltfm_host) + priv_size);
 
@@ -149,9 +146,15 @@ struct sdhci_host *sdhci_pltfm_init(struct platform_device *pdev,
        }
 
        host->irq = platform_get_irq(pdev, 0);
+       if (host->irq < 0) {
+               dev_err(&pdev->dev, "failed to get IRQ number\n");
+               ret = host->irq;
+               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;
@@ -161,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;
        }
 
        /*
@@ -175,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:
@@ -188,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);