From 7536eb9ea9058ce0dbcce7c862e586c2034a4c6e Mon Sep 17 00:00:00 2001 From: Andy Shevchenko Date: Tue, 25 Aug 2026 11:35:52 +0200 Subject: [PATCH] drm/i915/gem: Use simpler versions of min*() Instead of harder to read min_array() and prone to mistakes min_t() use min3() and min(). No functional changes intended. The types of the values are unsigned, no side-effects are expected. Signed-off-by: Andy Shevchenko Reviewed-by: Andi Shyti Signed-off-by: Andi Shyti Link: https://patch.msgid.link/20260825093552.4088094-1-andriy.shevchenko@linux.intel.com --- drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/i915/gem/i915_gem_shmem.c b/drivers/gpu/drm/i915/gem/i915_gem_shmem.c index 06543ae60706..3ba8edb6888d 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_shmem.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_shmem.c @@ -153,11 +153,8 @@ int shmem_sg_alloc_table(struct drm_i915_private *i915, struct sg_table *st, } } while (1); - nr_pages = min_array(((unsigned long[]) { - folio_nr_pages(folio), - page_count - i, - max_segment / PAGE_SIZE, - }), 3); + nr_pages = min3(folio_nr_pages(folio), + page_count - i, max_segment / PAGE_SIZE); if (!i || sg->length >= max_segment || @@ -168,8 +165,7 @@ int shmem_sg_alloc_table(struct drm_i915_private *i915, struct sg_table *st, st->nents++; sg_set_folio(sg, folio, nr_pages * PAGE_SIZE, 0); } else { - nr_pages = min_t(unsigned long, nr_pages, - (max_segment - sg->length) / PAGE_SIZE); + nr_pages = min(nr_pages, (max_segment - sg->length) / PAGE_SIZE); sg->length += nr_pages * PAGE_SIZE; }