From patchwork Tue Jul 25 15:40:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 108660 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp714006qge; Tue, 25 Jul 2017 08:41:47 -0700 (PDT) X-Received: by 10.84.231.140 with SMTP id g12mr22318132plk.256.1500997307506; Tue, 25 Jul 2017 08:41:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500997307; cv=none; d=google.com; s=arc-20160816; b=VVcJ55n6/0LP4bThdUMWLQHKIRrfhZq56e8N1QEcBZ9bj2fHkMoCYjiTQxnJw/IjwE CmE2G7NbcEJaDWzGWcyP5P+XAW5Sa8I/JRanofZmWaOOmR3YiUjrEtOkP/HqbKeWio3Y xhqj8rAFEwTeDf5IK0IGo1ZJY8E9GWdB0U/O5Tfz/VBgzinOcZ6EeHxcxidiM7bLSGYj wJl/nmw4BRrF++lzNORrq44V9Dr8mHKQWf4RLQGAY4XpqSgJMS22W2Gtum6GMJPZu3gx XluQhiosyVONnjN47/n5MzFNdoYFZAfLaed0mnyRCP4btlkHF0EhM8kYQ9W54Os14pVg JW7A== 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=F8d0QQOGtLpDVAjxXMN98IEBKV8XkuISjvM/zaoQ1ik=; b=Hb7lNtz29wJGvDn+Ium+srr+meZIx8Pvyn/G9AgYlBHc7eTkPlWhZaEu712rCWS3bo a80rdGmeMdljqDhA5Mt0K3OHg6jFoQIJZ+jNKfat/t64ZJBeiDe4M1/j7t+YGIGyAQcK N8JAxiyyoGwiKRWHHBHNi4evWVjzcPX9qwQ8ItRHl3jeDgTyHZPxHZwpBikv3stZp+0V +zXdohvz8HyF5vSSodLlBdJ7Sx0Q2SYN74QhCoufArFvYuWB40b3tNuzrB2SP36np1aE 05xjDPodTkRXMUOVL2712gIEf2AArvI0Q6ioHTjAqCB/iQGTGJqXbURMXjR/AfF1D1E5 LmSQ== 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 f70si8247606pfe.240.2017.07.25.08.41.47; Tue, 25 Jul 2017 08:41:47 -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 S1752856AbdGYPlp (ORCPT + 26 others); Tue, 25 Jul 2017 11:41:45 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:50081 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752144AbdGYPlm (ORCPT ); Tue, 25 Jul 2017 11:41:42 -0400 Received: from wuerfel.lan ([5.56.224.194]) by mrelayeu.kundenserver.de (mreue101 [212.227.15.145]) with ESMTPA (Nemesis) id 0MKJHi-1dYNGk2JS2-001fJl; Tue, 25 Jul 2017 17:41:32 +0200 From: Arnd Bergmann To: Yannick Fertre , Philippe Cornu , Benjamin Gaignard , Vincent Abriou , David Airlie Cc: Arnd Bergmann , Neil Armstrong , Archit Taneja , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH] drm/stm: fix warning about multiplication in condition Date: Tue, 25 Jul 2017 17:40:52 +0200 Message-Id: <20170725154130.332221-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:L1KgIp87nlv/0httxRci34AODCmRiEkxeBKYWusdy7ULfGJZTh3 pq+Fo6uhUb0RYQ9v6sg7ZVn8xB97s83FZpOUXkzJ0KDs6H+tMQtUduNmGuYM/F+Z3IMlzG7 EzcabyxneuxWlUv+yxqaOeTXTNfu3GTglI/cdd88R+qbtxeQExVCFNHFxrMmrEEeSJCTGBk sPU40QMSmhH1PWPuVQylQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:fPvkbDqJ8G0=:pmepIXf5mQ29Rte79ayekQ tSjOZsgokDLcno1o/oQ4hddHZsRV8Tx/Ac84hRfI/VmiKnXaGtUMaHLCdms0ErKruH55kYdGG dBYgi9dDhUSOuRx+JlG+W6XqRwXzFzoQTsIRGTz4jLfHo7J3FdVskDtCx1mKMIr4rBecxr3pD IwYq2MHQgg16bSm0c4FyTE+t/HoZ3Bgn3ZbEFCjsV3I+I/xHD7DYNRShuZrmt+pYUAOr1d8od O6CP7XQA4YaYQ+wT+uYKAgli98BvJXtpxlQthNrKHyXq10f3ZywTfhh669VPUAzIa2vbbWUpY iksj4y7hmIw7tAZfgsVYhn5etxXgh7tD4s21bF7G/jXXSLW+YErskbWb++VH7YUZt+i4PPqlL eEyR/twID6zndFXZ3NthDTSC1PDo8Qa81NWejLp6shFKULGXwmC+m+EVuISpc2WvbmNWJuwFt 8pA6pgET8g7ppdvBvbW1xj6KQcEJNljLIdkb0GeDsyRjRkKlw1F39JsCRGYGmz2v2Gw83SxfH j1fcRgYa1AU52LDLox/tFxotCrsr+jO5zmT4Eha1QudgPcEagjz6dY8ueIwt07zU4MCUNz75Z Oo+DyX6vZErV8BCw02QbRL3vHGuQcl8irBcGLFg/NTjbErv+qBGveijCKIknUddGwqkk9f+Pe N+HAZ+y7dp6YTkIspgCY69JvYrf2su1XDM/sg9ZSE0ewxoZxTIVQwFIEP0w0+rDXaePu5+0o9 VIIR39CtZQlYzDG4Byv+kU2PD7O/V3THbQhk+A== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org gcc-7 complains about multiplying within a condition being suspicious: drivers/gpu/drm/stm/dw_mipi_dsi-stm.c: In function 'dsi_pll_get_clkout_khz': drivers/gpu/drm/stm/dw_mipi_dsi-stm.c:117:10: error: '*' in boolean context, suggest '&&' instead [-Werror=int-in-bool-context] The code here is correct, but can be easily rephrased to make that more obvious. I also swap out the error handling and the normal code path for clarity. Fixes: b0f09a3c69d9 ("drm/stm: Add STM32 DSI controller driver") Signed-off-by: Arnd Bergmann --- drivers/gpu/drm/stm/dw_mipi_dsi-stm.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) -- 2.9.0 diff --git a/drivers/gpu/drm/stm/dw_mipi_dsi-stm.c b/drivers/gpu/drm/stm/dw_mipi_dsi-stm.c index 568c5d0461ea..e5b6310240fe 100644 --- a/drivers/gpu/drm/stm/dw_mipi_dsi-stm.c +++ b/drivers/gpu/drm/stm/dw_mipi_dsi-stm.c @@ -113,11 +113,13 @@ static enum dsi_color dsi_color_from_mipi(enum mipi_dsi_pixel_format fmt) static int dsi_pll_get_clkout_khz(int clkin_khz, int idf, int ndiv, int odf) { + int divisor = idf * odf; + /* prevent from division by 0 */ - if (idf * odf) - return DIV_ROUND_CLOSEST(clkin_khz * ndiv, idf * odf); + if (!divisor) + return 0; - return 0; + return DIV_ROUND_CLOSEST(clkin_khz * ndiv, divisor); } static int dsi_pll_get_params(int clkin_khz, int clkout_khz,