From: Maxime Ripard Date: Wed, 27 Aug 2025 15:12:34 +0000 (+0200) Subject: drm/tidss: dispc: Switch to GENMASK instead of FLD_MASK X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=db7c13ebf2d4570efcb8bed0d6e772d3805bbb45;p=users%2Fhch%2Fmisc.git drm/tidss: dispc: Switch to GENMASK instead of FLD_MASK The dispc FLD_MASK function is an exact equivalent of the GENMASK macro. Let's convert the dispc driver to the latter. Signed-off-by: Maxime Ripard Link: https://lore.kernel.org/r/20250827-drm-tidss-field-api-v3-3-7689b664cc63@kernel.org Signed-off-by: Tomi Valkeinen --- diff --git a/drivers/gpu/drm/tidss/tidss_dispc.c b/drivers/gpu/drm/tidss/tidss_dispc.c index 6231e1aa07fd..b5f09ed2f370 100644 --- a/drivers/gpu/drm/tidss/tidss_dispc.c +++ b/drivers/gpu/drm/tidss/tidss_dispc.c @@ -594,31 +594,24 @@ void tidss_disable_oldi(struct tidss_device *tidss, u32 hw_videoport) * number. For example 7:0 */ -#define FLD_MASK(start, end) \ - ({ \ - int _end_inner = (end); \ - u32 _mask = ((1 << ((start) - _end_inner + 1)) - 1) << _end_inner; \ - _mask; \ - }) - #define FLD_VAL(val, start, end) \ ({ \ int _end_inner = (end); \ - u32 _new_val = ((val) << _end_inner) & FLD_MASK((start), _end_inner); \ + u32 _new_val = ((val) << _end_inner) & GENMASK((start), _end_inner); \ _new_val; \ }) #define FLD_GET(val, start, end) \ ({ \ int _end = (end); \ - u32 _ret_val = ((val) & FLD_MASK((start), _end)) >> _end; \ + u32 _ret_val = ((val) & GENMASK((start), _end)) >> _end; \ _ret_val; \ }) #define FLD_MOD(orig, val, start, end) \ ({ \ int _start = (start), _end = (end); \ - u32 _masked_val = (orig) & ~FLD_MASK(_start, _end); \ + u32 _masked_val = (orig) & ~GENMASK(_start, _end); \ u32 _new_val = _masked_val | FLD_VAL((val), _start, _end); \ _new_val; \ })