lkml.org 
[lkml]   [2015]   [Apr]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:timers/core] hrtimer: Make hrtimer_start() a inline wrapper
    Commit-ID:  02a171af1a46966dcdb5b38cdc33e4f43e92c778
    Gitweb: http://git.kernel.org/tip/02a171af1a46966dcdb5b38cdc33e4f43e92c778
    Author: Thomas Gleixner <tglx@linutronix.de>
    AuthorDate: Tue, 14 Apr 2015 21:09:10 +0000
    Committer: Thomas Gleixner <tglx@linutronix.de>
    CommitDate: Wed, 22 Apr 2015 17:06:51 +0200

    hrtimer: Make hrtimer_start() a inline wrapper

    No point for an extra export just to set the extra argument of
    hrtimer_start_range_ns() to 0.

    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Acked-by: Peter 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.808544539@linutronix.de
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    ---
    include/linux/hrtimer.h | 19 +++++++++++++++++--
    kernel/time/hrtimer.c | 19 -------------------
    2 files changed, 17 insertions(+), 21 deletions(-)

    diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h
    index a80baa8..42074ab 100644
    --- a/include/linux/hrtimer.h
    +++ b/include/linux/hrtimer.h
    @@ -355,11 +355,26 @@ static inline void destroy_hrtimer_on_stack(struct hrtimer *timer) { }
    #endif

    /* Basic timer operations: */
    -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);

    +/**
    + * hrtimer_start - (re)start an hrtimer on the current CPU
    + * @timer: the timer to be added
    + * @tim: expiry time
    + * @mode: expiry mode: absolute (HRTIMER_MODE_ABS) or
    + * relative (HRTIMER_MODE_REL)
    + *
    + * Returns:
    + * 0 on success
    + * 1 when the timer was active
    + */
    +static inline int hrtimer_start(struct hrtimer *timer, ktime_t tim,
    + const enum hrtimer_mode mode)
    +{
    + return hrtimer_start_range_ns(timer, tim, 0, mode);
    +}
    +
    extern int hrtimer_cancel(struct hrtimer *timer);
    extern int hrtimer_try_to_cancel(struct hrtimer *timer);

    diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
    index 88d6ea2..e5cf71aa 100644
    --- a/kernel/time/hrtimer.c
    +++ b/kernel/time/hrtimer.c
    @@ -985,25 +985,6 @@ int hrtimer_start_range_ns(struct hrtimer *timer, ktime_t tim,
    EXPORT_SYMBOL_GPL(hrtimer_start_range_ns);

    /**
    - * hrtimer_start - (re)start an hrtimer on the current CPU
    - * @timer: the timer to be added
    - * @tim: expiry time
    - * @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(struct hrtimer *timer, ktime_t tim, const enum hrtimer_mode mode)
    -{
    - return hrtimer_start_range_ns(timer, tim, 0, mode);
    -}
    -EXPORT_SYMBOL_GPL(hrtimer_start);
    -
    -
    -/**
    * hrtimer_try_to_cancel - try to deactivate a timer
    * @timer: hrtimer to stop
    *

    \
     
     \ /
      Last update: 2015-04-22 21:41    [W:2.602 / U:0.908 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site