From patchwork Wed Sep 6 21:40:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 111840 Delivered-To: patch@linaro.org Received: by 10.140.94.166 with SMTP id g35csp1551044qge; Wed, 6 Sep 2017 14:41:32 -0700 (PDT) X-Google-Smtp-Source: ADKCNb4hRjTG9B1tJAuyaDEXG0dX83nLZRqkiDxN8qoxHxEf8AY4wDsuzINu2k1LusYGnDSHROnq X-Received: by 10.98.200.153 with SMTP id i25mr568721pfk.248.1504734092609; Wed, 06 Sep 2017 14:41:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504734092; cv=none; d=google.com; s=arc-20160816; b=yN0Myo4PpbXsNWXl730S+FIpDR5N8OSztnuZr5Kk+F5bG1g/p8nQYGMUlT8uR1OvgR wnmC5t4XaZNS2636vfeAB+kOWU9cugTEiH38brvxjv2fW9YUgXXPLPGI/jmsIFAN//PF zpEaeFz/3r/l1O8+WBKaeLuxGq2fTuA2CgX6IjHoE5TA9UhLzClkgIGjm8CIUnfZrNdA d+p3t3bTJnmXl5kIgcBVqJrRs1q6ga91bB6MRZFmODrWn00/OO2aHN9JX7O9XySCWO2c lMk7rXmSXS9FoHGP6M0C5UkGdfGxV251XkX88n6nouWNX+fAPigmKWQ33FIgDwIhFKAZ QsxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=0d7v5s5AETtM85omnS1n/ntAjxTkh+rPJZN11Rie/lM=; b=l6UB1cTXFyIu1WcfHyJPCq5sg8d6CtNdj7pcO48Igs5Uzi62R+En7RogVbvgY6oUU0 lknSuRw+w82NU4EfviMNgE81cVP3CGOTG9M1Ne0z2nWgi1j+Opu1obpVDAojknULKPSp LSHM2GrEyxkZRJCe+/4jtdygCE9RjfHS16vEpwZ/fKi5FRUrmr+TWQmbeJWHh6JntN78 bVoYvp1k2fHpC6RC/RS9SpSzOKtPV+Q5mf/zggElBqlnInxtHikm0mGEtOsKKpfRLt38 Tyu2OFiRu2ReyRL5ooIQmJSUZ6PWSF9dgaJECzZqIFa8yf9J01QXkLKiT/qeQHQfsM8y KYSQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i62si628939pgc.583.2017.09.06.14.41.32; Wed, 06 Sep 2017 14:41:32 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754375AbdIFVl2 (ORCPT + 26 others); Wed, 6 Sep 2017 17:41:28 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:60360 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754247AbdIFVlT (ORCPT ); Wed, 6 Sep 2017 17:41:19 -0400 Received: from wuerfel.lan ([95.208.190.237]) by mrelayeu.kundenserver.de (mreue001 [212.227.15.129]) with ESMTPA (Nemesis) id 0LhoIM-1d3yuC1fGs-00nDRU; Wed, 06 Sep 2017 23:41:10 +0200 From: Arnd Bergmann To: Ben Skeggs , David Airlie Cc: Karol Herbst , Arnd Bergmann , Baoyou Xie , dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH] [v2] drm/nouveau/clk: fix gcc-7 -Wint-in-bool-context warning Date: Wed, 6 Sep 2017 23:40:53 +0200 Message-Id: <20170906214108.1985196-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:irTedbdMJPt7gUsDoNyZbSFiFlJdhuqH7I7HGRZQZsKZzQ1bYOb jMs9y2OtI3dRZpaFvvdO27OZ6jN+X6NyYycYGWOl+Q73A72jBQl9ALPv26VUebidMAovXW5 iFFfDWmqwe1QW9hy/bt9uoS1M1Jzt9CltgpgJyvfc0A5loSSKJJmqym6/fLfS1ATQKkMNJw xaluPWlr5gWnOx+1E2vLA== X-UI-Out-Filterresults: notjunk:1; V01:K0:tHTyjRYxA0M=:PIPomSvbcjd9mkA56krG44 SBJq1NLpJAJT/1BR0p5/qMb4kcLn3zDehB+kAJ29nho6TDxpWqSs8BbABc07BP3d9Wz8iRyAW DLvJJ7kspUzfw2S/TmTUrLeoMNRir/CSa82cjRNYZw7dD+mVYNgWTZSaD5ifHZvDcK3zNTYbT QaL4ddsvg0pcesRjZ9y+ci2RBs8cuOlWPcWeRU9/tuyNVILPz9misnCIQqbnmajMlpxdzZz3b B5Eszxp6g9eYbASIpDi7sRD0PnARRjqRKUDHOYukc3pedojfw13JbWYQjOd8bE/PefEMyZn+b rsUNp79arZr/V8buq3AraJ0/7huKZAG6qMRqLmVKvAp1xsTxWRZzbjCdAogrbsKX6QcohSCqX eqwo2OSctRNzGeIQQE+dEyTtBmqu1sMTfbBHnA5t1yZmw6TiEpYmFecGXRYRMx52fxPo4DAEk K2GgS56iX5iyTYd2f0Tg++JjA1bUMs8zIABxM6SBTdD5tvgIzSj+/U28MDMS0UROPsxTENzYj eMBSl/wpuXpKJykspgLpwLleH1Hsh2opW2eq4UtwaqucKTCw4SC2uW95U8Wg0YG197+niWhah EanJHR21gz7m50Ue8vBhQ3I/ZJDfohYUq75cc5UnJJgR7YbNYkhVmCt6wJvTPkRmOXCYjMYb2 Wk0ShbJSpnBDHObU+WcY1zIR23xhgI/bDgmYZsr4W6tg4VWND0o8DGeO71+kicoIAhTk00pIe JJiJOYBnwSAuemWQJLRDMKjXNFPXrFrle9u3BA== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org gcc thinks that interpreting a multiplication result as a bool is confusing: drivers/gpu/drm/nouveau/nvkm/subdev/clk/gt215.c: In function 'read_pll': drivers/gpu/drm/nouveau/nvkm/subdev/clk/gt215.c:133:8: error: '*' in boolean context, suggest '&&' instead [-Werror=int-in-bool-context] Adding a temporary variable to contain the divisor helps make it clear what is going on and avoids that warning. Fixes: 7632b30e4b8b ("drm/nouveau/clk: namespace + nvidia gpu names (no binary change)") Signed-off-by: Arnd Bergmann --- Originally submitted on July 14, but no reply. This is the same patch again. The warning is currently disabled in mainline, but I think we can turn it back on in the future, and this change here seems harmless. v2: use a temporary variable as suggested by Karol Herbst. --- drivers/gpu/drm/nouveau/nvkm/subdev/clk/gt215.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) -- 2.9.0 diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gt215.c b/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gt215.c index 96e0941c8edd..f0a26881d9b9 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gt215.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gt215.c @@ -110,6 +110,7 @@ read_pll(struct gt215_clk *clk, int idx, u32 pll) struct nvkm_device *device = clk->base.subdev.device; u32 ctrl = nvkm_rd32(device, pll + 0); u32 sclk = 0, P = 1, N = 1, M = 1; + u32 MP; if (!(ctrl & 0x00000008)) { if (ctrl & 0x00000001) { @@ -130,10 +131,12 @@ read_pll(struct gt215_clk *clk, int idx, u32 pll) sclk = read_clk(clk, 0x10 + idx, false); } - if (M * P) - return sclk * N / (M * P); + MP = M * P; - return 0; + if (!MP) + return 0; + + return sclk * N / MP; } static int