Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 5b7c757d1a8878d49f46c826d6081816935664aa

Authored by Nicolas Kaiser
Committed by Takashi Iwai
1 parent 9d4ed9e077
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.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;