From patchwork Sun Dec 20 09:06:45 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Caesar Wang X-Patchwork-Id: 7891381 Return-Path: X-Original-To: patchwork-linux-rockchip@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 956AE9F350 for ; Sun, 20 Dec 2015 09:07:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BD86F2041A for ; Sun, 20 Dec 2015 09:07:24 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DBB08203E6 for ; Sun, 20 Dec 2015 09:07:23 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1aAZxX-0002gU-VA; Sun, 20 Dec 2015 09:07:19 +0000 Received: from mail-pf0-f180.google.com ([209.85.192.180]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aAZxU-0002f1-PZ for linux-rockchip@lists.infradead.org; Sun, 20 Dec 2015 09:07:18 +0000 Received: by mail-pf0-f180.google.com with SMTP id o64so72410122pfb.3 for ; Sun, 20 Dec 2015 01:06:56 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=qaNkdYDEHM+kyuseriKm1H1YbYowuR23iTSSUu9F0WI=; b=E3Mais1i+Jv2XNJ9hae2ZQhMSS3vNMoCdjeQfMzBQ7SMRPNqKFuZlTCcV9ORFrZtPH 3wXcrDgf6b9hwm8P1uWE7fi3DIZpS9mJy67cV5mAXwVXLsCya0563+moaH0TEhxElpSw odoZC8NuE1mS6Jme0FkArLhoGkfg4e24G5ITr3EL+W2dLwJTLkLsBWnZIVs5CrTken5S ucewTpqOvuKdSaomYycxABMdWNPXqZNT17DqwNAxxoYAJmcW52CeWljEaSb9u3oVos78 +fbaePf70mBAaCmPvFGc98LNohpf6x/kE5B9nzF8lK4IYsnY44KXLH2Npw5ioTnW1ieT IS8A== X-Received: by 10.98.0.149 with SMTP id 143mr16897368pfa.73.1450602415841; Sun, 20 Dec 2015 01:06:55 -0800 (PST) Received: from localhost.localdomain ([103.29.142.67]) by smtp.gmail.com with ESMTPSA id 75sm27347602pfq.87.2015.12.20.01.06.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 20 Dec 2015 01:06:54 -0800 (PST) From: Caesar Wang To: edubezval@gmail.com Subject: [PATCH v4 2/5] thermal: rockchip: fix a impossible condition caused by the warning Date: Sun, 20 Dec 2015 17:06:45 +0800 Message-Id: <1450602405-20883-1-git-send-email-wxt@rock-chips.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1449132523-18817-1-git-send-email-wxt@rock-chips.com> References: <1449132523-18817-1-git-send-email-wxt@rock-chips.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151220_010716_896957_E7E15353 X-CRM114-Status: GOOD ( 11.42 ) X-Spam-Score: -2.6 (--) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, heiko@sntech.de, linux-pm@vger.kernel.org, dmitry.torokhov@gmail.com, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, rui.zhang@intel.com, computersforpeace@gmail.com, Caesar Wang MIME-Version: 1.0 Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP As the Dan report the smatch check the thermal driver warning: drivers/thermal/rockchip_thermal.c:551 rockchip_configure_from_dt() warn: impossible condition '(thermal->tshut_temp > ((~0 >> 1))) => (s32min-s32max > s32max)' Although The shut_temp read from DT is u32,the temperature is currently represented as int not long in the thermal driver. Let's change to make shut_temp instead of the thermal->tshut_temp for the condition. Fixes: commit 437df2172e8d ("thermal: rockchip: consistently use int for temperatures") Reported-by: Dan Carpenter Signed-off-by: Caesar Wang --- Changes in v4: - As the Dmitry and Brain comments, let's change to make.sh tshut_temp instead of thermal->tshut_temp. Changes in v3: - As Brian comments on https://patchwork.kernel.org/patch/7580661/, let's remove the impossible condition. Changes in v2: - None Changes in v1: - None drivers/thermal/rockchip_thermal.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/thermal/rockchip_thermal.c b/drivers/thermal/rockchip_thermal.c index e845841..7106288 100644 --- a/drivers/thermal/rockchip_thermal.c +++ b/drivers/thermal/rockchip_thermal.c @@ -545,15 +545,14 @@ static int rockchip_configure_from_dt(struct device *dev, thermal->chip->tshut_temp); thermal->tshut_temp = thermal->chip->tshut_temp; } else { + if (shut_temp > INT_MAX) { + dev_err(dev, "Invalid tshut temperature specified: %d\n", + shut_temp); + return -ERANGE; + } thermal->tshut_temp = shut_temp; } - if (thermal->tshut_temp > INT_MAX) { - dev_err(dev, "Invalid tshut temperature specified: %d\n", - thermal->tshut_temp); - return -ERANGE; - } - if (of_property_read_u32(np, "rockchip,hw-tshut-mode", &tshut_mode)) { dev_warn(dev, "Missing tshut mode property, using default (%s)\n",