]> www.infradead.org Git - users/hch/misc.git/commitdiff
drm/tidss: dispc: Switch to GENMASK instead of FLD_MASK
authorMaxime Ripard <mripard@kernel.org>
Wed, 27 Aug 2025 15:12:34 +0000 (17:12 +0200)
committerTomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Mon, 1 Sep 2025 07:37:19 +0000 (10:37 +0300)
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 <mripard@kernel.org>
Link: https://lore.kernel.org/r/20250827-drm-tidss-field-api-v3-3-7689b664cc63@kernel.org
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
drivers/gpu/drm/tidss/tidss_dispc.c

index 6231e1aa07fdfa4ea1265b8239e561972dbba8f3..b5f09ed2f3700068bc39bef3630a86a33c16fabb 100644 (file)
@@ -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;                                               \
        })