| From: Anna-Maria Gleixner <anna-maria@linutronix.de> |
| Date: Thu, 31 Aug 2017 11:03:03 +0000 |
| Subject: [PATCH 04/25] hrtimer: Cleanup clock argument in |
| schedule_hrtimeout_range_clock() |
| |
| schedule_hrtimeout_range_clock() uses an integer for the clock id |
| instead of the predefined type "clockid_t". The ID of the clock is |
| indicated in hrtimer code as clock_id. Therefore change the name of |
| the variable as well to make it consistent. |
| |
| While at it, clean up the description for the function parameters clock_id |
| and mode. The clock modes and the clock ids are not restricted as the |
| comment suggests. |
| |
| No functional change. |
| |
| Signed-off-by: Anna-Maria Gleixner <anna-maria@linutronix.de> |
| Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> |
| --- |
| include/linux/hrtimer.h | 2 +- |
| kernel/time/hrtimer.c | 8 ++++---- |
| 2 files changed, 5 insertions(+), 5 deletions(-) |
| |
| --- a/include/linux/hrtimer.h |
| +++ b/include/linux/hrtimer.h |
| @@ -470,7 +470,7 @@ extern int schedule_hrtimeout_range(ktim |
| 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: */ |
| --- a/kernel/time/hrtimer.c |
| +++ b/kernel/time/hrtimer.c |
| @@ -1654,12 +1654,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; |
| |
| @@ -1680,7 +1680,7 @@ schedule_hrtimeout_range_clock(ktime_t * |
| 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); |