Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6f0d9479 authored by Boris Brezillon's avatar Boris Brezillon Committed by Mark Brown
Browse files

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: default avatarBoris BREZILLON <b.brezillon@overkiz.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 9b74fad5

drivers/misc/atmel-ssc.c

+4 −4
Original line number Diff line number Diff line
@@ -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) {