1 files changed, 28 insertions, 28 deletions

diff --git a/drivers/mmc/host/sdhci-pltfm.c b/drivers/mmc/host/sdhci-pltfm.c
index c5b01d6bb85d..a207f5aaf62f 100644
--- a/drivers/mmc/host/sdhci-pltfm.c
+++ b/drivers/mmc/host/sdhci-pltfm.c
@@ -75,43 +75,41 @@ void sdhci_get_of_property(struct platform_device *pdev)
         u32 bus_width;
         int size;
 
-        if (of_device_is_available(np)) {
-                if (of_get_property(np, "sdhci,auto-cmd12", NULL))
-                        host->quirks |= SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12;
+        if (of_get_property(np, "sdhci,auto-cmd12", NULL))
+                host->quirks |= SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12;
 
-                if (of_get_property(np, "sdhci,1-bit-only", NULL) ||
-                    (of_property_read_u32(np, "bus-width", &bus_width) == 0 &&
-                    bus_width == 1))
-                        host->quirks |= SDHCI_QUIRK_FORCE_1_BIT_DATA;
+        if (of_get_property(np, "sdhci,1-bit-only", NULL) ||
+            (of_property_read_u32(np, "bus-width", &bus_width) == 0 &&
+            bus_width == 1))
+                host->quirks |= SDHCI_QUIRK_FORCE_1_BIT_DATA;
 
-                if (sdhci_of_wp_inverted(np))
-                        host->quirks |= SDHCI_QUIRK_INVERTED_WRITE_PROTECT;
+        if (sdhci_of_wp_inverted(np))
+                host->quirks |= SDHCI_QUIRK_INVERTED_WRITE_PROTECT;
 
-                if (of_get_property(np, "broken-cd", NULL))
-                        host->quirks |= SDHCI_QUIRK_BROKEN_CARD_DETECTION;
+        if (of_get_property(np, "broken-cd", NULL))
+                host->quirks |= SDHCI_QUIRK_BROKEN_CARD_DETECTION;
 
-                if (of_get_property(np, "no-1-8-v", NULL))
-                        host->quirks2 |= SDHCI_QUIRK2_NO_1_8_V;
+        if (of_get_property(np, "no-1-8-v", NULL))
+                host->quirks2 |= SDHCI_QUIRK2_NO_1_8_V;
 
-                if (of_device_is_compatible(np, "fsl,p2020-rev1-esdhc"))
-                        host->quirks |= SDHCI_QUIRK_BROKEN_DMA;
+        if (of_device_is_compatible(np, "fsl,p2020-rev1-esdhc"))
+                host->quirks |= SDHCI_QUIRK_BROKEN_DMA;
 
-                if (of_device_is_compatible(np, "fsl,p2020-esdhc") ||
-                    of_device_is_compatible(np, "fsl,p1010-esdhc") ||
-                    of_device_is_compatible(np, "fsl,t4240-esdhc") ||
-                    of_device_is_compatible(np, "fsl,mpc8536-esdhc"))
-                        host->quirks |= SDHCI_QUIRK_BROKEN_TIMEOUT_VAL;
+        if (of_device_is_compatible(np, "fsl,p2020-esdhc") ||
+            of_device_is_compatible(np, "fsl,p1010-esdhc") ||
+            of_device_is_compatible(np, "fsl,t4240-esdhc") ||
+            of_device_is_compatible(np, "fsl,mpc8536-esdhc"))
+                host->quirks |= SDHCI_QUIRK_BROKEN_TIMEOUT_VAL;
 
-                clk = of_get_property(np, "clock-frequency", &size);
-                if (clk && size == sizeof(*clk) && *clk)
-                        pltfm_host->clock = be32_to_cpup(clk);
+        clk = of_get_property(np, "clock-frequency", &size);
+        if (clk && size == sizeof(*clk) && *clk)
+                pltfm_host->clock = be32_to_cpup(clk);
 
-                if (of_find_property(np, "keep-power-in-suspend", NULL))
-                        host->mmc->pm_caps |= MMC_PM_KEEP_POWER;
+        if (of_find_property(np, "keep-power-in-suspend", NULL))
+                host->mmc->pm_caps |= MMC_PM_KEEP_POWER;
 
-                if (of_find_property(np, "enable-sdio-wakeup", NULL))
-                        host->mmc->pm_caps |= MMC_PM_WAKE_SDIO_IRQ;
-        }
+        if (of_find_property(np, "enable-sdio-wakeup", NULL))
+                host->mmc->pm_caps |= MMC_PM_WAKE_SDIO_IRQ;
 }
 #else
 void sdhci_get_of_property(struct platform_device *pdev) {}
@@ -225,9 +223,11 @@ EXPORT_SYMBOL_GPL(sdhci_pltfm_register);
 int sdhci_pltfm_unregister(struct platform_device *pdev)
 {
         struct sdhci_host *host = platform_get_drvdata(pdev);
+        struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
         int dead = (readl(host->ioaddr + SDHCI_INT_STATUS) == 0xffffffff);
 
         sdhci_remove_host(host, dead);
+        clk_disable_unprepare(pltfm_host->clk);
         sdhci_pltfm_free(pdev);
 
         return 0;