aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kernel/time/alarmtimer.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
index b1560ebe759f..f11d83b12949 100644
--- a/kernel/time/alarmtimer.c
+++ b/kernel/time/alarmtimer.c
@@ -145,7 +145,7 @@ static void alarmtimer_enqueue(struct alarm_base *base, struct alarm *alarm)
145} 145}
146 146
147/** 147/**
148 * alarmtimer_remove - Removes an alarm timer from an alarm_base timerqueue 148 * alarmtimer_dequeue - Removes an alarm timer from an alarm_base timerqueue
149 * @base: pointer to the base where the timer is running 149 * @base: pointer to the base where the timer is running
150 * @alarm: pointer to alarm being removed 150 * @alarm: pointer to alarm being removed
151 * 151 *
@@ -153,7 +153,7 @@ static void alarmtimer_enqueue(struct alarm_base *base, struct alarm *alarm)
153 * 153 *
154 * Must hold base->lock when calling. 154 * Must hold base->lock when calling.
155 */ 155 */
156static void alarmtimer_remove(struct alarm_base *base, struct alarm *alarm) 156static void alarmtimer_dequeue(struct alarm_base *base, struct alarm *alarm)
157{ 157{
158 if (!(alarm->state & ALARMTIMER_STATE_ENQUEUED)) 158 if (!(alarm->state & ALARMTIMER_STATE_ENQUEUED))
159 return; 159 return;
@@ -181,7 +181,7 @@ static enum hrtimer_restart alarmtimer_fired(struct hrtimer *timer)
181 int restart = ALARMTIMER_NORESTART; 181 int restart = ALARMTIMER_NORESTART;
182 182
183 spin_lock_irqsave(&base->lock, flags); 183 spin_lock_irqsave(&base->lock, flags);
184 alarmtimer_remove(base, alarm); 184 alarmtimer_dequeue(base, alarm);
185 spin_unlock_irqrestore(&base->lock, flags); 185 spin_unlock_irqrestore(&base->lock, flags);
186 186
187 if (alarm->function) 187 if (alarm->function)
@@ -340,7 +340,7 @@ int alarm_try_to_cancel(struct alarm *alarm)
340 spin_lock_irqsave(&base->lock, flags); 340 spin_lock_irqsave(&base->lock, flags);
341 ret = hrtimer_try_to_cancel(&alarm->timer); 341 ret = hrtimer_try_to_cancel(&alarm->timer);
342 if (ret >= 0) 342 if (ret >= 0)
343 alarmtimer_remove(base, alarm); 343 alarmtimer_dequeue(base, alarm);
344 spin_unlock_irqrestore(&base->lock, flags); 344 spin_unlock_irqrestore(&base->lock, flags);
345 return ret; 345 return ret;
346} 346}