ALSA: timer: Check ack_list emptiness instead of bit flag

For checking the pending timer instance that is still left on the
timer object that is being closed, we set/clear a bit flag
SNDRV_TIMER_IFLG_CALLBACK around the call of callbacks.  This can be
simplified by replace with the list_empty() call for ti->ack_list.
This covers the existence more comprehensively and safely.

A gratis bonus is that we can get rid of SNDRV_TIMER_IFLG_CALLBACK bit
flag definition as well.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/include/sound/timer.h b/include/sound/timer.h
index 7ae226ab6990832d64c43935dded32463e739790..bcfee20ea2262e0d2c31662604dc9e993a4f7d6e 100644 (file)
--- a/include/sound/timer.h
+++ b/include/sound/timer.h
@@ -43,7 +43,6 @@
 #define SNDRV_TIMER_IFLG_START   0x00000004
 #define SNDRV_TIMER_IFLG_AUTO    0x00000008    /* auto restart */
 #define SNDRV_TIMER_IFLG_FAST    0x00000010    /* fast callback (do not use tasklet) */
-#define SNDRV_TIMER_IFLG_CALLBACK 0x00000020   /* timer callback is active */
 #define SNDRV_TIMER_IFLG_EXCLUSIVE 0x00000040  /* exclusive owner - no more instances */
 #define SNDRV_TIMER_IFLG_EARLY_EVENT 0x00000080        /* write early event to the poll queue */
 

diff --git a/sound/core/timer.c b/sound/core/timer.c
index 107d8ebeeb2ebb9c2983556e001b10d43b6ffcd9..e343de0e4f9ec1e92a8c10c3e171c494c319dc9a 100644 (file)
--- a/sound/core/timer.c
+++ b/sound/core/timer.c
@@ -366,7 +366,7 @@ static int snd_timer_close_locked(struct snd_timer_instance *timeri)
                timer->num_instances--;
                /* wait, until the active callback is finished */
                spin_lock_irq(&timer->lock);
-               while (timeri->flags & SNDRV_TIMER_IFLG_CALLBACK) {
+               while (!list_empty(&timeri->ack_list)) {
                        spin_unlock_irq(&timer->lock);
                        udelay(10);
                        spin_lock_irq(&timer->lock);
@@ -731,19 +731,17 @@ static void snd_timer_process_callbacks(struct snd_timer *timer,
                ti = list_first_entry(head, struct snd_timer_instance,
                                      ack_list);
 
-               /* remove from ack_list and make empty */
-               list_del_init(&ti->ack_list);
-
                ticks = ti->pticks;
                ti->pticks = 0;
                resolution = ti->resolution;
 
-               ti->flags |= SNDRV_TIMER_IFLG_CALLBACK;
                spin_unlock(&timer->lock);
                if (ti->callback)
                        ti->callback(ti, resolution, ticks);
                spin_lock(&timer->lock);
-               ti->flags &= ~SNDRV_TIMER_IFLG_CALLBACK;
+
+               /* remove from ack_list and make empty */
+               list_del_init(&ti->ack_list);
        }
 }