drm/stm: fix warning about multiplication in condition
Subsystems (4)
PATCH RESEND 1/1 drm/stm: fix warning about multiplication in condition
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.
---
Originally sent on July 25, but never made it into linux-next. The warning is currently disabled in mainline, but this seems to be a legitimate instance, and we may want to turn it back on in the future.
--- drivers/gpu/drm/stm/dw_mipi_dsi-stm.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/gpu/drm/stm/dw_mipi_dsi-stm.c +5 -3
@@ -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,
Signature · 1 line
2.9.0
Hi Benjamin,
This should be pushed to drm-misc by you, right?
Thanks,
Archit
Quoted 45 lines · Arnd Bergmann
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")Acked-by Philippe Cornu <[email protected]>Tested-by Philippe Cornu <[email protected]>Signed-off-by Arnd Bergmann <[email protected]>---
Originally sent on July 25, but never made it into linux-next. The warning is currently disabled in mainline, but this seems to be a legitimate instance, and we may want to turn it back on in the future.--- drivers/gpu/drm/stm/dw_mipi_dsi-stm.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)drivers/gpu/drm/stm/dw_mipi_dsi-stm.c +5
-3@@ -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,
Signature · 6 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 3 lines · Archit Taneja
Hi Benjamin,
This should be pushed to drm-misc by you, right?
I applied it. I guess Philippe Cornu should also become drm-misc committer instead of just acking a patch and hoping fairies will pick it up. -Daniel
Quoted 55 lines
Thanks,
ArchitQuoted 42 lines · Arnd Bergmann
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")Acked-by Philippe Cornu <[email protected]>Tested-by Philippe Cornu <[email protected]>Signed-off-by Arnd Bergmann <[email protected]>---
Originally sent on July 25, but never made it into linux-next. The warning is currently disabled in mainline, but this seems to be a legitimate instance, and we may want to turn it back on in the future.--- drivers/gpu/drm/stm/dw_mipi_dsi-stm.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)drivers/gpu/drm/stm/dw_mipi_dsi-stm.c +5
-3@@ -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,Signature · 6 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel