Commit 5b7c757d authored by Nicolas Kaiser's avatar Nicolas Kaiser Committed by Takashi Iwai
Browse files

ALSA: sound/core: merge list_del()/list_add_tail() to list_move_tail() 



Merge list_del() + list_add_tail() to list_move_tail().

Signed-off-by: default avatarNicolas Kaiser <nikai@nikai.net>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 9d4ed9e0

sound/core/timer.c

+3 −5
Original line number Diff line number Diff line
@@ -186,8 +186,7 @@ static void snd_timer_check_slave(struct snd_timer_instance *slave) 
		list_for_each_entry(master, &timer->open_list_head, open_list) {

			if (slave->slave_class == master->slave_class &&

			    slave->slave_id == master->slave_id) {

				list_del(&slave->open_list);

				list_add_tail(&slave->open_list,

				list_move_tail(&slave->open_list,

					       &master->slave_list_head);

				spin_lock_irq(&slave_active_lock);

				slave->master = master;
@@ -414,8 +413,7 @@ static void snd_timer_notify1(struct snd_timer_instance *ti, int event) 
static int snd_timer_start1(struct snd_timer *timer, struct snd_timer_instance *timeri,

			    unsigned long sticks)

{

	list_del(&timeri->active_list);

	list_add_tail(&timeri->active_list, &timer->active_list_head);

	list_move_tail(&timeri->active_list, &timer->active_list_head);

	if (timer->running) {

		if (timer->hw.flags & SNDRV_TIMER_HW_SLAVE)

			goto __start_now;