aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mmc
diff options
context:
space:
mode:
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>2012-11-28 04:24:21 -0500
committerChris Ball <cjb@laptop.org>2012-12-06 13:55:08 -0500
commit56ae1adc33ab9f78633374c216a0e367f80e9998 (patch)
tree5476686ba5e7820d48b00f7d06fc30dc21d4a35d /drivers/mmc
parent369213bdc94d15611d0f17fc4abfb04a450b5757 (diff)
mmc: sh_mobile_sdhi: remove unneeded clock connection ID
SDHI only uses one clock, all ARM and SuperH platform register SDHI 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')
-rw-r--r--drivers/mmc/host/sh_mobile_sdhi.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/mmc/host/sh_mobile_sdhi.c b/drivers/mmc/host/sh_mobile_sdhi.c
index 6a8306531a98..d6ff8531fb35 100644
--- a/drivers/mmc/host/sh_mobile_sdhi.c
+++ b/drivers/mmc/host/sh_mobile_sdhi.c
@@ -123,7 +123,6 @@ static int __devinit sh_mobile_sdhi_probe(struct platform_device *pdev)
123 struct tmio_mmc_data *mmc_data; 123 struct tmio_mmc_data *mmc_data;
124 struct sh_mobile_sdhi_info *p = pdev->dev.platform_data; 124 struct sh_mobile_sdhi_info *p = pdev->dev.platform_data;
125 struct tmio_mmc_host *host; 125 struct tmio_mmc_host *host;
126 char clk_name[8];
127 int irq, ret, i = 0; 126 int irq, ret, i = 0;
128 bool multiplexed_isr = true; 127 bool multiplexed_isr = true;
129 128
@@ -144,11 +143,10 @@ static int __devinit sh_mobile_sdhi_probe(struct platform_device *pdev)
144 } 143 }
145 } 144 }
146 145
147 snprintf(clk_name, sizeof(clk_name), "sdhi%d", pdev->id); 146 priv->clk = clk_get(&pdev->dev, NULL);
148 priv->clk = clk_get(&pdev->dev, clk_name);
149 if (IS_ERR(priv->clk)) { 147 if (IS_ERR(priv->clk)) {
150 dev_err(&pdev->dev, "cannot get clock \"%s\"\n", clk_name);
151 ret = PTR_ERR(priv->clk); 148 ret = PTR_ERR(priv->clk);
149 dev_err(&pdev->dev, "cannot get clock: %d\n", ret);
152 goto eclkget; 150 goto eclkget;
153 } 151 }
154 152