Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ff558e7 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Daniel Vetter
Browse files

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.

Fixes: b0f09a3c69d9 ("drm/stm: Add STM32 DSI controller driver")
Acked-by: default avatarPhilippe Cornu <philippe.cornu@st.com>
Tested-by: default avatarPhilippe Cornu <philippe.cornu@st.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20170906131331.2691300-1-arnd@arndb.de
parent 34cc0aa2

drivers/gpu/drm/stm/dw_mipi_dsi-stm.c

+5 −3
Original line number Diff line number Diff line
@@ -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)

{

	/* prevent from division by 0 */

	if (idf * odf)

		return DIV_ROUND_CLOSEST(clkin_khz * ndiv, idf * odf);

	int divisor = idf * odf;



	/* prevent from division by 0 */

	if (!divisor)

		return 0;



	return DIV_ROUND_CLOSEST(clkin_khz * ndiv, divisor);

}



static int dsi_pll_get_params(int clkin_khz, int clkout_khz,