Commit bec2ddfd authored Aug 23, 2020 by Laurent Pinchart Committed by Mauro Carvalho Chehab Aug 26, 2020

media: ti-vpe: cal: Fix compilation on 32-bit ARM



When compiled on 32-bit ARM, the CAL driver fails with the FIELD_PREP()
macro complaining that the mask is not constant. While all callers of
the inline cal_write_field() function pass a constant mask, the mask
parameter itself is a variable, which likely doesn't please the
compiler.

Fix it by replacing FIELD_PREP() with a manual implementation.

Fixes: 50797fb3 ("media: ti-vpe: cal: Turn reg_(read|write)_field() into inline functions")
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Reported-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

parent d012a719

drivers/media/platform/ti-vpe/cal.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -226,7 +226,7 @@ static inline void cal_write_field(struct cal_dev *cal, u32 offset, u32 value,
		u32 val = cal_read(cal, offset);

		val &= ~mask;
		val \|= FIELD_PREP(mask, value);
		val \|= (value << __ffs(mask)) & mask;
		cal_write(cal, offset, val);
		}

Admin message