diff options
| author | Boris BREZILLON <b.brezillon@overkiz.com> | 2013-06-07 18:26:09 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-06-07 17:54:17 +0100 |
| commit | 6f0d94790efe9f4481bbd7c174ef0e9b5e5db7c4 (patch) | |
| tree | 5efcbd4dd88d4071c57244c97822e20fa347121a /drivers/misc | |
| parent | 9b74fad508049471a8c783b9960b7834aba76293 (diff) | |
| download | linux-6f0d94790efe9f4481bbd7c174ef0e9b5e5db7c4.tar.bz2 | |
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>
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/atmel-ssc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/misc/atmel-ssc.c b/drivers/misc/atmel-ssc.c index c09c28f92055..e6191976d990 100644 --- a/drivers/misc/atmel-ssc.c +++ b/drivers/misc/atmel-ssc.c @@ -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) { |