From patchwork Mon Feb 15 07:33:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Caesar Wang X-Patchwork-Id: 8310601 Return-Path: X-Original-To: patchwork-linux-rockchip@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 64983C02AA for ; Mon, 15 Feb 2016 07:35:51 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8161C201F2 for ; Mon, 15 Feb 2016 07:35:50 +0000 (UTC) Received: from bombadil.infradead.org (unknown [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 0060620465 for ; Mon, 15 Feb 2016 07:35:48 +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 1aVDgy-0005Hh-7N; Mon, 15 Feb 2016 07:35:32 +0000 Received: from mail-pa0-f67.google.com ([209.85.220.67]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aVDgL-0003nH-1m; Mon, 15 Feb 2016 07:34:54 +0000 Received: by mail-pa0-f67.google.com with SMTP id yy13so6865335pab.1; Sun, 14 Feb 2016 23:34:32 -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=lWZE6SFUy0nu1lwZcEWg2z2VgQQ/ad01N7TCtRv3UT4=; b=MCIvn4kkGlX8xpb8eUxyuU2lNmrX5yRnLTzIMeGbS0SzsyRvGoO+KMIRojTscz6Pc/ WMwBCoCsf5xl9nRNXGzRJhnQcqxJL+Lt5YtNoDNMmuXNACNjYho8hgFh4HAS6ssEwIgD +FvzfID5LuuGdh9TnfxwW4jHfldzEx5IaSI+LOOlYD+IF6godkJ1yiDKAm86CyxpFuxs ST8hsBFbvXazOckAJ7zbVxiG0m3/diyYX+icLsXhTLpCL5FkgGiZokcMoogYjMrmHHSe LRIpIKs1pYVHzL4K8+6CZPlqQMK9W0qhjUZS2e62zWXRA3YDLkAa6dCs9Dirf71AGspX qpsA== X-Gm-Message-State: AG10YOTaux+vAA2oTScW5ytlcHonVdT5/Q23kaPpKSOpqB7rb5lepnVjaJpDw0m7XK7uDw== X-Received: by 10.66.246.165 with SMTP id xx5mr21539033pac.87.1455521672437; Sun, 14 Feb 2016 23:34:32 -0800 (PST) Received: from localhost.localdomain ([103.29.142.67]) by smtp.gmail.com with ESMTPSA id o17sm36040286pfj.50.2016.02.14.23.34.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 14 Feb 2016 23:34:31 -0800 (PST) From: Caesar Wang To: Heiko Stuebner , edubezval@gmail.com Subject: [RESEND PATCH 3/8] thermal: rockchip: fix a impossible condition caused by the warning Date: Mon, 15 Feb 2016 15:33:28 +0800 Message-Id: <1455521613-27340-4-git-send-email-wxt@rock-chips.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1455521613-27340-1-git-send-email-wxt@rock-chips.com> References: <1455521613-27340-1-git-send-email-wxt@rock-chips.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160214_233453_413359_DB8CF222 X-CRM114-Status: GOOD ( 11.23 ) 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: huangtao@rock-chips.com, Dmitry Torokhov , linux-pm@vger.kernel.org, Michael Turquette , zhangqing@rock-chips.com, Stephen Boyd , linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Jeffy Chen , Zhang Rui , linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, 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=-3.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RDNS_NONE,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 --- 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 b58e3fb..433085a 100644 --- a/drivers/thermal/rockchip_thermal.c +++ b/drivers/thermal/rockchip_thermal.c @@ -693,15 +693,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",