drm/nouveau/clk: fix gcc-7 -Wint-in-bool-context warning

Web:        https://git.kernel.org/torvalds/c/b515483e12b81da8cb62f1ff2461d6c29cf5115f
Commit:     b515483e12b81da8cb62f1ff2461d6c29cf5115f
Parent:     e64fe9db2d1a31f6475ab1d5758860e7aa0cbb88
Refname:    refs/heads/master
Author:     Arnd Bergmann <[email protected]>
AuthorDate: Tue Jan 16 14:44:50 2018 +0100
Committer:  Ben Skeggs <[email protected]>
CommitDate: Fri Feb 2 15:24:10 2018 +1000

    drm/nouveau/clk: fix gcc-7 -Wint-in-bool-context warning
    
    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.
    
    Signed-off-by: Arnd Bergmann <[email protected]>
    Signed-off-by: Ben Skeggs <[email protected]>
---
 drivers/gpu/drm/nouveau/nvkm/subdev/clk/gt215.c | 9 ++++++---
 1 file changed, 6 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..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
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html