diff options
| author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2012-11-28 10:24:21 +0100 |
|---|---|---|
| committer | Chris Ball <cjb@laptop.org> | 2012-12-06 13:55:08 -0500 |
| commit | 56ae1adc33ab9f78633374c216a0e367f80e9998 (patch) | |
| tree | 5476686ba5e7820d48b00f7d06fc30dc21d4a35d /drivers/mmc | |
| parent | 369213bdc94d15611d0f17fc4abfb04a450b5757 (diff) | |
| download | lwn-56ae1adc33ab9f78633374c216a0e367f80e9998.tar.gz lwn-56ae1adc33ab9f78633374c216a0e367f80e9998.zip | |
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.c | 6 |
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) 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; } |