Commit 90777713 authored by Anna-Maria Gleixner's avatar Anna-Maria Gleixner Committed by Ingo Molnar
Browse files

hrtimer: Clean up the 'int clock' parameter of schedule_hrtimeout_range_clock() 



schedule_hrtimeout_range_clock() uses an 'int clock' parameter for the
clock ID, instead of the customary predefined "clockid_t" type.

In hrtimer coding style the canonical variable name for the clock ID is
'clock_id', therefore change the name of the parameter here as well
to make it all consistent.

While at it, clean up the description for the 'clock_id' and 'mode'
function parameters. The clock modes and the clock IDs are not
restricted as the comment suggests.

Fix the mode description as well for the callers of schedule_hrtimeout_range_clock().

No functional changes intended.

Signed-off-by: default avatarAnna-Maria Gleixner <anna-maria@linutronix.de>
Cc: Christoph Hellwig <hch@lst.de>
Cc: John Stultz <john.stultz@linaro.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: keescook@chromium.org
Link: http://lkml.kernel.org/r/20171221104205.7269-5-anna-maria@linutronix.de


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 1fbc78b3

include/linux/hrtimer.h

+1 −1
Original line number Diff line number Diff line
@@ -462,7 +462,7 @@ extern int schedule_hrtimeout_range(ktime_t *expires, u64 delta, 
extern int schedule_hrtimeout_range_clock(ktime_t *expires,

					  u64 delta,

					  const enum hrtimer_mode mode,

					  int clock);

					  clockid_t clock_id);

extern int schedule_hrtimeout(ktime_t *expires, const enum hrtimer_mode mode);



/* Soft interrupt function to run the hrtimer queues: */

kernel/time/hrtimer.c

+6 −6
Original line number Diff line number Diff line
@@ -1662,12 +1662,12 @@ void __init hrtimers_init(void) 
 * schedule_hrtimeout_range_clock - sleep until timeout

 * @expires:	timeout value (ktime_t)

 * @delta:	slack in expires timeout (ktime_t)

 * @mode:	timer mode, HRTIMER_MODE_ABS or HRTIMER_MODE_REL

 * @clock:	timer clock, CLOCK_MONOTONIC or CLOCK_REALTIME

 * @mode:	timer mode

 * @clock_id:	timer clock to be used

 */

int __sched

schedule_hrtimeout_range_clock(ktime_t *expires, u64 delta,

			       const enum hrtimer_mode mode, int clock)

			       const enum hrtimer_mode mode, clockid_t clock_id)

{

	struct hrtimer_sleeper t;
@@ -1688,7 +1688,7 @@ schedule_hrtimeout_range_clock(ktime_t *expires, u64 delta, 
		return -EINTR;

	}



	hrtimer_init_on_stack(&t.timer, clock, mode);

	hrtimer_init_on_stack(&t.timer, clock_id, mode);

	hrtimer_set_expires_range_ns(&t.timer, *expires, delta);



	hrtimer_init_sleeper(&t, current);
@@ -1710,7 +1710,7 @@ schedule_hrtimeout_range_clock(ktime_t *expires, u64 delta, 
 * schedule_hrtimeout_range - sleep until timeout

 * @expires:	timeout value (ktime_t)

 * @delta:	slack in expires timeout (ktime_t)

 * @mode:	timer mode, HRTIMER_MODE_ABS or HRTIMER_MODE_REL

 * @mode:	timer mode

 *

 * Make the current task sleep until the given expiry time has

 * elapsed. The routine will return immediately unless
@@ -1749,7 +1749,7 @@ EXPORT_SYMBOL_GPL(schedule_hrtimeout_range); 
/**

 * schedule_hrtimeout - sleep until timeout

 * @expires:	timeout value (ktime_t)

 * @mode:	timer mode, HRTIMER_MODE_ABS or HRTIMER_MODE_REL

 * @mode:	timer mode

 *

 * Make the current task sleep until the given expiry time has

 * elapsed. The routine will return immediately unless

CRA Git | Maintained and supported by SUSTech CRA and CCSE