[PATCH 1/2] hrtimer: Remove hrtimer_clock_base::get_softirq_time()

[PATCH 1/2] hrtimer: Remove hrtimer_clock_base::get_softirq_time()

[Mark McLoughlin]

Peter Zijlstra noticed this 8 months ago and I just noticed
it again.

hrtimer_clock_base::get_softirq_time() is currently unused
in the entire tree. In fact, looking at the logs, it appears
as if it was never used. Remove it.

Signed-off-by: Mark McLoughlin <markmc@redhat.com>
---
 include/linux/hrtimer.h |    2 --
 kernel/hrtimer.c        |    4 +---
 2 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h
index 6d93dce..1b079bd 100644
--- a/include/linux/hrtimer.h
+++ b/include/linux/hrtimer.h
@@ -145,7 +145,6 @@ struct hrtimer_sleeper {
  * @first:		pointer to the timer node which expires first
  * @resolution:		the resolution of the clock, in nanoseconds
  * @get_time:		function to retrieve the current time of the clock
- * @get_softirq_time:	function to retrieve the current time from the softirq
  * @softirq_time:	the time when running the hrtimer queue in the softirq
  * @offset:		offset of this clock to the monotonic base
  * @reprogram:		function to reprogram the timer event
@@ -157,7 +156,6 @@ struct hrtimer_clock_base {
 	struct rb_node		*first;
 	ktime_t			resolution;
 	ktime_t			(*get_time)(void);
-	ktime_t			(*get_softirq_time)(void);
 	ktime_t			softirq_time;
 #ifdef CONFIG_HIGH_RES_TIMERS
 	ktime_t			offset;
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
index 03ea137..4d761d5 100644
--- a/kernel/hrtimer.c
+++ b/kernel/hrtimer.c
@@ -1401,9 +1401,7 @@ void hrtimer_run_queues(void)
 		if (!base->first)
 			continue;
 
-		if (base->get_softirq_time)
-			base->softirq_time = base->get_softirq_time();
-		else if (gettime) {
+		if (gettime) {
 			hrtimer_get_softirq_time(cpu_base);
 			gettime = 0;
 		}
-- 
1.5.4.3

Re: [PATCH 1/2] hrtimer: Remove hrtimer_clock_base::get_softirq_time()

[Ingo Molnar]

* Mark McLoughlin <markmc@redhat.com> wrote:

> Peter Zijlstra noticed this 8 months ago and I just noticed
> it again.
> 
> hrtimer_clock_base::get_softirq_time() is currently unused
> in the entire tree. In fact, looking at the logs, it appears
> as if it was never used. Remove it.

applied to tip/timers/hrtimers, thanks Mark.

Thomas, any objections?

	Ingo