mmc: sdhci-pltfm: call platform_get_irq() before sdhci_alloc_host()

Swap the call order of sdhci_alloc_host() and platform_get_irq().
It makes sdhci_alloc_host() the last function that can fail in the
sdhci_pltfm_init().  So, we can drop the sdhci_free_host() call from
the failure path.

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>

diff --git a/drivers/mmc/host/sdhci-pltfm.c b/drivers/mmc/host/sdhci-pltfm.c
index 1d74db8374b4e80b86a757873b4de8537cb184ff..64f287a03cd34a38aa3c66cb25e26cd2cab7b4f4 100644 (file)
--- a/drivers/mmc/host/sdhci-pltfm.c
+++ b/drivers/mmc/host/sdhci-pltfm.c
@@ -120,7 +120,7 @@ struct sdhci_host *sdhci_pltfm_init(struct platform_device *pdev,
        struct sdhci_host *host;
        struct resource *iomem;
        void __iomem *ioaddr;
-       int ret;
+       int irq, ret;
 
        iomem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        ioaddr = devm_ioremap_resource(&pdev->dev, iomem);
@@ -129,6 +129,13 @@ struct sdhci_host *sdhci_pltfm_init(struct platform_device *pdev,
                goto err;
        }
 
+       irq = platform_get_irq(pdev, 0);
+       if (irq < 0) {
+               dev_err(&pdev->dev, "failed to get IRQ number\n");
+               ret = irq;
+               goto err;
+       }
+
        host = sdhci_alloc_host(&pdev->dev,
                sizeof(struct sdhci_pltfm_host) + priv_size);
 
@@ -138,6 +145,7 @@ struct sdhci_host *sdhci_pltfm_init(struct platform_device *pdev,
        }
 
        host->ioaddr = ioaddr;
+       host->irq = irq;
        host->hw_name = dev_name(&pdev->dev);
        if (pdata && pdata->ops)
                host->ops = pdata->ops;
@@ -148,13 +156,6 @@ struct sdhci_host *sdhci_pltfm_init(struct platform_device *pdev,
                host->quirks2 = pdata->quirks2;
        }
 
-       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;
-       }
-
        /*
         * Some platforms need to probe the controller to be able to
         * determine which caps should be used.
@@ -165,9 +166,6 @@ struct sdhci_host *sdhci_pltfm_init(struct platform_device *pdev,
        platform_set_drvdata(pdev, host);
 
        return host;
-
-err_request:
-       sdhci_free_host(host);
 err:
        dev_err(&pdev->dev, "%s failed %d\n", __func__, ret);
        return ERR_PTR(ret);