Rename range_overflows_end() to range_end_overflows(), along with the _t
variant.

It's all rather subjective, but I think range_end_overflows() reads
better.

Cc: Kees Cook <k...@kernel.org>
Cc: Gustavo A. R. Silva <gustavo...@kernel.org>
Cc: linux-harden...@vger.kernel.org
Signed-off-by: Jani Nikula <jani.nik...@intel.com>
---
 drivers/gpu/drm/i915/display/intel_fbc.c | 4 ++--
 drivers/gpu/drm/i915/gt/intel_rc6.c      | 2 +-
 drivers/gpu/drm/i915/i915_utils.h        | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_fbc.c 
b/drivers/gpu/drm/i915/display/intel_fbc.c
index d4c5deff9cbe..446e2ad28a70 100644
--- a/drivers/gpu/drm/i915/display/intel_fbc.c
+++ b/drivers/gpu/drm/i915/display/intel_fbc.c
@@ -383,11 +383,11 @@ static void i8xx_fbc_program_cfb(struct intel_fbc *fbc)
        struct drm_i915_private *i915 = to_i915(display->drm);
 
        drm_WARN_ON(display->drm,
-                   range_overflows_end_t(u64, 
i915_gem_stolen_area_address(i915),
+                   range_end_overflows_t(u64, 
i915_gem_stolen_area_address(i915),
                                          
i915_gem_stolen_node_offset(&fbc->compressed_fb),
                                          U32_MAX));
        drm_WARN_ON(display->drm,
-                   range_overflows_end_t(u64, 
i915_gem_stolen_area_address(i915),
+                   range_end_overflows_t(u64, 
i915_gem_stolen_area_address(i915),
                                          
i915_gem_stolen_node_offset(&fbc->compressed_llb),
                                          U32_MAX));
        intel_de_write(display, FBC_CFB_BASE,
diff --git a/drivers/gpu/drm/i915/gt/intel_rc6.c 
b/drivers/gpu/drm/i915/gt/intel_rc6.c
index 9ca42589da4d..bf38cc5fe872 100644
--- a/drivers/gpu/drm/i915/gt/intel_rc6.c
+++ b/drivers/gpu/drm/i915/gt/intel_rc6.c
@@ -341,7 +341,7 @@ static int vlv_rc6_init(struct intel_rc6 *rc6)
                return PTR_ERR(pctx);
        }
 
-       GEM_BUG_ON(range_overflows_end_t(u64,
+       GEM_BUG_ON(range_end_overflows_t(u64,
                                         i915->dsm.stolen.start,
                                         pctx->stolen->start,
                                         U32_MAX));
diff --git a/drivers/gpu/drm/i915/i915_utils.h 
b/drivers/gpu/drm/i915/i915_utils.h
index 9cb40c2c4b12..fdac9a158b53 100644
--- a/drivers/gpu/drm/i915/i915_utils.h
+++ b/drivers/gpu/drm/i915/i915_utils.h
@@ -79,7 +79,7 @@ bool i915_error_injected(void);
 #define range_overflows_t(type, start, size, max) \
        range_overflows((type)(start), (type)(size), (type)(max))
 
-#define range_overflows_end(start, size, max) ({ \
+#define range_end_overflows(start, size, max) ({ \
        typeof(start) start__ = (start); \
        typeof(size) size__ = (size); \
        typeof(max) max__ = (max); \
@@ -88,8 +88,8 @@ bool i915_error_injected(void);
        start__ > max__ || size__ > max__ - start__; \
 })
 
-#define range_overflows_end_t(type, start, size, max) \
-       range_overflows_end((type)(start), (type)(size), (type)(max))
+#define range_end_overflows_t(type, start, size, max) \
+       range_end_overflows((type)(start), (type)(size), (type)(max))
 
 #define ptr_mask_bits(ptr, n) ({                                       \
        unsigned long __v = (unsigned long)(ptr);                       \
-- 
2.47.2

Reply via email to