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 <mrip...@kernel.org>
---
drivers/gpu/drm/tidss/tidss_dispc.c | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/drivers/gpu/drm/tidss/tidss_dispc.c
b/drivers/gpu/drm/tidss/tidss_dispc.c
index
10fbc99621c149f4e119ef4a45867c369ca5df0b..929c9e3ac1174df68937afd86f13bda4e3a66394
100644
--- a/drivers/gpu/drm/tidss/tidss_dispc.c
+++ b/drivers/gpu/drm/tidss/tidss_dispc.c
@@ -607,35 +607,28 @@ void tidss_disable_oldi(struct tidss_device *tidss, u32
hw_videoport)
/*
* TRM gives bitfields as start:end, where start is the higher bit
* 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; \
})
#define REG_GET(dispc, idx, start, end)
\
--
2.50.1
