Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 5b7c757d1a8878d49f46c826d6081816935664aa

Authored by Nicolas Kaiser
Committed by Takashi Iwai
1 parent 9d4ed9e077
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

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>

Showing 1 changed file with 3 additions and 5 deletions Side-by-side Diff

... ... @@ -186,9 +186,8 @@
186 186 list_for_each_entry(master, &timer->open_list_head, open_list) {
187 187 if (slave->slave_class == master->slave_class &&
188 188 slave->slave_id == master->slave_id) {
189   - list_del(&slave->open_list);
190   - list_add_tail(&slave->open_list,
191   - &master->slave_list_head);
  189 + list_move_tail(&slave->open_list,
  190 + &master->slave_list_head);
192 191 spin_lock_irq(&slave_active_lock);
193 192 slave->master = master;
194 193 slave->timer = master->timer;
... ... @@ -414,8 +413,7 @@
414 413 static int snd_timer_start1(struct snd_timer *timer, struct snd_timer_instance *timeri,
415 414 unsigned long sticks)
416 415 {
417   - list_del(&timeri->active_list);
418   - list_add_tail(&timeri->active_list, &timer->active_list_head);
  416 + list_move_tail(&timeri->active_list, &timer->active_list_head);
419 417 if (timer->running) {
420 418 if (timer->hw.flags & SNDRV_TIMER_HW_SLAVE)
421 419 goto __start_now;