Skip to content

Commit

Permalink
drm/nouveau/clk: fix gcc-7 -Wint-in-bool-context warning
Browse files Browse the repository at this point in the history
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 <arnd@arndb.de>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
  • Loading branch information
Arnd Bergmann authored and Ben Skeggs committed Feb 2, 2018
1 parent e64fe9d commit b515483
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions drivers/gpu/drm/nouveau/nvkm/subdev/clk/gt215.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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
Expand Down

0 comments on commit b515483

Please sign in to comment.