mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-06 16:49:22 +00:00
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: Nicolas Kaiser <nikai@nikai.net> Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
parent
9d4ed9e077
commit
5b7c757d1a
1 changed files with 3 additions and 5 deletions
|
@ -186,9 +186,8 @@ static void snd_timer_check_slave(struct snd_timer_instance *slave)
|
||||||
list_for_each_entry(master, &timer->open_list_head, open_list) {
|
list_for_each_entry(master, &timer->open_list_head, open_list) {
|
||||||
if (slave->slave_class == master->slave_class &&
|
if (slave->slave_class == master->slave_class &&
|
||||||
slave->slave_id == master->slave_id) {
|
slave->slave_id == master->slave_id) {
|
||||||
list_del(&slave->open_list);
|
list_move_tail(&slave->open_list,
|
||||||
list_add_tail(&slave->open_list,
|
&master->slave_list_head);
|
||||||
&master->slave_list_head);
|
|
||||||
spin_lock_irq(&slave_active_lock);
|
spin_lock_irq(&slave_active_lock);
|
||||||
slave->master = master;
|
slave->master = master;
|
||||||
slave->timer = master->timer;
|
slave->timer = master->timer;
|
||||||
|
@ -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,
|
static int snd_timer_start1(struct snd_timer *timer, struct snd_timer_instance *timeri,
|
||||||
unsigned long sticks)
|
unsigned long sticks)
|
||||||
{
|
{
|
||||||
list_del(&timeri->active_list);
|
list_move_tail(&timeri->active_list, &timer->active_list_head);
|
||||||
list_add_tail(&timeri->active_list, &timer->active_list_head);
|
|
||||||
if (timer->running) {
|
if (timer->running) {
|
||||||
if (timer->hw.flags & SNDRV_TIMER_HW_SLAVE)
|
if (timer->hw.flags & SNDRV_TIMER_HW_SLAVE)
|
||||||
goto __start_now;
|
goto __start_now;
|
||||||
|
|
Loading…
Reference in a new issue