lkml.org 
[lkml]   [2015]   [Apr]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 26/39] hrtimer: Get rid of __hrtimer_start_range_ns()
    No more callers. Remove the leftovers.

    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(-)

    Index: tip/include/linux/hrtimer.h
    ===================================================================
    --- tip.orig/include/linux/hrtimer.h
    +++ tip/include/linux/hrtimer.h
    @@ -359,10 +359,6 @@ extern int hrtimer_start(struct hrtimer
    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);
    Index: tip/kernel/time/hrtimer.c
    ===================================================================
    --- tip.orig/kernel/time/hrtimer.c
    +++ tip/kernel/time/hrtimer.c
    @@ -908,9 +908,20 @@ remove_hrtimer(struct hrtimer *timer, st
    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;
    @@ -963,25 +974,6 @@ int __hrtimer_start_range_ns(struct hrti

    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);

    /**
    @@ -998,7 +990,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-14 23:41    [W:4.555 / U:1.996 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site