From patchwork Wed Feb 25 14:53:36 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 45074 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f199.google.com (mail-wi0-f199.google.com [209.85.212.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 629B120502 for ; Wed, 25 Feb 2015 14:55:37 +0000 (UTC) Received: by mail-wi0-f199.google.com with SMTP id bs8sf3818900wib.2 for ; Wed, 25 Feb 2015 06:55:36 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=1ZRCRpStFgXDy68np2LdsyQAcn6kvTEXSZCeq5gLJlg=; b=DcgKxxmNNrN44S1b8UJnafz5ao1rjJOAr+mFXACeAc3xVYoo4p9YSxj5sHbht4FR51 EAjN4613XXzCPk/SQvpQ+2+bu/Avd4RsEXnCUAf7JLfP5eo51aiwoQv5WD7+gM4UJMR3 TQHaWUFFTC21CLdqCWbn0LQlewK/XEJ8nlfk1FQG/avTohcKqge6MZExOiYa861Aehow 9pD0UsOoHLl+Lolv09MtthcfyvB/POY836QkfYMOR39AUj2VGwXv2sBP2tUV211m1TJ6 +czb5HESQhx2hOdUNS0fCJ2F1QlOybBfafmh6P67z04r42PttSDUQgYY55TAdCxsERb6 OxEQ== X-Gm-Message-State: ALoCoQnYbc71Kr0Uwlx1YeNtjFQHXm7sL9+GGavKDFyEOOa2J9+XwTmnOibCFtu+XKH3PYDHlJxH X-Received: by 10.180.89.194 with SMTP id bq2mr587304wib.4.1424876136746; Wed, 25 Feb 2015 06:55:36 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.28.100 with SMTP id a4ls577646lah.23.gmail; Wed, 25 Feb 2015 06:55:36 -0800 (PST) X-Received: by 10.152.182.196 with SMTP id eg4mr3151272lac.70.1424876136567; Wed, 25 Feb 2015 06:55:36 -0800 (PST) Received: from mail-la0-f52.google.com (mail-la0-f52.google.com. [209.85.215.52]) by mx.google.com with ESMTPS id bq3si31003905lbb.147.2015.02.25.06.55.36 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Feb 2015 06:55:36 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.52 as permitted sender) client-ip=209.85.215.52; Received: by labgd6 with SMTP id gd6so4396334lab.7 for ; Wed, 25 Feb 2015 06:55:36 -0800 (PST) X-Received: by 10.112.162.167 with SMTP id yb7mr3072429lbb.76.1424876136301; Wed, 25 Feb 2015 06:55:36 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.35.133 with SMTP id h5csp2668748lbj; Wed, 25 Feb 2015 06:55:35 -0800 (PST) X-Received: by 10.70.132.71 with SMTP id os7mr6252746pdb.94.1424876134638; Wed, 25 Feb 2015 06:55:34 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id xt17si24191169pac.212.2015.02.25.06.55.33 for ; Wed, 25 Feb 2015 06:55:34 -0800 (PST) Received-SPF: none (google.com: linux-serial-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752851AbbBYOzd (ORCPT ); Wed, 25 Feb 2015 09:55:33 -0500 Received: from mail-pa0-f42.google.com ([209.85.220.42]:41796 "EHLO mail-pa0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752557AbbBYOzc (ORCPT ); Wed, 25 Feb 2015 09:55:32 -0500 Received: by padfb1 with SMTP id fb1so5757214pad.8 for ; Wed, 25 Feb 2015 06:55:32 -0800 (PST) X-Received: by 10.70.133.168 with SMTP id pd8mr6121888pdb.122.1424876132359; Wed, 25 Feb 2015 06:55:32 -0800 (PST) Received: from localhost.localdomain (119.81.172.112-static.reverse.softlayer.com. [119.81.172.112]) by mx.google.com with ESMTPSA id nd5sm41502517pbc.64.2015.02.25.06.55.22 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 25 Feb 2015 06:55:31 -0800 (PST) From: Shawn Guo To: Mike Turquette Cc: linux-arm-kernel@lists.infradead.org, kernel@pengutronix.de, Russell King , Stephen Boyd , Thierry Reding , Greg Kroah-Hartman , Mark Brown , linux-pwm@vger.kernel.org, alsa-devel@alsa-project.org, dri-devel@lists.freedesktop.org, linux-serial@vger.kernel.org, Shawn Guo Subject: [PATCH 6/8] ASoC: fsl_esai: fix struct clk pointer comparing Date: Wed, 25 Feb 2015 22:53:36 +0800 Message-Id: <1424876018-17852-7-git-send-email-shawn.guo@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1424876018-17852-1-git-send-email-shawn.guo@linaro.org> References: <1424876018-17852-1-git-send-email-shawn.guo@linaro.org> Sender: linux-serial-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-serial@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: shawn.guo@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.52 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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 --- 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;