The FLD_GET function is an equivalent to what FIELD_GET + GENMASK
provide, so let's drop it and switch to the latter.
Signed-off-by: Maxime Ripard <mrip...@kernel.org>
---
drivers/gpu/drm/tidss/tidss_dispc.c | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/drivers/gpu/drm/tidss/tidss_dispc.c
b/drivers/gpu/drm/tidss/tidss_dispc.c
index
f0568ae3e7bebf481bb5f6d0603dae4b6e6a0729..50d5eda0670e6e090d05af6a2c05e5b88f28c322
100644
--- a/drivers/gpu/drm/tidss/tidss_dispc.c
+++ b/drivers/gpu/drm/tidss/tidss_dispc.c
@@ -607,27 +607,21 @@ 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_GET(val, start, end) \
- ({ \
- int _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) & ~GENMASK(_start, _end); \
u32 _new_val = _masked_val | FIELD_PREP(GENMASK(_start, _end),
(val)); \
_new_val; \
})
#define REG_GET(dispc, idx, start, end)
\
- ((u32)FLD_GET(dispc_read((dispc), (idx)), (start), (end)))
+ ((u32)FIELD_GET(GENMASK((start), (end)), \
+ dispc_read((dispc), (idx))))
#define REG_FLD_MOD(dispc, idx, val, start, end) \
({ \
struct dispc_device *_dispc = (dispc); \
u32 _idx = (idx); \
@@ -635,11 +629,12 @@ void tidss_disable_oldi(struct tidss_device *tidss, u32
hw_videoport)
u32 _new = FLD_MOD(_curr, (val), (start), (end)); \
dispc_write(_dispc, _idx, _new); \
})
#define VID_REG_GET(dispc, hw_plane, idx, start, end) \
- ((u32)FLD_GET(dispc_vid_read((dispc), (hw_plane), (idx)), (start),
(end)))
+ ((u32)FIELD_GET(GENMASK((start), (end)), \
+ dispc_vid_read((dispc), (hw_plane), (idx))))
#define VID_REG_FLD_MOD(dispc, hw_plane, idx, val, start, end) \
({ \
struct dispc_device *_dispc = (dispc); \
u32 _hw_plane = (hw_plane); \
@@ -648,11 +643,12 @@ void tidss_disable_oldi(struct tidss_device *tidss, u32
hw_videoport)
u32 _new = FLD_MOD(_curr, (val), (start), (end)); \
dispc_vid_write(_dispc, _hw_plane, _idx, _new); \
})
#define VP_REG_GET(dispc, vp, idx, start, end) \
- ((u32)FLD_GET(dispc_vp_read((dispc), (vp), (idx)), (start), (end)))
+ ((u32)FIELD_GET(GENMASK((start), (end)), \
+ dispc_vp_read((dispc), (vp), (idx))))
#define VP_REG_FLD_MOD(dispc, vp, idx, val, start, end)
\
({ \
struct dispc_device *_dispc = (dispc); \
u32 _vp = (vp); \
--
2.50.1
