5 files changed, 17 insertions, 24 deletions

diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index 2909bbc8ad00..a663429b3d55 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -490,7 +490,7 @@ static void mmci_check_status(unsigned long data)
         mod_timer(&host->timer, jiffies + HZ);
 }
 
-static int mmci_probe(struct amba_device *dev, void *id)
+static int __devinit mmci_probe(struct amba_device *dev, void *id)
 {
         struct mmc_platform_data *plat = dev->dev.platform_data;
         struct mmci_host *host;
@@ -633,7 +633,7 @@ static int mmci_probe(struct amba_device *dev, void *id)
         return ret;
 }
 
-static int mmci_remove(struct amba_device *dev)
+static int __devexit mmci_remove(struct amba_device *dev)
 {
         struct mmc_host *mmc = amba_get_drvdata(dev);
 
@@ -730,7 +730,7 @@ static struct amba_driver mmci_driver = {
                 .name   = DRIVER_NAME,
         },
         .probe          = mmci_probe,
-        .remove         = mmci_remove,
+        .remove         = __devexit_p(mmci_remove),
         .suspend        = mmci_suspend,
         .resume         = mmci_resume,
         .id_table       = mmci_ids,
diff --git a/drivers/mmc/host/mxcmmc.c b/drivers/mmc/host/mxcmmc.c
index dda0be4e25dc..b4a615c55f28 100644
--- a/drivers/mmc/host/mxcmmc.c
+++ b/drivers/mmc/host/mxcmmc.c
@@ -42,7 +42,7 @@
 #define HAS_DMA
 #endif
 
-#define DRIVER_NAME "imx-mmc"
+#define DRIVER_NAME "mxc-mmc"
 
 #define MMC_REG_STR_STP_CLK             0x00
 #define MMC_REG_STATUS                  0x04
@@ -707,7 +707,7 @@ static int mxcmci_probe(struct platform_device *pdev)
         host->res = r;
         host->irq = irq;
 
-        host->clk = clk_get(&pdev->dev, "sdhc_clk");
+        host->clk = clk_get(&pdev->dev, NULL);
         if (IS_ERR(host->clk)) {
                 ret = PTR_ERR(host->clk);
                 goto out_iounmap;
diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c
index 67d7b7fef084..5570849188cc 100644
--- a/drivers/mmc/host/omap.c
+++ b/drivers/mmc/host/omap.c
@@ -1460,18 +1460,12 @@ static int __init mmc_omap_probe(struct platform_device *pdev)
         if (!host->virt_base)
                 goto err_ioremap;
 
-        if (cpu_is_omap24xx()) {
-                host->iclk = clk_get(&pdev->dev, "mmc_ick");
-                if (IS_ERR(host->iclk))
-                        goto err_free_mmc_host;
-                clk_enable(host->iclk);
-        }
-
-        if (!cpu_is_omap24xx())
-                host->fclk = clk_get(&pdev->dev, "mmc_ck");
-        else
-                host->fclk = clk_get(&pdev->dev, "mmc_fck");
+        host->iclk = clk_get(&pdev->dev, "ick");
+        if (IS_ERR(host->iclk))
+                goto err_free_mmc_host;
+        clk_enable(host->iclk);
 
+        host->fclk = clk_get(&pdev->dev, "fck");
         if (IS_ERR(host->fclk)) {
                 ret = PTR_ERR(host->fclk);
                 goto err_free_iclk;
@@ -1536,10 +1530,10 @@ static int mmc_omap_remove(struct platform_device *pdev)
         if (host->pdata->cleanup)
                 host->pdata->cleanup(&pdev->dev);
 
-        if (host->iclk && !IS_ERR(host->iclk))
-                clk_put(host->iclk);
-        if (host->fclk && !IS_ERR(host->fclk))
-                clk_put(host->fclk);
+        mmc_omap_fclk_enable(host, 0);
+        clk_put(host->fclk);
+        clk_disable(host->iclk);
+        clk_put(host->iclk);
 
         iounmap(host->virt_base);
         release_mem_region(pdev->resource[0].start,
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index a631c81dce12..3916a5618e28 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -956,13 +956,13 @@ static int __init omap_mmc_probe(struct platform_device *pdev)
 
         sema_init(&host->sem, 1);
 
-        host->iclk = clk_get(&pdev->dev, "mmchs_ick");
+        host->iclk = clk_get(&pdev->dev, "ick");
         if (IS_ERR(host->iclk)) {
                 ret = PTR_ERR(host->iclk);
                 host->iclk = NULL;
                 goto err1;
         }
-        host->fclk = clk_get(&pdev->dev, "mmchs_fck");
+        host->fclk = clk_get(&pdev->dev, "fck");
         if (IS_ERR(host->fclk)) {
                 ret = PTR_ERR(host->fclk);
                 host->fclk = NULL;
diff --git a/drivers/mmc/host/pxamci.c b/drivers/mmc/host/pxamci.c
index 9702ad3774cf..430095725f9f 100644
--- a/drivers/mmc/host/pxamci.c
+++ b/drivers/mmc/host/pxamci.c
@@ -30,9 +30,8 @@
 
 #include <asm/sizes.h>
 
-#include <mach/dma.h>
 #include <mach/hardware.h>
-#include <mach/pxa-regs.h>
+#include <mach/dma.h>
 #include <mach/mmc.h>
 
 #include "pxamci.h"