lkml.org 
[lkml]   [2018]   [Jan]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:timers/core] hrtimer: Clean up the 'int clock' parameter of schedule_hrtimeout_range_clock()
    Commit-ID:  907777136f80d0cc0f714e5a389c4dfa9b4670ee
    Gitweb: https://git.kernel.org/tip/907777136f80d0cc0f714e5a389c4dfa9b4670ee
    Author: Anna-Maria Gleixner <anna-maria@linutronix.de>
    AuthorDate: Thu, 21 Dec 2017 11:41:33 +0100
    Committer: Ingo Molnar <mingo@kernel.org>
    CommitDate: Tue, 16 Jan 2018 02:35:44 +0100

    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: Anna-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: Ingo Molnar <mingo@kernel.org>
    ---
    include/linux/hrtimer.h | 2 +-
    kernel/time/hrtimer.c | 12 ++++++------
    2 files changed, 7 insertions(+), 7 deletions(-)

    diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h
    index b3a382b..931ce9c 100644
    --- a/include/linux/hrtimer.h
    +++ b/include/linux/hrtimer.h
    @@ -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: */
    diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
    index 7687355..f2de328 100644
    --- a/kernel/time/hrtimer.c
    +++ b/kernel/time/hrtimer.c
    @@ -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
    \
     
     \ /
      Last update: 2018-01-16 04:47    [W:4.318 / U:1.304 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site