diff options
| author |   Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2020-08-23 07:02:57 +0200 |
|---|---|---|
| committer |   Mauro Carvalho Chehab <mchehab+huawei@kernel.org> | 2020-08-26 16:28:57 +0200 |
| commit | bec2ddfd39f07ac2c1dec9fd5299424ad75c0a9d (patch) | |
| tree | 1ab86483cff9fce147b9e18837b5b847d8efb226 /drivers/media | |
| parent | Linux 5.9-rc2 (diff) | |
| download | wireguard-linux-bec2ddfd39f07ac2c1dec9fd5299424ad75c0a9d.tar.xz wireguard-linux-bec2ddfd39f07ac2c1dec9fd5299424ad75c0a9d.zip | |
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: 50797fb30b95 ("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>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/platform/ti-vpe/cal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/platform/ti-vpe/cal.h b/drivers/media/platform/ti-vpe/cal.h index e496083715d2..4123405ee0cf 100644 --- a/drivers/media/platform/ti-vpe/cal.h +++ b/drivers/media/platform/ti-vpe/cal.h @@ -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); } |