[PATCH] ASoC: pxa2xx-i2s: Add clk_prepare/clk_unprepare calls

[PATCH] ASoC: pxa2xx-i2s: Add clk_prepare/clk_unprepare calls

[Philipp Zabel]

This patch adds clk_prepare/clk_unprepare calls to the pxa2xx-i2s
driver by using the helper functions clk_prepare_enable and
clk_disable_unprepare.

Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com>
Cc: Haojian Zhuang <haojian.zhuang@marvell.com>
Cc: Eric Miao <eric.y.miao@gmail.com>
Cc: Liam Girdwood <lrg@ti.com>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
 sound/soc/pxa/pxa2xx-i2s.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sound/soc/pxa/pxa2xx-i2s.c b/sound/soc/pxa/pxa2xx-i2s.c
index 609abd5..453b092 100644
--- a/sound/soc/pxa/pxa2xx-i2s.c
+++ b/sound/soc/pxa/pxa2xx-i2s.c
@@ -165,7 +165,7 @@ static int pxa2xx_i2s_hw_params(struct snd_pcm_substream *substream,
 	struct pxa2xx_pcm_dma_params *dma_data;
 
 	BUG_ON(IS_ERR(clk_i2s));
-	clk_enable(clk_i2s);
+	clk_prepare_enable(clk_i2s);
 	clk_ena = 1;
 	pxa_i2s_wait();
 
@@ -258,7 +258,7 @@ static void pxa2xx_i2s_shutdown(struct snd_pcm_substream *substream,
 		SACR0 &= ~SACR0_ENB;
 		pxa_i2s_wait();
 		if (clk_ena) {
-			clk_disable(clk_i2s);
+			clk_disable_unprepare(clk_i2s);
 			clk_ena = 0;
 		}
 	}
-- 
1.7.9.1

Re: [PATCH] ASoC: pxa2xx-i2s: Add clk_prepare/clk_unprepare calls

[Mark Brown]

[-- Attachment #1.1: Type: text/plain, Size: 339 bytes --]

On Thu, Mar 15, 2012 at 07:16:12PM +0100, Philipp Zabel wrote:
> This patch adds clk_prepare/clk_unprepare calls to the pxa2xx-i2s
> driver by using the helper functions clk_prepare_enable and
> clk_disable_unprepare.

Applied, thanks.  There's probably a reasonable case for a coccinelle
based conversion over the tree as a whole here...

[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

[-- Attachment #2: Type: text/plain, Size: 0 bytes --]