Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1727501

[PATCH] [RESEND] drm/nouveau/clk: fix gcc-7 -Wint-in-bool-context warning

Show all headers | View raw

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>
---
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.
---
 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

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] [RESEND] drm/nouveau/clk: fix gcc-7 -Wint-in-bool-context warning Arnd Bergmann <arnd@arndb.de> - 2017-09-06 16:00 +0200
  Re: [Nouveau] [PATCH] [RESEND] drm/nouveau/clk: fix gcc-7  -Wint-in-bool-context warning Karol Herbst <karolherbst@gmail.com> - 2017-09-06 16:30 +0200
    Re: [Nouveau] [PATCH] [RESEND] drm/nouveau/clk: fix gcc-7  -Wint-in-bool-context warning Arnd Bergmann <arnd@arndb.de> - 2017-09-06 22:20 +0200
      Re: [Nouveau] [PATCH] [RESEND] drm/nouveau/clk: fix gcc-7  -Wint-in-bool-context warning Karol Herbst <karolherbst@gmail.com> - 2017-09-06 22:20 +0200
        Re: [Nouveau] [PATCH] [RESEND] drm/nouveau/clk: fix gcc-7  -Wint-in-bool-context warning Arnd Bergmann <arnd@arndb.de> - 2017-09-06 23:50 +0200

csiph-web