ASoC: rsnd: fix src clock prepare/unprepare
diff mbox

Message ID 1396018997-12390-1-git-send-email-ben.dooks@codethink.co.uk
State New, archived
Headers show

Commit Message

Ben Dooks March 28, 2014, 3:03 p.m. UTC
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 <ben.dooks@codethink.co.uk>
---
 sound/soc/sh/rcar/scu.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Mark Brown March 29, 2014, 10:10 a.m. UTC | #1
On Fri, Mar 28, 2014 at 03:03:17PM +0000, Ben Dooks wrote:
> 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 <ben.dooks@codethink.co.uk>
> ---
>  sound/soc/sh/rcar/scu.c | 4 ++--

This doesn't apply against mainline, mainline doesn't have scu.c at all.
Ben Dooks March 30, 2014, 1:36 p.m. UTC | #2
On 29/03/14 10:10, Mark Brown wrote:
>>  sound/soc/sh/rcar/scu.c | 4 ++--

It was against your current development branch which is
what we having been testing against (due to the large number
of commits in the rcar area)
Mark Brown March 30, 2014, 10:24 p.m. UTC | #3
On Sun, Mar 30, 2014 at 02:36:34PM +0100, Ben Dooks wrote:
> On 29/03/14 10:10, Mark Brown wrote:
> >> sound/soc/sh/rcar/scu.c | 4 ++--

> It was against your current development branch which is
> what we having been testing against (due to the large number
> of commits in the rcar area)

It would be easier to tell what you are talking about if you were to
quote some context from what you are replying to...  I'm guessing this
is the file that doesn't exist, the above path not present in linux-next
so I don't know what you mean by my "current development branch".  Are
you *sure* you're not using Linus' tree?
Ben Dooks March 31, 2014, 10:05 a.m. UTC | #4
On 30/03/14 23:24, Mark Brown wrote:
> On Sun, Mar 30, 2014 at 02:36:34PM +0100, Ben Dooks wrote:
>> On 29/03/14 10:10, Mark Brown wrote:
>>>> sound/soc/sh/rcar/scu.c | 4 ++--
>
>> It was against your current development branch which is
>> what we having been testing against (due to the large number
>> of commits in the rcar area)
>
> It would be easier to tell what you are talking about if you were to
> quote some context from what you are replying to...  I'm guessing this
> is the file that doesn't exist, the above path not present in linux-next
> so I don't know what you mean by my "current development branch".  Are
> you *sure* you're not using Linus' tree?

Why would I be using Linus' tree, it just /does not work/ at all.

I used your sound.git tree to work on due to the number of patches
that where there.
Mark Brown March 31, 2014, 10:18 a.m. UTC | #5
On Mon, Mar 31, 2014 at 11:05:32AM +0100, Ben Dooks wrote:
> On 30/03/14 23:24, Mark Brown wrote:

> >It would be easier to tell what you are talking about if you were to
> >quote some context from what you are replying to...  I'm guessing this
> >is the file that doesn't exist, the above path not present in linux-next
> >so I don't know what you mean by my "current development branch".  Are
> >you *sure* you're not using Linus' tree?

> Why would I be using Linus' tree, it just /does not work/ at all.

> I used your sound.git tree to work on due to the number of patches
> that where there.

My git tree has many branches, which were you using?  I'm pretty sure it
was neither the rcar topic branch nor for-next.
Ben Dooks March 31, 2014, 10:30 a.m. UTC | #6
On 31/03/14 11:18, Mark Brown wrote:
> On Mon, Mar 31, 2014 at 11:05:32AM +0100, Ben Dooks wrote:
>> On 30/03/14 23:24, Mark Brown wrote:
>
>>> It would be easier to tell what you are talking about if you were to
>>> quote some context from what you are replying to...  I'm guessing this
>>> is the file that doesn't exist, the above path not present in linux-next
>>> so I don't know what you mean by my "current development branch".  Are
>>> you *sure* you're not using Linus' tree?
>
>> Why would I be using Linus' tree, it just /does not work/ at all.
>
>> I used your sound.git tree to work on due to the number of patches
>> that where there.
>
> My git tree has many branches, which were you using?  I'm pretty sure it
> was neither the rcar topic branch nor for-next.

I did merge in your "sound/topic/rcar" branch on 8th March, however
I just noticed my colleague had cherry-picked patches off the list
from earlier.

If I see the file again I will re-send the patch.

Patch
diff mbox

diff --git a/sound/soc/sh/rcar/scu.c b/sound/soc/sh/rcar/scu.c
index 9153a11..3b1d1d2 100644
--- a/sound/soc/sh/rcar/scu.c
+++ b/sound/soc/sh/rcar/scu.c
@@ -284,7 +284,7 @@  static int rsnd_scu_start(struct rsnd_mod *mod,
 		return 0;
 	}
 
-	clk_enable(scu->clk);
+	clk_prepare_enable(scu->clk);
 
 	/* it use DMA transter */
 
@@ -317,7 +317,7 @@  static int rsnd_scu_stop(struct rsnd_mod *mod,
 
 	rsnd_scu_transfer_stop(priv, mod, rdai, io);
 
-	clk_disable(scu->clk);
+	clk_disable_unprepare(scu->clk);
 
 	return 0;
 }