Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / sound / drivers / dummy.c

diff --git a/sound/drivers/dummy.c b/sound/drivers/dummy.c
index 69db45bc0197e398ce298ed2c7d9f71b0539f9fb..8fb9a54fe8ba879857ce61ec25d5d2408c9a21ad 100644 (file)
--- a/sound/drivers/dummy.c
+++ b/sound/drivers/dummy.c
@@ -375,17 +375,9 @@ struct dummy_hrtimer_pcm {
        ktime_t period_time;
        atomic_t running;
        struct hrtimer timer;
-       struct tasklet_struct tasklet;
        struct snd_pcm_substream *substream;
 };
 
-static void dummy_hrtimer_pcm_elapsed(unsigned long priv)
-{
-       struct dummy_hrtimer_pcm *dpcm = (struct dummy_hrtimer_pcm *)priv;
-       if (atomic_read(&dpcm->running))
-               snd_pcm_period_elapsed(dpcm->substream);
-}
-
 static enum hrtimer_restart dummy_hrtimer_callback(struct hrtimer *timer)
 {
        struct dummy_hrtimer_pcm *dpcm;
@@ -393,7 +385,14 @@ static enum hrtimer_restart dummy_hrtimer_callback(struct hrtimer *timer)
        dpcm = container_of(timer, struct dummy_hrtimer_pcm, timer);
        if (!atomic_read(&dpcm->running))
                return HRTIMER_NORESTART;
-       tasklet_schedule(&dpcm->tasklet);
+       /*
+        * In cases of XRUN and draining, this calls .trigger to stop PCM
+        * substream.
+        */
+       snd_pcm_period_elapsed(dpcm->substream);
+       if (!atomic_read(&dpcm->running))
+               return HRTIMER_NORESTART;
+
        hrtimer_forward_now(timer, dpcm->period_time);
        return HRTIMER_RESTART;
 }
@@ -403,7 +402,7 @@ static int dummy_hrtimer_start(struct snd_pcm_substream *substream)
        struct dummy_hrtimer_pcm *dpcm = substream->runtime->private_data;
 
        dpcm->base_time = hrtimer_cb_get_time(&dpcm->timer);
-       hrtimer_start(&dpcm->timer, dpcm->period_time, HRTIMER_MODE_REL);
+       hrtimer_start(&dpcm->timer, dpcm->period_time, HRTIMER_MODE_REL_SOFT);
        atomic_set(&dpcm->running, 1);
        return 0;
 }
@@ -413,14 +412,14 @@ static int dummy_hrtimer_stop(struct snd_pcm_substream *substream)
        struct dummy_hrtimer_pcm *dpcm = substream->runtime->private_data;
 
        atomic_set(&dpcm->running, 0);
-       hrtimer_cancel(&dpcm->timer);
+       if (!hrtimer_callback_running(&dpcm->timer))
+               hrtimer_cancel(&dpcm->timer);
        return 0;
 }
 
 static inline void dummy_hrtimer_sync(struct dummy_hrtimer_pcm *dpcm)
 {
        hrtimer_cancel(&dpcm->timer);
-       tasklet_kill(&dpcm->tasklet);
 }
 
 static snd_pcm_uframes_t
@@ -465,12 +464,10 @@ static int dummy_hrtimer_create(struct snd_pcm_substream *substream)
        if (!dpcm)
                return -ENOMEM;
        substream->runtime->private_data = dpcm;
-       hrtimer_init(&dpcm->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
+       hrtimer_init(&dpcm->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL_SOFT);
        dpcm->timer.function = dummy_hrtimer_callback;
        dpcm->substream = substream;
        atomic_set(&dpcm->running, 0);
-       tasklet_init(&dpcm->tasklet, dummy_hrtimer_pcm_elapsed,
-                    (unsigned long)dpcm);
        return 0;
 }