ASoC: rsnd: fix clock prepare/unprepare

Commit Message

Kuninori Morimoto April 11, 2014, 1:16 a.m. UTC

From: Ben Dooks <[e-mail]>

As with the previous commit, before a clock can be used it must be prepared
for use. Change from clk_enable() and clk_disable() to the versions of the
calls which also prepare and un-prepare the clocks.

Will fix warnings from the clock code when this is used.

Signed-off-by: Ben Dooks <[e-mail]>
Signed-off-by: Kuninori Morimoto <[e-mail]>
---
This patch is for current linus/master tree

 sound/soc/sh/rcar/src.c |    4 ++--
 sound/soc/sh/rcar/ssi.c |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

Comments

Mark Brown April 11, 2014, 10:14 a.m. UTC | #1

On Thu, Apr 10, 2014 at 06:16:33PM -0700, Kuninori Morimoto wrote:
> From: Ben Dooks <[e-mail]>
> 
> As with the previous commit, before a clock can be used it must be prepared
> for use. Change from clk_enable() and clk_disable() to the versions of the
> calls which also prepare and un-prepare the clocks.
> 
> Will fix warnings from the clock code when this is used.
> 
> Signed-off-by: Ben Dooks <[e-mail]>
> Signed-off-by: Kuninori Morimoto <[e-mail]>

This is written by you and sent by you but also signed off by
Morimoto-san - what's going on there?

Mark Brown April 11, 2014, 11:10 a.m. UTC | #2

On Thu, Apr 10, 2014 at 06:16:33PM -0700, Kuninori Morimoto wrote:
> From: Ben Dooks <[e-mail]>
> 
> As with the previous commit, before a clock can be used it must be prepared
> for use. Change from clk_enable() and clk_disable() to the versions of the
> calls which also prepare and un-prepare the clocks.
> 
> Will fix warnings from the clock code when this is used.
> 
> Signed-off-by: Ben Dooks <[e-mail]>
> Signed-off-by: Kuninori Morimoto <[e-mail]>

Sorry, for some reason I misread this as being sent by Ben - applied,
thanks.

Kuninori Morimoto April 13, 2014, 11:58 p.m. UTC | #3

Hi Mark

> > From: Ben Dooks <[e-mail]>
> > 
> > As with the previous commit, before a clock can be used it must be prepared
> > for use. Change from clk_enable() and clk_disable() to the versions of the
> > calls which also prepare and un-prepare the clocks.
> > 
> > Will fix warnings from the clock code when this is used.
> > 
> > Signed-off-by: Ben Dooks <[e-mail]>
> > Signed-off-by: Kuninori Morimoto <[e-mail]>
> 
> Sorry, for some reason I misread this as being sent by Ben - applied,
> thanks.

Sorry. I didn't explain about that.
but, Thank you

Patch

diff --git a/sound/soc/sh/rcar/src.c b/sound/soc/sh/rcar/src.c
index 6232b7d..4d0720e 100644
--- a/sound/soc/sh/rcar/src.c
+++ b/sound/soc/sh/rcar/src.c
@@ -258,7 +258,7 @@  static int rsnd_src_init(struct rsnd_mod *mod,
 {
 	struct rsnd_src *src = rsnd_mod_to_src(mod);
 
-	clk_enable(src->clk);
+	clk_prepare_enable(src->clk);
 
 	return 0;
 }
@@ -269,7 +269,7 @@  static int rsnd_src_quit(struct rsnd_mod *mod,
 {
 	struct rsnd_src *src = rsnd_mod_to_src(mod);
 
-	clk_disable(src->clk);
+	clk_disable_unprepare(src->clk);
 
 	return 0;
 }
diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c
index 4b7e206..1d8387c 100644
--- a/sound/soc/sh/rcar/ssi.c
+++ b/sound/soc/sh/rcar/ssi.c
@@ -171,7 +171,7 @@  static void rsnd_ssi_hw_start(struct rsnd_ssi *ssi,
 	u32 cr;
 
 	if (0 == ssi->usrcnt) {
-		clk_enable(ssi->clk);
+		clk_prepare_enable(ssi->clk);
 
 		if (rsnd_dai_is_clk_master(rdai)) {
 			if (rsnd_ssi_clk_from_parent(ssi))
@@ -230,7 +230,7 @@  static void rsnd_ssi_hw_stop(struct rsnd_ssi *ssi,
 				rsnd_ssi_master_clk_stop(ssi);
 		}
 
-		clk_disable(ssi->clk);
+		clk_disable_unprepare(ssi->clk);
 	}
 
 	dev_dbg(dev, "ssi%d hw stopped\n", rsnd_mod_id(&ssi->mod));