From patchwork Mon Jun 25 15:12:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miquel Raynal X-Patchwork-Id: 10486637 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 14606604D3 for ; Mon, 25 Jun 2018 15:17:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0E8692835B for ; Mon, 25 Jun 2018 15:17:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 02A8E2850D; Mon, 25 Jun 2018 15:17:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id EC5EE2835B for ; Mon, 25 Jun 2018 15:17:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=kz/g5SqebZLT8zE/pPTYGIrk32mmBpcua/UdNKjGFFQ=; b=AruAp2ffw7vsPOpv/FTdxMdqZA 10aPb/W2Wf3oq0f1dPtasR5O7jEkfWE3/bApy9TPSdyWpLgJNdWMvL3GlQrnigmIbIY5T80fxHyIO C0GihXqSSYwehYDs4FXzh0ItTJgwkcG0ijRaYeLEQ/vVkmzzeiPb03Z+NTHHhfOyywdR5VSyYoCaZ SsOB/NPbBsl4HSZGx3986aKGcZv+B/RRo/gmQaMwxrr7SNSBxjBfl0KeSD57bzWzQKfxwMk66TMlj Ma3FmJRId5lVwU9L7WD9pfQksCvO6qUmSkFqd3D85bJ9OHM/Xmc86GWBfscJ2Ewcc9NulaYatZz3n lV8GTauw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fXTEk-0002s6-A0; Mon, 25 Jun 2018 15:17:02 +0000 Received: from merlin.infradead.org ([2001:8b0:10b:1231::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fXTB1-0007xS-J8 for linux-arm-kernel@bombadil.infradead.org; Mon, 25 Jun 2018 15:13:11 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=+vWhPhgjzoo4RGmIlIohowwB12Q7ZMnVS0J90nRbGZs=; b=tIeuBcYlaS3gwijOX7s/0jypK YDeawn6yI/ZVyKNvu12GB9xbdJJJviPvHgf97MRoUF2lAcgBREMo7+/K1IbcdLP4UxZEfzD3tfxXH K5gEQ2xW502kDpmiv063Qn4KdDKbc5VyhuP5XWcmriKVCkDQPE9LxRdZs5FsWTAcfRdTBjwI8VN6b NgzxIZ10uip8wNB5vhPhZxrlIc/xMz2x+X21xk9OfICVN23lJYiLtS31mNVGgYvUbCUlINDEgl8PE dDYnRnw1fx2WzqkXONnRxIRyKnHq5VPI5cZjnWi7WF91NuzgmOlKUrDXFkI0PVxW8K2DXYMIyhPT4 cHsaNnGEA==; Received: from mail.bootlin.com ([62.4.15.54]) by merlin.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fXTAw-0003de-Bv for linux-arm-kernel@lists.infradead.org; Mon, 25 Jun 2018 15:13:09 +0000 Received: by mail.bootlin.com (Postfix, from userid 110) id 29C7120DC1; Mon, 25 Jun 2018 17:12:45 +0200 (CEST) Received: from localhost.localdomain (AAubervilliers-681-1-87-188.w90-88.abo.wanadoo.fr [90.88.29.188]) by mail.bootlin.com (Postfix) with ESMTPSA id B4D8C203D9; Mon, 25 Jun 2018 17:12:44 +0200 (CEST) From: Miquel Raynal To: Gregory Clement , Jason Cooper , Andrew Lunn , Sebastian Hesselbarth , Zhang Rui , Eduardo Valentin Subject: [PATCH v2 10/23] thermal: armada: move validity check out of the read function Date: Mon, 25 Jun 2018 17:12:26 +0200 Message-Id: <20180625151239.20976-11-miquel.raynal@bootlin.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180625151239.20976-1-miquel.raynal@bootlin.com> References: <20180625151239.20976-1-miquel.raynal@bootlin.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180625_111306_787854_91D88F5D X-CRM114-Status: GOOD ( 13.33 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , devicetree@vger.kernel.org, linux-pm@vger.kernel.org, Antoine Tenart , Catalin Marinas , Will Deacon , Maxime Chevallier , Nadav Haklai , David Sniatkiwicz , Rob Herring , Thomas Petazzoni , Miquel Raynal , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Sensor selection when using multiple sensors already checks for the sensor validity. Move it to the legacy ->get_temp() hook, where it is still needed. Signed-off-by: Miquel Raynal --- drivers/thermal/armada_thermal.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/thermal/armada_thermal.c b/drivers/thermal/armada_thermal.c index 3d5b29133d3a..4e9f947a0f5f 100644 --- a/drivers/thermal/armada_thermal.c +++ b/drivers/thermal/armada_thermal.c @@ -328,13 +328,6 @@ static int armada_read_sensor(struct armada_thermal_priv *priv, long *temp) u32 reg, div; s64 sample, b, m; - /* Valid check */ - if (priv->data->is_valid && !priv->data->is_valid(priv)) { - dev_err(priv->dev, - "Temperature sensor reading not valid\n"); - return -EIO; - } - regmap_read(priv->syscon, priv->data->syscon_status_off, ®); reg = (reg >> priv->data->temp_shift) & priv->data->temp_mask; if (priv->data->signed_sample) @@ -363,6 +356,13 @@ static int armada_get_temp_legacy(struct thermal_zone_device *thermal, long temperature; int ret; + /* Valid check */ + if (priv->data->is_valid && !priv->data->is_valid(priv)) { + dev_err(priv->dev, + "Temperature sensor reading not valid\n"); + return -EIO; + } + /* Do the actual reading */ ret = armada_read_sensor(priv, &temperature); *temp = temperature;