From patchwork Wed Feb 25 14:53:33 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 5880621 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 BCD74BF440 for ; Wed, 25 Feb 2015 14:56:52 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id F373020353 for ; Wed, 25 Feb 2015 14:56:51 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id C31ED2021B for ; Wed, 25 Feb 2015 14:56:50 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id EB6F6261606; Wed, 25 Feb 2015 15:56:49 +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 7B44A261483; Wed, 25 Feb 2015 15:55:33 +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 70DDE260824; Wed, 25 Feb 2015 15:55:29 +0100 (CET) Received: from mail-pd0-f179.google.com (mail-pd0-f179.google.com [209.85.192.179]) by alsa0.perex.cz (Postfix) with ESMTP id 2DC36261481 for ; Wed, 25 Feb 2015 15:55:07 +0100 (CET) Received: by pdjg10 with SMTP id g10so5421014pdj.1 for ; Wed, 25 Feb 2015 06:55:05 -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=pUn8YGatDMDqduXcJB2qkcN/sMNgdEu7r7IZfdjZF0s=; b=SjN5wnI0lcCY8ZHkSynuS+1ruEE1Wz8Ib5ldwYfG0sMV6TMrBl90o+xa3drPyfBigu l42RcxYDvjUu/iqoI7lWSMPAlNoYfXGLTM8w2gLyDrJxvzbqFW2k2L6mCRSZr444Ee0t 7L3o6vSqL1cG86i+PtitVB0AcR4hm1GWsfjpc6N6p21NaNGylAAJdW8GvEPMMIMBK+f9 KhyHdaVihV5yQNjfvzt8EYVAvAUfxJ9CW+w1U5c/fb897V4or61xhJdDbZjAFGl7SOZL ASumd1xwq56+ayaV+Cf75w4y3Eo6AysRbCrvtfgGfjtCA2G7/sz2pN4KkeAbMZT+Ae7t ybbA== X-Gm-Message-State: ALoCoQnUFiovp8cqQTObNzQI/i3NW0zeEAOnJUt3Xv1pmewA30RdPiuxavn/Z032QksRnudnokdN X-Received: by 10.70.127.131 with SMTP id ng3mr6046685pdb.31.1424876105615; Wed, 25 Feb 2015 06:55:05 -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.54.58 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 25 Feb 2015 06:55:05 -0800 (PST) From: Shawn Guo To: Mike Turquette Date: Wed, 25 Feb 2015 22:53:33 +0800 Message-Id: <1424876018-17852-4-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 3/8] drm: armada: 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 --- drivers/gpu/drm/armada/armada_510.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/armada/armada_510.c b/drivers/gpu/drm/armada/armada_510.c index ad3d2ebf95c9..862deafe8b24 100644 --- a/drivers/gpu/drm/armada/armada_510.c +++ b/drivers/gpu/drm/armada/armada_510.c @@ -53,7 +53,7 @@ static int armada510_crtc_compute_clock(struct armada_crtc *dcrtc, if (IS_ERR(clk)) return PTR_ERR(clk); - if (dcrtc->clk != clk) { + if (!clk_is_match(dcrtc->clk, clk)) { ret = clk_prepare_enable(clk); if (ret) return ret;