ASoC: atmel-ssc: prepare clk before calling enable
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>
This commit is contained in:
Родитель
9b74fad508
Коммит
6f0d94790e
|
@ -58,7 +58,7 @@ struct ssc_device *ssc_request(unsigned int ssc_num)
|
||||||
ssc->user++;
|
ssc->user++;
|
||||||
spin_unlock(&user_lock);
|
spin_unlock(&user_lock);
|
||||||
|
|
||||||
clk_enable(ssc->clk);
|
clk_prepare_enable(ssc->clk);
|
||||||
|
|
||||||
return ssc;
|
return ssc;
|
||||||
}
|
}
|
||||||
|
@ -69,7 +69,7 @@ void ssc_free(struct ssc_device *ssc)
|
||||||
spin_lock(&user_lock);
|
spin_lock(&user_lock);
|
||||||
if (ssc->user) {
|
if (ssc->user) {
|
||||||
ssc->user--;
|
ssc->user--;
|
||||||
clk_disable(ssc->clk);
|
clk_disable_unprepare(ssc->clk);
|
||||||
} else {
|
} else {
|
||||||
dev_dbg(&ssc->pdev->dev, "device already free\n");
|
dev_dbg(&ssc->pdev->dev, "device already free\n");
|
||||||
}
|
}
|
||||||
|
@ -172,10 +172,10 @@ static int ssc_probe(struct platform_device *pdev)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* disable all interrupts */
|
/* disable all interrupts */
|
||||||
clk_enable(ssc->clk);
|
clk_prepare_enable(ssc->clk);
|
||||||
ssc_writel(ssc->regs, IDR, -1);
|
ssc_writel(ssc->regs, IDR, -1);
|
||||||
ssc_readl(ssc->regs, SR);
|
ssc_readl(ssc->regs, SR);
|
||||||
clk_disable(ssc->clk);
|
clk_disable_unprepare(ssc->clk);
|
||||||
|
|
||||||
ssc->irq = platform_get_irq(pdev, 0);
|
ssc->irq = platform_get_irq(pdev, 0);
|
||||||
if (!ssc->irq) {
|
if (!ssc->irq) {
|
||||||
|
|
Загрузка…
Ссылка в новой задаче