From patchwork Wed Feb 25 14:53:38 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 5880701 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id AC183BF440 for ; Wed, 25 Feb 2015 15:00:24 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CBEB52025B for ; Wed, 25 Feb 2015 15:00:23 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id A9A0520353 for ; Wed, 25 Feb 2015 15:00:22 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id C9DD9261AE4; Wed, 25 Feb 2015 16:00:21 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id 1E6A02614F6; Wed, 25 Feb 2015 15:57:34 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id D51C42614F6; Wed, 25 Feb 2015 15:57:32 +0100 (CET) Received: from mail-pd0-f182.google.com (mail-pd0-f182.google.com [209.85.192.182]) by alsa0.perex.cz (Postfix) with ESMTP id E521226150C for ; Wed, 25 Feb 2015 15:55:52 +0100 (CET) Received: by pdjy10 with SMTP id y10so5380335pdj.6 for ; Wed, 25 Feb 2015 06:55:52 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=nRRScs26YS0CqISyXcYofoCxIaqpKgEDDvdhoKDKH/Q=; b=dv3UaX7RZLrJJYvmO5MLtVTHDTiW12vBa959pLe0fqJOJJsV0PDLJGWIUBE8ZOWcFq +7JWdK3TPX6U+qnt4rjkRCfFr+eWHxxxkVt4hoOIOwKF8mwgS2xMCWmexm9YTuQCbodM EgkTKbzFhl7i1+wFYSnGh/SeSJG+bNQwjeMSTPFTsbXuGzrtgz16FOX1O0hdKlCd7hhv xgL976RyW2PHAyfmEQts4DAsnhhfnsqghvLNM0Cq9plZNix1QoP70VxwDgjS6ngqzsez YXgIZtGXjZUgbcNxU+6vcO925hTVZg+FdoeAr+63WDkclfaCV2R3H+DVw7C1bB0wgifF eQTQ== X-Gm-Message-State: ALoCoQl/PmhavfSz6iXHC3FHUpYqF24CAV7od03GkhbfiBVAnGjzvgGKj1fuZ/spXxspGwEmKgOb X-Received: by 10.70.34.177 with SMTP id a17mr5860646pdj.123.1424876152129; Wed, 25 Feb 2015 06:55:52 -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.42 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 25 Feb 2015 06:55:51 -0800 (PST) From: Shawn Guo To: Mike Turquette Date: Wed, 25 Feb 2015 22:53:38 +0800 Message-Id: <1424876018-17852-9-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> Cc: linux-pwm@vger.kernel.org, alsa-devel@alsa-project.org, Russell King , linux-serial@vger.kernel.org, Greg Kroah-Hartman , Mark Brown , Stephen Boyd , dri-devel@lists.freedesktop.org, Thierry Reding , kernel@pengutronix.de, Shawn Guo , linux-arm-kernel@lists.infradead.org Subject: [alsa-devel] [PATCH 8/8] ASoC: kirkwood: fix struct clk pointer comparing X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Acked-by: Mark Brown --- sound/soc/kirkwood/kirkwood-i2s.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/kirkwood/kirkwood-i2s.c b/sound/soc/kirkwood/kirkwood-i2s.c index def7d8260c4e..d19483081f9b 100644 --- a/sound/soc/kirkwood/kirkwood-i2s.c +++ b/sound/soc/kirkwood/kirkwood-i2s.c @@ -579,7 +579,7 @@ static int kirkwood_i2s_dev_probe(struct platform_device *pdev) if (PTR_ERR(priv->extclk) == -EPROBE_DEFER) return -EPROBE_DEFER; } else { - if (priv->extclk == priv->clk) { + if (clk_is_match(priv->extclk, priv->clk)) { devm_clk_put(&pdev->dev, priv->extclk); priv->extclk = ERR_PTR(-EINVAL); } else {