Commit 21670ee4 authored by Thomas Gleixner's avatar Thomas Gleixner

posix-timers: Cleanup the flag/flags confusion

do_timer_settime() has a 'flags' argument and uses 'flag' for the interrupt
flags, which is confusing at best.

Rename the argument so 'flags' can be used for interrupt flags as usual.
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20190730223828.782664411@linutronix.de
parent c7e6d704
...@@ -844,13 +844,13 @@ int common_timer_set(struct k_itimer *timr, int flags, ...@@ -844,13 +844,13 @@ int common_timer_set(struct k_itimer *timr, int flags,
return 0; return 0;
} }
static int do_timer_settime(timer_t timer_id, int flags, static int do_timer_settime(timer_t timer_id, int tmr_flags,
struct itimerspec64 *new_spec64, struct itimerspec64 *new_spec64,
struct itimerspec64 *old_spec64) struct itimerspec64 *old_spec64)
{ {
const struct k_clock *kc; const struct k_clock *kc;
struct k_itimer *timr; struct k_itimer *timr;
unsigned long flag; unsigned long flags;
int error = 0; int error = 0;
if (!timespec64_valid(&new_spec64->it_interval) || if (!timespec64_valid(&new_spec64->it_interval) ||
...@@ -860,7 +860,7 @@ static int do_timer_settime(timer_t timer_id, int flags, ...@@ -860,7 +860,7 @@ static int do_timer_settime(timer_t timer_id, int flags,
if (old_spec64) if (old_spec64)
memset(old_spec64, 0, sizeof(*old_spec64)); memset(old_spec64, 0, sizeof(*old_spec64));
retry: retry:
timr = lock_timer(timer_id, &flag); timr = lock_timer(timer_id, &flags);
if (!timr) if (!timr)
return -EINVAL; return -EINVAL;
...@@ -868,9 +868,9 @@ static int do_timer_settime(timer_t timer_id, int flags, ...@@ -868,9 +868,9 @@ static int do_timer_settime(timer_t timer_id, int flags,
if (WARN_ON_ONCE(!kc || !kc->timer_set)) if (WARN_ON_ONCE(!kc || !kc->timer_set))
error = -EINVAL; error = -EINVAL;
else else
error = kc->timer_set(timr, flags, new_spec64, old_spec64); error = kc->timer_set(timr, tmr_flags, new_spec64, old_spec64);
unlock_timer(timr, flag); unlock_timer(timr, flags);
if (error == TIMER_RETRY) { if (error == TIMER_RETRY) {
old_spec64 = NULL; // We already got the old time... old_spec64 = NULL; // We already got the old time...
goto retry; goto retry;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment