Revert "i915: Move list_count() to list.h for broader use"

This reverts commit a9efc04cfd05690e91279f41c2325c46335c43ef as it
breaks the build.

Link: https://lore.kernel.org/r/20221130131854.35b58b16@canb.auug.org.au
Link: https://lore.kernel.org/r/202211301628.iwMjPVMp-lkp@intel.com
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Cc: Jani Nikula <jani.nikula@intel.com>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/gpu/drm/i915/gt/intel_engine_cs.c b/drivers/gpu/drm/i915/gt/intel_engine_cs.c
index 47734c4..1f71881 100644 (file)
--- a/drivers/gpu/drm/i915/gt/intel_engine_cs.c
+++ b/drivers/gpu/drm/i915/gt/intel_engine_cs.c
@@ -2004,6 +2004,17 @@ static void print_request_ring(struct drm_printer *m, struct i915_request *rq)
        }
 }
 
+static unsigned long list_count(struct list_head *list)
+{
+       struct list_head *pos;
+       unsigned long count = 0;
+
+       list_for_each(pos, list)
+               count++;
+
+       return count;
+}
+
 static unsigned long read_ul(void *p, size_t x)
 {
        return *(unsigned long *)(p + x);
@@ -2178,7 +2189,7 @@ void intel_engine_dump(struct intel_engine_cs *engine,
        spin_lock_irqsave(&engine->sched_engine->lock, flags);
        engine_dump_active_requests(engine, m);
 
-       drm_printf(m, "\tOn hold?: %zu\n",
+       drm_printf(m, "\tOn hold?: %lu\n",
                   list_count(&engine->sched_engine->hold));
        spin_unlock_irqrestore(&engine->sched_engine->lock, flags);
 

diff --git a/include/linux/list.h b/include/linux/list.h
index 632a298..6176205 100644 (file)
--- a/include/linux/list.h
+++ b/include/linux/list.h
@@ -656,21 +656,6 @@ static inline void list_splice_tail_init(struct list_head *list,
             pos = n, n = pos->prev)
 
 /**
- * list_count - count nodes in the list
- * @head:      the head for your list.
- */
-static inline size_t list_count(struct list_head *head)
-{
-       struct list_head *pos;
-       size_t count = 0;
-
-       list_for_each(pos, head)
-               count++;
-
-       return count;
-}
-
-/**
  * list_entry_is_head - test if the entry points to the head of the list
  * @pos:       the type * to cursor
  * @head:      the head for your list.