[PATCH 2/8] hrtimer: Move hrtimer_callback_running() to hrtimer_bases.h

[Thomas Weißschuh (Schneider Electric)]

The usage of the hrtimer base introduces a dependency on the timer base
structure definitions from the widely-used hrtimer.h.

Move the helper to hrtimer_bases.h to trim this dependency.

Also adapt the two only callers to now include hrtimer_bases.h.

Signed-off-by: Thomas Weißschuh (Schneider Electric) <thomas.weissschuh@xxxxxxxxxxxxx>
---
 include/linux/hrtimer.h       |  9 ---------
 include/linux/hrtimer_bases.h | 10 ++++++++++
 kernel/sched/fair.c           |  2 ++
 sound/drivers/dummy.c         |  1 +
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h
index 8aa58520a816..7bf154cf3079 100644
--- a/include/linux/hrtimer.h
+++ b/include/linux/hrtimer.h
@@ -287,15 +287,6 @@ static inline bool hrtimer_is_queued(struct hrtimer *timer)
 	return READ_ONCE(timer->is_queued);
 }
 
-/*
- * Helper function to check, whether the timer is running the callback
- * function
- */
-static inline int hrtimer_callback_running(struct hrtimer *timer)
-{
-	return timer->base->running == timer;
-}
-
 /**
  * hrtimer_update_function - Update the timer's callback function
  * @timer:	Timer to update
diff --git a/include/linux/hrtimer_bases.h b/include/linux/hrtimer_bases.h
index 8c10f45dc469..70b99e651168 100644
--- a/include/linux/hrtimer_bases.h
+++ b/include/linux/hrtimer_bases.h
@@ -2,6 +2,7 @@
 #ifndef _LINUX_HRTIMER_BASES_H
 #define _LINUX_HRTIMER_BASES_H
 
+#include <linux/hrtimer.h>
 #include <linux/ktime.h>
 #include <linux/timerqueue.h>
 #include <linux/seqlock.h>
@@ -110,4 +111,13 @@ struct hrtimer_cpu_base {
 } ____cacheline_aligned;
 
 
+/*
+ * Helper function to check, whether the timer is running the callback
+ * function
+ */
+static inline int hrtimer_callback_running(struct hrtimer *timer)
+{
+	return timer->base->running == timer;
+}
+
 #endif
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index d78467ec6ee1..09197f8e4b76 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -26,6 +26,8 @@
 #include <linux/jiffies.h>
 #include <linux/mm_api.h>
 #include <linux/highmem.h>
+#include <linux/hrtimer.h>
+#include <linux/hrtimer_bases.h>
 #include <linux/spinlock_api.h>
 #include <linux/cpumask_api.h>
 #include <linux/lockdep_api.h>
diff --git a/sound/drivers/dummy.c b/sound/drivers/dummy.c
index 7283f0f18813..ce7ab986dee6 100644
--- a/sound/drivers/dummy.c
+++ b/sound/drivers/dummy.c
@@ -13,6 +13,7 @@
 #include <linux/time.h>
 #include <linux/wait.h>
 #include <linux/hrtimer.h>
+#include <linux/hrtimer_bases.h>
 #include <linux/math64.h>
 #include <linux/module.h>
 #include <sound/core.h>

-- 
2.55.0