1 files changed, 5 insertions, 7 deletions

diff --git a/drivers/mmc/host/sh_mobile_sdhi.c b/drivers/mmc/host/sh_mobile_sdhi.c
index 0bdc146178db..524a7f773820 100644
--- a/drivers/mmc/host/sh_mobile_sdhi.c
+++ b/drivers/mmc/host/sh_mobile_sdhi.c
@@ -117,13 +117,12 @@ static const struct sh_mobile_sdhi_ops sdhi_ops = {
         .cd_wakeup = sh_mobile_sdhi_cd_wakeup,
 };
 
-static int __devinit sh_mobile_sdhi_probe(struct platform_device *pdev)
+static int sh_mobile_sdhi_probe(struct platform_device *pdev)
 {
         struct sh_mobile_sdhi *priv;
         struct tmio_mmc_data *mmc_data;
         struct sh_mobile_sdhi_info *p = pdev->dev.platform_data;
         struct tmio_mmc_host *host;
-        char clk_name[8];
         int irq, ret, i = 0;
         bool multiplexed_isr = true;
 
@@ -144,11 +143,10 @@ static int __devinit sh_mobile_sdhi_probe(struct platform_device *pdev)
                 }
         }
 
-        snprintf(clk_name, sizeof(clk_name), "sdhi%d", pdev->id);
-        priv->clk = clk_get(&pdev->dev, clk_name);
+        priv->clk = clk_get(&pdev->dev, NULL);
         if (IS_ERR(priv->clk)) {
-                dev_err(&pdev->dev, "cannot get clock \"%s\"\n", clk_name);
                 ret = PTR_ERR(priv->clk);
+                dev_err(&pdev->dev, "cannot get clock: %d\n", ret);
                 goto eclkget;
         }
 
@@ -250,7 +248,7 @@ static int __devinit sh_mobile_sdhi_probe(struct platform_device *pdev)
         dev_info(&pdev->dev, "%s base at 0x%08lx clock rate %u MHz\n",
                  mmc_hostname(host->mmc), (unsigned long)
                  (platform_get_resource(pdev, IORESOURCE_MEM, 0)->start),
-                 mmc_data->hclk / 1000000);
+                 host->mmc->f_max / 1000000);
 
         return ret;
 
@@ -330,7 +328,7 @@ static struct platform_driver sh_mobile_sdhi_driver = {
                 .of_match_table = sh_mobile_sdhi_of_match,
         },
         .probe          = sh_mobile_sdhi_probe,
-        .remove         = __devexit_p(sh_mobile_sdhi_remove),
+        .remove         = sh_mobile_sdhi_remove,
 };
 
 module_platform_driver(sh_mobile_sdhi_driver);