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

Commit 02d97831 authored by Hans de Goede's avatar Hans de Goede Committed by Mauro Carvalho Chehab
Browse files

[media] atomisp: Fix -Werror=int-in-bool-context compile errors 



With gcc-7.1.1 I was getting the following compile error:

error: ‘*’ in boolean context, suggest ‘&&’ instead

The problem is the definition of CEIL_DIV:
 #define CEIL_DIV(a, b)       ((b) ? ((a) + (b) - 1) / (b) : 0)

Which when called as: CEIL_DIV(x, y * z) triggers this error, note
we cannot do as the error suggests since b is evaluated multiple times.

This commit fixes these compile errors.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent c2c611b7

drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.c

+0 −1
Original line number Diff line number Diff line
@@ -2506,7 +2506,6 @@ static void __configure_capture_pp_input(struct atomisp_sub_device *asd, 
	struct ia_css_pipe_extra_config *pipe_extra_configs =

		&stream_env->pipe_extra_configs[pipe_id];

	unsigned int hor_ds_factor = 0, ver_ds_factor = 0;

#define CEIL_DIV(a, b)       ((b) ? ((a) + (b) - 1) / (b) : 0)



	if (width == 0 && height == 0)

		return;

drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/math_support.h

+3 −3
Original line number Diff line number Diff line
@@ -62,15 +62,15 @@ 
#define MAX(a, b)            (((a) > (b)) ? (a) : (b))

#define MIN(a, b)            (((a) < (b)) ? (a) : (b))

#ifdef ISP2401

#define ROUND_DIV(a, b)      ((b) ? ((a) + ((b) >> 1)) / (b) : 0)

#define ROUND_DIV(a, b)      (((b) != 0) ? ((a) + ((b) >> 1)) / (b) : 0)

#endif

#define CEIL_DIV(a, b)       ((b) ? ((a) + (b) - 1) / (b) : 0)

#define CEIL_DIV(a, b)       (((b) != 0) ? ((a) + (b) - 1) / (b) : 0)

#define CEIL_MUL(a, b)       (CEIL_DIV(a, b) * (b))

#define CEIL_MUL2(a, b)      (((a) + (b) - 1) & ~((b) - 1))

#define CEIL_SHIFT(a, b)     (((a) + (1 << (b)) - 1)>>(b))

#define CEIL_SHIFT_MUL(a, b) (CEIL_SHIFT(a, b) << (b))

#ifdef ISP2401

#define ROUND_HALF_DOWN_DIV(a, b)	((b) ? ((a) + (b / 2) - 1) / (b) : 0)

#define ROUND_HALF_DOWN_DIV(a, b)	(((b) != 0) ? ((a) + (b / 2) - 1) / (b) : 0)

#define ROUND_HALF_DOWN_MUL(a, b)	(ROUND_HALF_DOWN_DIV(a, b) * (b))

#endif