mmc: sh_mmcif: remove unneeded clock connection ID
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Wed, 28 Nov 2012 09:24:27 +0000 (10:24 +0100)
committerChris Ball <cjb@laptop.org>
Thu, 6 Dec 2012 18:55:09 +0000 (13:55 -0500)
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>
drivers/mmc/host/sh_mmcif.c

index 7eaee3eeb6b2bffed13af54651e6ad5e19d0b409..ae795233a1d6628cfa05b01b9bf53c4227fa27c8 100644 (file)
@@ -1306,7 +1306,6 @@ static int __devinit sh_mmcif_probe(struct platform_device *pdev)
        struct sh_mmcif_plat_data *pd = pdev->dev.platform_data;
        struct resource *res;
        void __iomem *reg;
-       char clk_name[8];
 
        irq[0] = platform_get_irq(pdev, 0);
        irq[1] = platform_get_irq(pdev, 1);
@@ -1356,11 +1355,10 @@ static int __devinit sh_mmcif_probe(struct platform_device *pdev)
        pm_runtime_enable(&pdev->dev);
        host->power = false;
 
-       snprintf(clk_name, sizeof(clk_name), "mmc%d", pdev->id);
-       host->hclk = clk_get(&pdev->dev, clk_name);
+       host->hclk = clk_get(&pdev->dev, NULL);
        if (IS_ERR(host->hclk)) {
                ret = PTR_ERR(host->hclk);
-               dev_err(&pdev->dev, "cannot get clock \"%s\": %d\n", clk_name, ret);
+               dev_err(&pdev->dev, "cannot get clock: %d\n", ret);
                goto eclkget;
        }
        ret = sh_mmcif_clk_update(host);