ASoC: atmel-ssc: prepare clk before calling enable
authorBoris BREZILLON <b.brezillon@overkiz.com>
Fri, 7 Jun 2013 16:26:09 +0000 (18:26 +0200)
committerMark Brown <broonie@linaro.org>
Fri, 7 Jun 2013 16:54:17 +0000 (17:54 +0100)
Replace clk_enable/disable with clk_prepare_enable/disable_unprepare to
avoid common clk framework warnings.

Signed-off-by: Boris BREZILLON <b.brezillon@overkiz.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
drivers/misc/atmel-ssc.c

index c09c28f..e619197 100644 (file)
@@ -58,7 +58,7 @@ struct ssc_device *ssc_request(unsigned int ssc_num)
        ssc->user++;
        spin_unlock(&user_lock);
 
-       clk_enable(ssc->clk);
+       clk_prepare_enable(ssc->clk);
 
        return ssc;
 }
@@ -69,7 +69,7 @@ void ssc_free(struct ssc_device *ssc)
        spin_lock(&user_lock);
        if (ssc->user) {
                ssc->user--;
-               clk_disable(ssc->clk);
+               clk_disable_unprepare(ssc->clk);
        } else {
                dev_dbg(&ssc->pdev->dev, "device already free\n");
        }
@@ -172,10 +172,10 @@ static int ssc_probe(struct platform_device *pdev)
        }
 
        /* disable all interrupts */
-       clk_enable(ssc->clk);
+       clk_prepare_enable(ssc->clk);
        ssc_writel(ssc->regs, IDR, -1);
        ssc_readl(ssc->regs, SR);
-       clk_disable(ssc->clk);
+       clk_disable_unprepare(ssc->clk);
 
        ssc->irq = platform_get_irq(pdev, 0);
        if (!ssc->irq) {