aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mmc/host/sh_mmcif.c
diff options
context:
space:
mode:
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>2012-11-28 04:24:27 -0500
committerChris Ball <cjb@laptop.org>2012-12-06 13:55:09 -0500
commit047a9ce790077193e43acccedba0e2294cf4c89d (patch)
treebedb687597cdc7f9eb84b5885839a63eece7fb4b /drivers/mmc/host/sh_mmcif.c
parent56ae1adc33ab9f78633374c216a0e367f80e9998 (diff)
mmc: sh_mmcif: remove unneeded clock connection ID
MMCIF only uses one clock, all ARM and SuperH platforms register MMCIF clock lookup entries with no connection ID, hence it can be dropped in the driver too. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Reviewed-by: Simon Horman <horms+renesas@verge.net.au> Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc/host/sh_mmcif.c')
-rw-r--r--drivers/mmc/host/sh_mmcif.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c
index 7eaee3eeb6b2..ae795233a1d6 100644
--- a/drivers/mmc/host/sh_mmcif.c
+++ b/drivers/mmc/host/sh_mmcif.c
@@ -1306,7 +1306,6 @@ static int __devinit sh_mmcif_probe(struct platform_device *pdev)
1306 struct sh_mmcif_plat_data *pd = pdev->dev.platform_data; 1306 struct sh_mmcif_plat_data *pd = pdev->dev.platform_data;
1307 struct resource *res; 1307 struct resource *res;
1308 void __iomem *reg; 1308 void __iomem *reg;
1309 char clk_name[8];
1310 1309
1311 irq[0] = platform_get_irq(pdev, 0); 1310 irq[0] = platform_get_irq(pdev, 0);
1312 irq[1] = platform_get_irq(pdev, 1); 1311 irq[1] = platform_get_irq(pdev, 1);
@@ -1356,11 +1355,10 @@ static int __devinit sh_mmcif_probe(struct platform_device *pdev)
1356 pm_runtime_enable(&pdev->dev); 1355 pm_runtime_enable(&pdev->dev);
1357 host->power = false; 1356 host->power = false;
1358 1357
1359 snprintf(clk_name, sizeof(clk_name), "mmc%d", pdev->id); 1358 host->hclk = clk_get(&pdev->dev, NULL);
1360 host->hclk = clk_get(&pdev->dev, clk_name);
1361 if (IS_ERR(host->hclk)) { 1359 if (IS_ERR(host->hclk)) {
1362 ret = PTR_ERR(host->hclk); 1360 ret = PTR_ERR(host->hclk);
1363 dev_err(&pdev->dev, "cannot get clock \"%s\": %d\n", clk_name, ret); 1361 dev_err(&pdev->dev, "cannot get clock: %d\n", ret);
1364 goto eclkget; 1362 goto eclkget;
1365 } 1363 }
1366 ret = sh_mmcif_clk_update(host); 1364 ret = sh_mmcif_clk_update(host);