Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a65bcc12 authored by John Stultz's avatar John Stultz
Browse files

alarmtimer: Rename alarmtimer_remove to alarmtimer_dequeue 



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: default avatarJohn Stultz <john.stultz@linaro.org>
parent a269eb50

kernel/time/alarmtimer.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -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;

}

}