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: Get rid of __hrtimer_start_range_ns()
    Commit-ID:  58f1f803f1d6ef9ab280de13246d65970a09cb95
    Gitweb: http://git.kernel.org/tip/58f1f803f1d6ef9ab280de13246d65970a09cb95
    Author: Thomas Gleixner <tglx@linutronix.de>
    AuthorDate: Tue, 14 Apr 2015 21:09:08 +0000
    Committer: Thomas Gleixner <tglx@linutronix.de>
    CommitDate: Wed, 22 Apr 2015 17:06:51 +0200

    hrtimer: Get rid of __hrtimer_start_range_ns()

    No more callers. Remove the leftovers.

    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.707871492@linutronix.de
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    ---
    include/linux/hrtimer.h | 4 ----
    kernel/time/hrtimer.c | 38 +++++++++++++++-----------------------
    2 files changed, 15 insertions(+), 27 deletions(-)

    diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h
    index 2c68f71..a80baa8 100644
    --- a/include/linux/hrtimer.h
    +++ b/include/linux/hrtimer.h
    @@ -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);
    diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
    index 179b991..88d6ea2 100644
    --- a/kernel/time/hrtimer.c
    +++ b/kernel/time/hrtimer.c
    @@ -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);


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