linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: shawn.guo@linaro.org (Shawn Guo)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 6/8] ASoC: fsl_esai: fix struct clk pointer comparing
Date: Wed, 25 Feb 2015 22:53:36 +0800	[thread overview]
Message-ID: <1424876018-17852-7-git-send-email-shawn.guo@linaro.org> (raw)
In-Reply-To: <1424876018-17852-1-git-send-email-shawn.guo@linaro.org>

Since commit 035a61c314eb ("clk: Make clk API return per-user struct clk
instances"), clk API users can no longer check if two struct clk
pointers are pointing to the same hardware clock, i.e. struct clk_hw, by
simply comparing two pointers.  That's because with the per-user clk
change, a brand new struct clk is created whenever clients try to look
up the clock by calling clk_get() or sister functions like clk_get_sys()
and of_clk_get().  This changes the original behavior where the struct
clk is only created for once when clock driver registers the clock to
CCF in the first place.  The net change here is before commit
035a61c314eb the struct clk pointer is unique for given hardware
clock, while after the commit the pointers returned by clk lookup calls
become different for the same hardware clock.

That said, the struct clk pointer comparing in the code doesn't work any
more.  Call helper function clk_is_match() instead to fix the problem.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
---
 sound/soc/fsl/fsl_esai.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/soc/fsl/fsl_esai.c b/sound/soc/fsl/fsl_esai.c
index 5c7597191e3f..6e00e51b98c2 100644
--- a/sound/soc/fsl/fsl_esai.c
+++ b/sound/soc/fsl/fsl_esai.c
@@ -269,7 +269,7 @@ static int fsl_esai_set_dai_sysclk(struct snd_soc_dai *dai, int clk_id,
 	}
 
 	/* Only EXTAL source can be output directly without using PSR and PM */
-	if (ratio == 1 && clksrc == esai_priv->extalclk) {
+	if (ratio == 1 && clk_is_match(clksrc, esai_priv->extalclk)) {
 		/* Bypass all the dividers if not being needed */
 		ecr |= tx ? ESAI_ECR_ETO : ESAI_ECR_ERO;
 		goto out;
-- 
1.9.1

  parent reply	other threads:[~2015-02-25 14:53 UTC|newest]

Thread overview: 41+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-02-25 14:53 [PATCH 0/8] Fix struct clk pointer comparing Shawn Guo
2015-02-25 14:53 ` [PATCH 1/8] clk: add helper function clk_is_match() Shawn Guo
2015-02-25 17:27   ` Mike Turquette
2015-02-26  0:37     ` Shawn Guo
2015-02-26  9:02     ` [alsa-devel] " Ben Dooks
2015-02-26  9:56       ` Philipp Zabel
2015-02-26 11:25         ` Ben Dooks
2015-02-26 11:59           ` Ricard Wanderlof
2015-03-04  8:55     ` Geert Uytterhoeven
2015-03-04  9:51     ` Russell King - ARM Linux
2015-03-08 21:05     ` [PATCH] clk: provide clk_is_match() dummy for non-common clk Arnd Bergmann
2015-03-10 21:42       ` Geert Uytterhoeven
2015-03-11  7:09       ` Uwe Kleine-König
2015-03-11 10:22       ` Russell King - ARM Linux
2015-03-11 11:17         ` Uwe Kleine-König
2015-03-11 12:29           ` Russell King - ARM Linux
2015-03-12  0:35             ` Stephen Boyd
2015-02-25 14:53 ` [PATCH 2/8] ARM: imx: fix struct clk pointer comparing Shawn Guo
2015-02-25 14:53 ` [PATCH 3/8] drm: armada: " Shawn Guo
2015-02-25 14:53 ` [PATCH 4/8] pwm: atmel-hlcdc: " Shawn Guo
2015-02-26  9:22   ` Nicolas Ferre
2015-02-26  9:31     ` Boris Brezillon
2015-03-11 10:54   ` Thierry Reding
2015-02-25 14:53 ` [PATCH 5/8] serial: samsung: " Shawn Guo
2015-02-25 14:53 ` Shawn Guo [this message]
2015-02-26  2:36   ` [PATCH 6/8] ASoC: fsl_esai: " Mark Brown
2015-02-25 14:53 ` [PATCH 7/8] ASoC: fsl_spdif: " Shawn Guo
2015-02-25 21:04   ` Stephen Boyd
2015-02-26  1:17     ` Shawn Guo
2015-02-26  2:12   ` Mark Brown
2015-02-26  2:20     ` Shawn Guo
2015-02-26  2:29       ` Mark Brown
2015-02-26  2:36   ` Mark Brown
2015-02-25 14:53 ` [PATCH 8/8] ASoC: kirkwood: " Shawn Guo
2015-02-26  2:12   ` Mark Brown
2015-02-26  2:36   ` Mark Brown
2015-02-25 15:03 ` [PATCH 0/8] Fix " Russell King - ARM Linux
2015-02-25 17:55   ` Mike Turquette
2015-02-25 20:42     ` Stephen Boyd
2015-02-26  1:21       ` Shawn Guo
2015-02-26  1:24       ` Mike Turquette

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1424876018-17852-7-git-send-email-shawn.guo@linaro.org \
    --to=shawn.guo@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).