diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2015-04-14 17:09:23 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2015-04-22 11:06:52 -0400 |
| commit | 61699e13072a89880aa584dcc64c6da465fb2ccc (patch) | |
| tree | 6c80fef1d508bdd5a715467bc5eb55f157f51d7d /kernel/time | |
| parent | b8a62f1ff0ccb18fdc25c6150d1cd394610f4753 (diff) | |
hrtimer: Remove hrtimer_start() return value
No user was ever interested whether the timer was active or not when
it was started. All abusers of the return value are gone, so get rid
of it.
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/20150414203503.483556394@linutronix.de
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/time')
| -rw-r--r-- | kernel/time/hrtimer.c | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c index c38f0b6024b4..beab02d3ff1e 100644 --- a/kernel/time/hrtimer.c +++ b/kernel/time/hrtimer.c | |||
| @@ -923,22 +923,18 @@ remove_hrtimer(struct hrtimer *timer, struct hrtimer_clock_base *base) | |||
| 923 | * @delta_ns: "slack" range for the timer | 923 | * @delta_ns: "slack" range for the timer |
| 924 | * @mode: expiry mode: absolute (HRTIMER_MODE_ABS) or | 924 | * @mode: expiry mode: absolute (HRTIMER_MODE_ABS) or |
| 925 | * relative (HRTIMER_MODE_REL) | 925 | * relative (HRTIMER_MODE_REL) |
| 926 | * | ||
| 927 | * Returns: | ||
| 928 | * 0 on success | ||
| 929 | * 1 when the timer was active | ||
| 930 | */ | 926 | */ |
| 931 | int hrtimer_start_range_ns(struct hrtimer *timer, ktime_t tim, | 927 | void hrtimer_start_range_ns(struct hrtimer *timer, ktime_t tim, |
| 932 | unsigned long delta_ns, const enum hrtimer_mode mode) | 928 | unsigned long delta_ns, const enum hrtimer_mode mode) |
| 933 | { | 929 | { |
| 934 | struct hrtimer_clock_base *base, *new_base; | 930 | struct hrtimer_clock_base *base, *new_base; |
| 935 | unsigned long flags; | 931 | unsigned long flags; |
| 936 | int ret, leftmost; | 932 | int leftmost; |
| 937 | 933 | ||
| 938 | base = lock_hrtimer_base(timer, &flags); | 934 | base = lock_hrtimer_base(timer, &flags); |
| 939 | 935 | ||
| 940 | /* Remove an active timer from the queue: */ | 936 | /* Remove an active timer from the queue: */ |
| 941 | ret = remove_hrtimer(timer, base); | 937 | remove_hrtimer(timer, base); |
| 942 | 938 | ||
| 943 | if (mode & HRTIMER_MODE_REL) { | 939 | if (mode & HRTIMER_MODE_REL) { |
| 944 | tim = ktime_add_safe(tim, base->get_time()); | 940 | tim = ktime_add_safe(tim, base->get_time()); |
| @@ -962,11 +958,8 @@ int hrtimer_start_range_ns(struct hrtimer *timer, ktime_t tim, | |||
| 962 | timer_stats_hrtimer_set_start_info(timer); | 958 | timer_stats_hrtimer_set_start_info(timer); |
| 963 | 959 | ||
| 964 | leftmost = enqueue_hrtimer(timer, new_base); | 960 | leftmost = enqueue_hrtimer(timer, new_base); |
| 965 | 961 | if (!leftmost) | |
| 966 | if (!leftmost) { | 962 | goto unlock; |
| 967 | unlock_hrtimer_base(timer, &flags); | ||
| 968 | return ret; | ||
| 969 | } | ||
| 970 | 963 | ||
| 971 | if (!hrtimer_is_hres_active(timer)) { | 964 | if (!hrtimer_is_hres_active(timer)) { |
| 972 | /* | 965 | /* |
| @@ -977,10 +970,8 @@ int hrtimer_start_range_ns(struct hrtimer *timer, ktime_t tim, | |||
| 977 | } else { | 970 | } else { |
| 978 | hrtimer_reprogram(timer, new_base); | 971 | hrtimer_reprogram(timer, new_base); |
| 979 | } | 972 | } |
| 980 | 973 | unlock: | |
| 981 | unlock_hrtimer_base(timer, &flags); | 974 | unlock_hrtimer_base(timer, &flags); |
| 982 | |||
| 983 | return ret; | ||
| 984 | } | 975 | } |
| 985 | EXPORT_SYMBOL_GPL(hrtimer_start_range_ns); | 976 | EXPORT_SYMBOL_GPL(hrtimer_start_range_ns); |
| 986 | 977 | ||
