From: Arnd Bergmann <arnd@arndb.de> To: linux-kernel@vger.kernel.org, Ben Skeggs <bskeggs@redhat.com>, David Airlie <airlied@linux.ie> Cc: Arnd Bergmann <arnd@arndb.de>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, dri-devel@lists.freedesktop.org, linux-ide@vger.kernel.org, nouveau@lists.freedesktop.org, Tejun Heo <tj@kernel.org>, akpm@linux-foundation.org, Linus Torvalds <torvalds@linux-foundation.org>, Guenter Roeck <linux@roeck-us.net>, linux-media@vger.kernel.org Subject: [PATCH 12/14] drm/nouveau/clk: fix gcc-7 -Wint-in-bool-context warning Date: Fri, 14 Jul 2017 11:31:05 +0200 [thread overview] Message-ID: <20170714093129.1366900-3-arnd@arndb.de> (raw) In-Reply-To: <20170714092540.1217397-1-arnd@arndb.de> 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] In this instance, I think using multiplication is more intuitive than '&&', so I'm adding a comparison to zero instead to shut up the warning. To further improve readability, I also make the error case indented and leave the normal case as the final 'return' statement. Fixes: 7632b30e4b8b ("drm/nouveau/clk: namespace + nvidia gpu names (no binary change)") Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- drivers/gpu/drm/nouveau/nvkm/subdev/clk/gt215.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gt215.c b/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gt215.c index 96e0941c8edd..04b4f4ccf186 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gt215.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gt215.c @@ -130,10 +130,10 @@ 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); + if (M * P == 0) + return 0; - return 0; + return sclk * N / (M * P); } static int -- 2.9.0 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
WARNING: multiple messages have this Message-ID (diff)
From: Arnd Bergmann <arnd@arndb.de> To: linux-kernel@vger.kernel.org, Ben Skeggs <bskeggs@redhat.com>, David Airlie <airlied@linux.ie> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Linus Torvalds <torvalds@linux-foundation.org>, Tejun Heo <tj@kernel.org>, Guenter Roeck <linux@roeck-us.net>, linux-ide@vger.kernel.org, linux-media@vger.kernel.org, akpm@linux-foundation.org, dri-devel@lists.freedesktop.org, Arnd Bergmann <arnd@arndb.de>, nouveau@lists.freedesktop.org Subject: [PATCH 12/14] drm/nouveau/clk: fix gcc-7 -Wint-in-bool-context warning Date: Fri, 14 Jul 2017 11:31:05 +0200 [thread overview] Message-ID: <20170714093129.1366900-3-arnd@arndb.de> (raw) In-Reply-To: <20170714092540.1217397-1-arnd@arndb.de> 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] In this instance, I think using multiplication is more intuitive than '&&', so I'm adding a comparison to zero instead to shut up the warning. To further improve readability, I also make the error case indented and leave the normal case as the final 'return' statement. Fixes: 7632b30e4b8b ("drm/nouveau/clk: namespace + nvidia gpu names (no binary change)") Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- drivers/gpu/drm/nouveau/nvkm/subdev/clk/gt215.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gt215.c b/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gt215.c index 96e0941c8edd..04b4f4ccf186 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gt215.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gt215.c @@ -130,10 +130,10 @@ 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); + if (M * P == 0) + return 0; - return 0; + return sclk * N / (M * P); } static int -- 2.9.0
next prev parent reply other threads:[~2017-07-14 9:31 UTC|newest] Thread overview: 95+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-07-14 9:25 [PATCH 00/14] gcc-7 warnings Arnd Bergmann 2017-07-14 9:25 ` Arnd Bergmann 2017-07-14 9:25 ` [PATCH, RESEND 01/14] ide: avoid warning for timings calculation Arnd Bergmann 2017-07-14 9:25 ` Arnd Bergmann 2017-07-14 9:25 ` [PATCH, RESEND 02/14] ata: avoid gcc-7 warning in ata_timing_quantize Arnd Bergmann 2017-07-14 9:25 ` Arnd Bergmann 2017-07-15 10:56 ` Tejun Heo 2017-07-15 10:56 ` Tejun Heo 2017-07-14 9:25 ` [PATCH, RESEND 03/14] drm/vmwgfx: avoid gcc-7 parentheses warning Arnd Bergmann 2017-07-14 9:25 ` Arnd Bergmann 2017-07-14 10:11 ` Jani Nikula 2017-07-14 10:11 ` Jani Nikula 2017-07-14 19:21 ` Linus Torvalds 2017-07-14 19:21 ` Linus Torvalds 2017-07-14 19:23 ` Linus Torvalds 2017-07-14 20:28 ` Arnd Bergmann 2017-07-17 13:15 ` Sinclair Yeh 2017-07-17 13:15 ` Sinclair Yeh 2017-07-14 9:25 ` [PATCH 04/14] x86: math-emu: avoid -Wint-in-bool-context warning Arnd Bergmann 2017-07-14 9:25 ` Arnd Bergmann 2017-07-14 9:25 ` [PATCH 05/14] isdn: isdnloop: suppress a gcc-7 warning Arnd Bergmann 2017-07-14 9:25 ` Arnd Bergmann 2017-07-14 10:08 ` Joe Perches 2017-07-14 10:37 ` Arnd Bergmann 2017-07-15 4:20 ` Kevin Easton 2017-07-14 9:25 ` [PATCH 06/14] acpi: thermal: fix gcc-6/ccache warning Arnd Bergmann 2017-07-14 9:25 ` Arnd Bergmann 2017-07-14 9:25 ` [PATCH 07/14] proc/kcore: hide a harmless warning Arnd Bergmann 2017-07-14 9:25 ` Arnd Bergmann 2017-07-14 12:28 ` Ard Biesheuvel 2017-07-18 19:53 ` Arnd Bergmann 2017-07-18 19:53 ` Arnd Bergmann 2017-07-18 19:55 ` Ard Biesheuvel 2017-07-18 20:01 ` Arnd Bergmann 2017-07-18 20:07 ` Ard Biesheuvel 2017-07-18 20:21 ` Arnd Bergmann 2017-07-14 9:25 ` [PATCH 08/14] Input: adxl34x - fix gcc-7 -Wint-in-bool-context warning Arnd Bergmann 2017-07-14 9:25 ` Arnd Bergmann 2017-07-14 19:24 ` Linus Torvalds 2017-07-14 20:17 ` Arnd Bergmann 2017-07-14 21:40 ` Dmitry Torokhov 2017-07-14 9:30 ` [PATCH 09/14] SFI: fix tautological-compare warning Arnd Bergmann 2017-07-14 9:30 ` Arnd Bergmann 2017-07-14 9:31 ` [PATCH 10/14] staging:iio:resolver:ad2s1210 fix negative IIO_ANGL_VEL read Arnd Bergmann 2017-07-14 9:31 ` Arnd Bergmann 2017-07-15 11:42 ` Jonathan Cameron 2017-07-14 9:31 ` [PATCH 11/14] IB/uverbs: fix gcc-7 type warning Arnd Bergmann 2017-07-14 9:31 ` Arnd Bergmann 2017-07-14 9:46 ` Leon Romanovsky 2017-07-14 9:31 ` Arnd Bergmann [this message] 2017-07-14 9:31 ` [PATCH 12/14] drm/nouveau/clk: fix gcc-7 -Wint-in-bool-context warning Arnd Bergmann 2017-07-14 9:31 ` [PATCH 13/14] iopoll: avoid " Arnd Bergmann 2017-07-14 9:31 ` Arnd Bergmann 2017-07-14 9:55 ` Joe Perches 2017-07-14 10:22 ` Arnd Bergmann 2017-07-14 9:36 ` [PATCH 14/14] [media] fix warning on v4l2_subdev_call() result interpreted as bool Arnd Bergmann 2017-07-14 9:36 ` Arnd Bergmann 2017-07-14 9:36 ` Arnd Bergmann 2017-07-14 12:05 ` Dan Carpenter 2017-07-14 12:05 ` Dan Carpenter 2017-07-14 12:05 ` Dan Carpenter 2017-07-14 12:27 ` Arnd Bergmann 2017-07-14 12:27 ` Arnd Bergmann 2017-07-14 12:27 ` Arnd Bergmann 2017-07-14 12:55 ` Dan Carpenter 2017-07-14 12:55 ` Dan Carpenter 2017-07-14 12:55 ` Dan Carpenter 2017-07-14 13:09 ` Dan Carpenter 2017-07-14 13:09 ` Dan Carpenter 2017-07-14 13:09 ` Dan Carpenter 2017-07-14 19:32 ` Arnd Bergmann 2017-07-14 19:32 ` Arnd Bergmann 2017-07-14 19:32 ` Arnd Bergmann 2017-07-14 12:41 ` Dan Carpenter 2017-07-14 12:41 ` Dan Carpenter 2017-07-14 12:41 ` Dan Carpenter 2017-07-17 13:45 ` Hans Verkuil 2017-07-17 13:45 ` Hans Verkuil 2017-07-17 14:26 ` Arnd Bergmann 2017-07-17 14:26 ` Arnd Bergmann 2017-07-17 14:26 ` Arnd Bergmann 2017-07-17 14:28 ` Dan Carpenter 2017-07-17 14:28 ` Dan Carpenter 2017-07-17 14:28 ` Dan Carpenter 2017-07-17 14:32 ` Hans Verkuil 2017-07-17 14:32 ` Hans Verkuil 2017-07-17 14:32 ` Hans Verkuil 2017-07-17 14:35 ` Hans Verkuil 2017-07-17 14:35 ` Hans Verkuil 2017-07-17 14:35 ` Hans Verkuil 2017-07-17 21:23 ` Arnd Bergmann 2017-07-17 21:23 ` Arnd Bergmann 2017-07-17 21:23 ` Arnd Bergmann 2017-07-14 10:29 ` [PATCH 00/14] gcc-7 warnings Greg Kroah-Hartman 2017-07-14 10:29 ` Greg Kroah-Hartman
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20170714093129.1366900-3-arnd@arndb.de \ --to=arnd@arndb.de \ --cc=airlied@linux.ie \ --cc=akpm@linux-foundation.org \ --cc=bskeggs@redhat.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=gregkh@linuxfoundation.org \ --cc=linux-ide@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-media@vger.kernel.org \ --cc=linux@roeck-us.net \ --cc=nouveau@lists.freedesktop.org \ --cc=tj@kernel.org \ --cc=torvalds@linux-foundation.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.