Skip to content

Commit 1e4c851

Browse files
committed
drm/i915: rename range_overflows_end() to range_end_overflows()
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 <kees@kernel.org> Cc: "Gustavo A. R. Silva" <gustavoars@kernel.org> Cc: linux-hardening@vger.kernel.org Reviewed-by: Jouni Högander <jouni.hogander@intel.com> Link: https://lore.kernel.org/r/20250829174601.2163064-1-jani.nikula@intel.com Signed-off-by: Jani Nikula <jani.nikula@intel.com>
1 parent 0b47032 commit 1e4c851

3 files changed

Lines changed: 6 additions & 6 deletions

File tree

drivers/gpu/drm/i915/display/intel_fbc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -383,11 +383,11 @@ static void i8xx_fbc_program_cfb(struct intel_fbc *fbc)
383383
struct drm_i915_private *i915 = to_i915(display->drm);
384384

385385
drm_WARN_ON(display->drm,
386-
range_overflows_end_t(u64, i915_gem_stolen_area_address(i915),
386+
range_end_overflows_t(u64, i915_gem_stolen_area_address(i915),
387387
i915_gem_stolen_node_offset(&fbc->compressed_fb),
388388
U32_MAX));
389389
drm_WARN_ON(display->drm,
390-
range_overflows_end_t(u64, i915_gem_stolen_area_address(i915),
390+
range_end_overflows_t(u64, i915_gem_stolen_area_address(i915),
391391
i915_gem_stolen_node_offset(&fbc->compressed_llb),
392392
U32_MAX));
393393
intel_de_write(display, FBC_CFB_BASE,

drivers/gpu/drm/i915/gt/intel_rc6.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ static int vlv_rc6_init(struct intel_rc6 *rc6)
341341
return PTR_ERR(pctx);
342342
}
343343

344-
GEM_BUG_ON(range_overflows_end_t(u64,
344+
GEM_BUG_ON(range_end_overflows_t(u64,
345345
i915->dsm.stolen.start,
346346
pctx->stolen->start,
347347
U32_MAX));

drivers/gpu/drm/i915/i915_utils.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ bool i915_error_injected(void);
7979
#define range_overflows_t(type, start, size, max) \
8080
range_overflows((type)(start), (type)(size), (type)(max))
8181

82-
#define range_overflows_end(start, size, max) ({ \
82+
#define range_end_overflows(start, size, max) ({ \
8383
typeof(start) start__ = (start); \
8484
typeof(size) size__ = (size); \
8585
typeof(max) max__ = (max); \
@@ -88,8 +88,8 @@ bool i915_error_injected(void);
8888
start__ > max__ || size__ > max__ - start__; \
8989
})
9090

91-
#define range_overflows_end_t(type, start, size, max) \
92-
range_overflows_end((type)(start), (type)(size), (type)(max))
91+
#define range_end_overflows_t(type, start, size, max) \
92+
range_end_overflows((type)(start), (type)(size), (type)(max))
9393

9494
#define ptr_mask_bits(ptr, n) ({ \
9595
unsigned long __v = (unsigned long)(ptr); \

0 commit comments

Comments
 (0)