rubenslte/android_kernel_samsung_msm8226-rubenslte
1
Fork 0
forked from rubenslte/android_kernel_samsung_msm8226
Code Pull Requests 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.

Change-Id: I234362798c5eb8a1f357758e40cbc794b77e2061
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>
Signed-off-by: Kevin F. Haggerty <haggertk@lineageos.org>
This commit is contained in:
John Stultz
2019-08-06 12:31:32 +02:00
committed by Francescodario Cuzzocrea
parent 5c47f2c80c
commit 4f287e192e
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kernel/time/alarmtimer.c
+4 -4
View File
@@ -146,7 +146,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
* @alarm: pointer to alarm being removed
*
@@ -154,7 +154,7 @@ static void alarmtimer_enqueue(struct alarm_base *base, struct alarm *alarm)
*
* 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;
@@ -182,7 +182,7 @@ static enum hrtimer_restart alarmtimer_fired(struct hrtimer *timer)
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)
@@ -372,7 +372,7 @@ int alarm_try_to_cancel(struct alarm *alarm)
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;
}