From patchwork Wed Feb 3 04:12:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Caesar Wang X-Patchwork-Id: 8197751 Return-Path: X-Original-To: patchwork-linux-pm@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 01D51BEEE5 for ; Wed, 3 Feb 2016 04:15:55 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B5D51201B4 for ; Wed, 3 Feb 2016 04:15:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8DB3420221 for ; Wed, 3 Feb 2016 04:15:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755883AbcBCENs (ORCPT ); Tue, 2 Feb 2016 23:13:48 -0500 Received: from mail-pa0-f65.google.com ([209.85.220.65]:35794 "EHLO mail-pa0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755874AbcBCENq (ORCPT ); Tue, 2 Feb 2016 23:13:46 -0500 Received: by mail-pa0-f65.google.com with SMTP id gi1so386182pac.2; Tue, 02 Feb 2016 20:13:45 -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=Ask16tpbJFarIPLI1WryQfVX6YIeEZLHvznnEGK8WsSodUaCBTZm5VFj1Qq4OYv03F GsH24B1PBo1XSdDnW8V+foM5B7ZU4SMNykpKUTecUFt3Rv2hgG6lmtsLiHP0Khj8mWp9 zialCULp4LW4gioRq4dvnIeXKrQWkBmDYT8yZcgZTbfwr7xnXkc54EKSXv5vo6izvxjM o1RyjIMEc/BV4jrGWpuZJbc/bRqWZYX1laNmqG2xnbGGxxaNe5/MfFwPYEzGGPittxg9 Idv4pQGZ9D+174YL+CPJfKR2Cl1xTYFFz1KgkzddNzstBiJuq7lXYsTaBgWQ/DHGckz4 STgQ== X-Gm-Message-State: AG10YORffcRbffOqkJSwb5BJ3LjITBZMEJWr0eVKmx4dDVkLXzb/DosWbtDE3/n9FPkr5g== X-Received: by 10.67.30.201 with SMTP id kg9mr7870027pad.132.1454472825680; Tue, 02 Feb 2016 20:13:45 -0800 (PST) Received: from localhost.localdomain ([103.29.142.67]) by smtp.gmail.com with ESMTPSA id cf6sm5809274pad.41.2016.02.02.20.13.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 02 Feb 2016 20:13:44 -0800 (PST) From: Caesar Wang To: Heiko Stuebner , edubezval@gmail.com Cc: huangtao@rock-chips.com, linux-rockchip@lists.infradead.org, zhangqing@rock-chips.com, Dmitry Torokhov , Caesar Wang , linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, Zhang Rui , linux-arm-kernel@lists.infradead.org Subject: [PATCH 3/8] thermal: rockchip: fix a impossible condition caused by the warning Date: Wed, 3 Feb 2016 12:12:42 +0800 Message-Id: <1454472767-5767-4-git-send-email-wxt@rock-chips.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1454472767-5767-1-git-send-email-wxt@rock-chips.com> References: <1454472767-5767-1-git-send-email-wxt@rock-chips.com> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 --- 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",