ASoC: davinci: don't use clock names

clock name strings are no longer passed on platform_data.  Instead,
we rely entirely on struct device and clkdev to find the right clock.

Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

diff --git a/sound/soc/davinci/davinci-i2s.c b/sound/soc/davinci/davinci-i2s.c
index f7330e112be5ffed229bde21fa6fe4aecc8b90db..e5cd97b74c50850070c280097db1ba7b03da0ca9 100644 (file)
--- a/sound/soc/davinci/davinci-i2s.c
+++ b/sound/soc/davinci/davinci-i2s.c
@@ -528,7 +528,7 @@ static int davinci_i2s_probe(struct platform_device *pdev)
                goto err_release_region;
        }
 
-       dev->clk = clk_get(&pdev->dev, pdata->clk_name);
+       dev->clk = clk_get(&pdev->dev, NULL);
        if (IS_ERR(dev->clk)) {
                ret = -ENODEV;
                goto err_free_mem;

diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c
index b27aab60ece379d69af817582e6b08e364973c1f..f0c034771062b7b4ccb146505cc534ff44c9f72a 100644 (file)
--- a/sound/soc/davinci/davinci-mcasp.c
+++ b/sound/soc/davinci/davinci-mcasp.c
@@ -764,7 +764,7 @@ static int davinci_mcasp_probe(struct platform_device *pdev)
        }
 
        pdata = pdev->dev.platform_data;
-       dev->clk = clk_get(&pdev->dev, pdata->clk_name);
+       dev->clk = clk_get(&pdev->dev, NULL);
        if (IS_ERR(dev->clk)) {
                ret = -ENODEV;
                goto err_release_region;