History

hrtimer: Remove unused next_timer argument from __hrtimer_reprogram()

__hrtimer_reprogram() takes a @next_timer argument but never references it; it only stores @expires_next into cpu_base->expires_next and reprograms the clock event device. The argument has been unused since commit b14bca97c9f5 ("hrtimer: Consolidate reprogramming code"). Drop it and update the two callers. No functional change.

Zhan Xusheng committed 4 months ago

Commit d8966ca1 parent e2904dd1 file · +3 −3Browse files

Unified · Split

kernel/time/hrtimer.c+3−3
@@ -707,7 +707,7 @@ static inline void hrtimer_rearm_event(ktime_t expires_next, bool deferred) · 706 unmodified lines
707 tick_program_event(expires_next, 1);707 tick_program_event(expires_next, 1);
708}708}
709 709
710static void __hrtimer_reprogram(struct hrtimer_cpu_base *cpu_base, struct hrtimer *next_timer,710static void __hrtimer_reprogram(struct hrtimer_cpu_base *cpu_base,
711 ktime_t expires_next)711 ktime_t expires_next)
712{712{
713 cpu_base->expires_next = expires_next;713 cpu_base->expires_next = expires_next;
@@ -743,7 +743,7 @@ static void hrtimer_force_reprogram(struct hrtimer_cpu_base *cpu_base, bool skip · 29 unmodified lines
743 if (skip_equal && expires_next == cpu_base->expires_next)743 if (skip_equal && expires_next == cpu_base->expires_next)
744 return;744 return;
745 745
746 __hrtimer_reprogram(cpu_base, cpu_base->next_timer, expires_next);746 __hrtimer_reprogram(cpu_base, expires_next);
747}747}
748 748
749/* High resolution timer related functions */749/* High resolution timer related functions */
@@ -896,7 +896,7 @@ static void hrtimer_reprogram(struct hrtimer *timer, bool reprogram) · 146 unmodified lines
896 896
897 cpu_base->next_timer = timer;897 cpu_base->next_timer = timer;
898 898
899 __hrtimer_reprogram(cpu_base, timer, expires);899 __hrtimer_reprogram(cpu_base, expires);
900}900}
901 901
902static bool update_needs_ipi(struct hrtimer_cpu_base *cpu_base, unsigned int active)902static bool update_needs_ipi(struct hrtimer_cpu_base *cpu_base, unsigned int active)