Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-07 13:43:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

alarmtimer: Rename alarmtimer_remove to alarmtimer_dequeue

Browse Source 
Now that alarmtimer_remove has been simplified, change
its name to _dequeue to better match its paired _enqueue
function.

Cc: Arve Hjønnevåg <arve@android.com>
Cc: Colin Cross <ccross@android.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: John Stultz <john.stultz@linaro.org>
This commit is contained in:
John Stultz 2012-09-13 19:25:22 -04:00
parent a269eb50bd
commit a65bcc12ad
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
kernel/time/alarmtimer.c
View File

@ -145,7 +145,7 @@ static void alarmtimer_enqueue(struct alarm_base *base, struct alarm *alarm)
} }
/** /**
* alarmtimer_remove - Removes an alarm timer from an alarm_base timerqueue * alarmtimer_dequeue - Removes an alarm timer from an alarm_base timerqueue
* @base: pointer to the base where the timer is running * @base: pointer to the base where the timer is running
* @alarm: pointer to alarm being removed * @alarm: pointer to alarm being removed
* *
@ -153,7 +153,7 @@ static void alarmtimer_enqueue(struct alarm_base *base, struct alarm *alarm)
* *
* Must hold base->lock when calling. * Must hold base->lock when calling.
*/ */
static void alarmtimer_remove(struct alarm_base *base, struct alarm *alarm) static void alarmtimer_dequeue(struct alarm_base *base, struct alarm *alarm)
{ {
if (!(alarm->state & ALARMTIMER_STATE_ENQUEUED)) if (!(alarm->state & ALARMTIMER_STATE_ENQUEUED))
return; return;
@ -181,7 +181,7 @@ static enum hrtimer_restart alarmtimer_fired(struct hrtimer *timer)
int restart = ALARMTIMER_NORESTART; int restart = ALARMTIMER_NORESTART;
spin_lock_irqsave(&base->lock, flags); spin_lock_irqsave(&base->lock, flags);
alarmtimer_remove(base, alarm); alarmtimer_dequeue(base, alarm);
spin_unlock_irqrestore(&base->lock, flags); spin_unlock_irqrestore(&base->lock, flags);
if (alarm->function) if (alarm->function)
@ -340,7 +340,7 @@ int alarm_try_to_cancel(struct alarm *alarm)
spin_lock_irqsave(&base->lock, flags); spin_lock_irqsave(&base->lock, flags);
ret = hrtimer_try_to_cancel(&alarm->timer); ret = hrtimer_try_to_cancel(&alarm->timer);
if (ret >= 0) if (ret >= 0)
alarmtimer_remove(base, alarm); alarmtimer_dequeue(base, alarm);
spin_unlock_irqrestore(&base->lock, flags); spin_unlock_irqrestore(&base->lock, flags);
return ret; return ret;
} }