clock 'base' can be obtained easily by doing timer->base and hrtimer_reprogram() & hrtimer_enqueue_reprogram() never gets anything else than timer->base as its parameter. And so these routines doesn't require this parameter. Remove it.
Signed-off-by: Viresh Kumar viresh.kumar@linaro.org --- kernel/hrtimer.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c index abbf155..fcbabcf 100644 --- a/kernel/hrtimer.c +++ b/kernel/hrtimer.c @@ -597,11 +597,10 @@ hrtimer_force_reprogram(struct hrtimer_cpu_base *cpu_base, int skip_equal) * * Called with interrupts disabled and base->cpu_base.lock held */ -static int hrtimer_reprogram(struct hrtimer *timer, - struct hrtimer_clock_base *base) +static int hrtimer_reprogram(struct hrtimer *timer) { struct hrtimer_cpu_base *cpu_base = &__get_cpu_var(hrtimer_bases); - ktime_t expires = hrtimer_get_monoexpires(timer, base); + ktime_t expires = hrtimer_get_monoexpires(timer, timer->base); int res;
WARN_ON_ONCE(hrtimer_get_expires_tv64(timer) < 0); @@ -661,10 +660,9 @@ static inline void hrtimer_init_hres(struct hrtimer_cpu_base *base) * check happens. The timer gets enqueued into the rbtree. The reprogramming * and expiry check is done in the hrtimer_interrupt or in the softirq. */ -static inline int hrtimer_enqueue_reprogram(struct hrtimer *timer, - struct hrtimer_clock_base *base) +static inline int hrtimer_enqueue_reprogram(struct hrtimer *timer) { - return base->cpu_base->hres_active && hrtimer_reprogram(timer, base); + return timer->base->cpu_base->hres_active && hrtimer_reprogram(timer); }
static inline ktime_t hrtimer_update_base(struct hrtimer_cpu_base *base) @@ -743,8 +741,7 @@ void clock_was_set_delayed(void) static inline int hrtimer_hres_active(void) { return 0; } static inline int hrtimer_is_hres_enabled(void) { return 0; } static inline int hrtimer_switch_to_hres(void) { return 0; } -static inline int hrtimer_enqueue_reprogram(struct hrtimer *timer, - struct hrtimer_clock_base *base) +static inline int hrtimer_enqueue_reprogram(struct hrtimer *timer) { return 0; } @@ -991,7 +988,7 @@ int __hrtimer_start_range_ns(struct hrtimer *timer, ktime_t tim, * XXX send_remote_softirq() ? */ if (leftmost && base_on_this_cpu(new_base) - && hrtimer_enqueue_reprogram(timer, new_base)) { + && hrtimer_enqueue_reprogram(timer)) { if (wakeup) { /* * We need to drop cpu_base->lock to avoid a