media: ti-vpe: cal: avoid FIELD_GET assertion
FIELD_GET() must only be used with a mask that is a compile-time constant: drivers/media/platform/ti-vpe/cal.h: In function 'cal_read_field': include/linux/compiler_types.h:320:38: error: call to '__compiletime_assert_247' declared with attribute error: FIELD_GET: mask is not constant include/linux/bitfield.h:46:3: note: in expansion of macro 'BUILD_BUG_ON_MSG' 46 | BUILD_BUG_ON_MSG(!__builtin_constant_p(_mask), \ | ^~~~~~~~~~~~~~~~ drivers/media/platform/ti-vpe/cal.h:220:9: note: in expansion of macro 'FIELD_GET' 220 | return FIELD_GET(mask, cal_read(cal, offset)); | ^~~~~~~~~ The problem here is that the function is not always inlined. Mark it __always_inline to avoid the problem. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
This commit is contained in:
parent
36fe4655d0
commit
d7a7d72106
|
@ -259,7 +259,7 @@ static inline void cal_write(struct cal_dev *cal, u32 offset, u32 val)
|
|||
iowrite32(val, cal->base + offset);
|
||||
}
|
||||
|
||||
static inline u32 cal_read_field(struct cal_dev *cal, u32 offset, u32 mask)
|
||||
static __always_inline u32 cal_read_field(struct cal_dev *cal, u32 offset, u32 mask)
|
||||
{
|
||||
return FIELD_GET(mask, cal_read(cal, offset));
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue