Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 58f1f803 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

hrtimer: Get rid of __hrtimer_start_range_ns() 



No more callers. Remove the leftovers.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarPeter Zijlstra <peterz@infradead.org>
Cc: Preeti U Murthy <preeti@linux.vnet.ibm.com>
Cc: Viresh Kumar <viresh.kumar@linaro.org>
Cc: Marcelo Tosatti <mtosatti@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Link: http://lkml.kernel.org/r/20150414203502.707871492@linutronix.de


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent cc9684d3

include/linux/hrtimer.h

+0 −4
Original line number Diff line number Diff line
@@ -359,10 +359,6 @@ extern int hrtimer_start(struct hrtimer *timer, ktime_t tim, 
			 const enum hrtimer_mode mode);

extern int hrtimer_start_range_ns(struct hrtimer *timer, ktime_t tim,

			unsigned long range_ns, const enum hrtimer_mode mode);

extern int

__hrtimer_start_range_ns(struct hrtimer *timer, ktime_t tim,

			 unsigned long delta_ns,

			 const enum hrtimer_mode mode, int wakeup);



extern int hrtimer_cancel(struct hrtimer *timer);

extern int hrtimer_try_to_cancel(struct hrtimer *timer);

kernel/time/hrtimer.c

+15 −23
Original line number Diff line number Diff line
@@ -916,9 +916,20 @@ remove_hrtimer(struct hrtimer *timer, struct hrtimer_clock_base *base) 
	return 0;

}



int __hrtimer_start_range_ns(struct hrtimer *timer, ktime_t tim,

		unsigned long delta_ns, const enum hrtimer_mode mode,

		int wakeup)

/**

 * hrtimer_start_range_ns - (re)start an hrtimer on the current CPU

 * @timer:	the timer to be added

 * @tim:	expiry time

 * @delta_ns:	"slack" range for the timer

 * @mode:	expiry mode: absolute (HRTIMER_MODE_ABS) or

 *		relative (HRTIMER_MODE_REL)

 *

 * Returns:

 *  0 on success

 *  1 when the timer was active

 */

int hrtimer_start_range_ns(struct hrtimer *timer, ktime_t tim,

			   unsigned long delta_ns, const enum hrtimer_mode mode)

{

	struct hrtimer_clock_base *base, *new_base;

	unsigned long flags;
@@ -971,25 +982,6 @@ int __hrtimer_start_range_ns(struct hrtimer *timer, ktime_t tim, 


	return ret;

}

EXPORT_SYMBOL_GPL(__hrtimer_start_range_ns);



/**

 * hrtimer_start_range_ns - (re)start an hrtimer on the current CPU

 * @timer:	the timer to be added

 * @tim:	expiry time

 * @delta_ns:	"slack" range for the timer

 * @mode:	expiry mode: absolute (HRTIMER_MODE_ABS) or

 *		relative (HRTIMER_MODE_REL)

 *

 * Returns:

 *  0 on success

 *  1 when the timer was active

 */

int hrtimer_start_range_ns(struct hrtimer *timer, ktime_t tim,

		unsigned long delta_ns, const enum hrtimer_mode mode)

{

	return __hrtimer_start_range_ns(timer, tim, delta_ns, mode, 1);

}

EXPORT_SYMBOL_GPL(hrtimer_start_range_ns);



/**
@@ -1006,7 +998,7 @@ EXPORT_SYMBOL_GPL(hrtimer_start_range_ns); 
int

hrtimer_start(struct hrtimer *timer, ktime_t tim, const enum hrtimer_mode mode)

{

	return __hrtimer_start_range_ns(timer, tim, 0, mode, 1);

	return hrtimer_start_range_ns(timer, tim, 0, mode);

}

EXPORT_SYMBOL_GPL(hrtimer_start);