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>
- * 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
* @alarm: pointer to alarm being removed
*
* @base: pointer to the base where the timer is running
* @alarm: pointer to alarm being removed
*
*
* 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))
return;
{
if (!(alarm->state & ALARMTIMER_STATE_ENQUEUED))
return;
int restart = ALARMTIMER_NORESTART;
spin_lock_irqsave(&base->lock, flags);
int restart = ALARMTIMER_NORESTART;
spin_lock_irqsave(&base->lock, flags);
- alarmtimer_remove(base, alarm);
+ alarmtimer_dequeue(base, alarm);
spin_unlock_irqrestore(&base->lock, flags);
if (alarm->function)
spin_unlock_irqrestore(&base->lock, flags);
if (alarm->function)
spin_lock_irqsave(&base->lock, flags);
ret = hrtimer_try_to_cancel(&alarm->timer);
if (ret >= 0)
spin_lock_irqsave(&base->lock, flags);
ret = hrtimer_try_to_cancel(&alarm->timer);
if (ret >= 0)
- alarmtimer_remove(base, alarm);
+ alarmtimer_dequeue(base, alarm);
spin_unlock_irqrestore(&base->lock, flags);
return ret;
}
spin_unlock_irqrestore(&base->lock, flags);
return ret;
}