Changeset 612 for GPL/branches/uniaud32-linux-3.2.102/alsa-kernel/drivers/dummy.c

Timestamp:

May 16, 2020, 10:05:07 AM (5 years ago)

Author:

Paul Smedley

Message:

Commit 3..102 changes from trunk

File:

• GPL/branches/uniaud32-linux-3.2.102/alsa-kernel/drivers/dummy.c (modified) (11 diffs)

GPL/branches/uniaud32-linux-3.2.102/alsa-kernel/drivers/dummy.c

@@ -28 +28 @@
 #include <linux/hrtimer.h>
 #include <linux/math64.h>
-#include <linux/moduleparam.h>
+#include <linux/module.h>
 #include <sound/core.h>
 #include <sound/control.h>
@@ -110 +110 @@
 };
 
+#define get_dummy_ops(substream) \
+        (*(const struct dummy_timer_ops **)(substream)->runtime->private_data)
+
 struct dummy_model {
         const char *name;
@@ -135 +138 @@
         int mixer_volume[MIXER_ADDR_LAST+1][2];
         int capture_source[MIXER_ADDR_LAST+1][2];
-        const struct dummy_timer_ops *timer_ops;
 };
 
@@ -229 +231 @@
 
 struct dummy_systimer_pcm {
+        /* ops must be the first item */
+        const struct dummy_timer_ops *timer_ops;
         spinlock_t lock;
         struct timer_list timer;
@@ -366 +370 @@
 
 struct dummy_hrtimer_pcm {
+        /* ops must be the first item */
+        const struct dummy_timer_ops *timer_ops;
         ktime_t base_time;
         ktime_t period_time;
@@ -414 +420 @@
 static inline void dummy_hrtimer_sync(struct dummy_hrtimer_pcm *dpcm)
 {
+        hrtimer_cancel(&dpcm->timer);
         tasklet_kill(&dpcm->tasklet);
 }
@@ -492 +499 @@
 static int dummy_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
 {
-        struct snd_dummy *dummy = snd_pcm_substream_chip(substream);
-
         switch (cmd) {
         case SNDRV_PCM_TRIGGER_START:
         case SNDRV_PCM_TRIGGER_RESUME:
-                return dummy->timer_ops->start(substream);
+                return get_dummy_ops(substream)->start(substream);
         case SNDRV_PCM_TRIGGER_STOP:
         case SNDRV_PCM_TRIGGER_SUSPEND:
-                return dummy->timer_ops->stop(substream);
+                return get_dummy_ops(substream)->stop(substream);
         }
         return -EINVAL;
@@ -507 +512 @@
 static int dummy_pcm_prepare(struct snd_pcm_substream *substream)
 {
-        struct snd_dummy *dummy = snd_pcm_substream_chip(substream);
-
-        return dummy->timer_ops->prepare(substream);
+        return get_dummy_ops(substream)->prepare(substream);
 }
 
 static snd_pcm_uframes_t dummy_pcm_pointer(struct snd_pcm_substream *substream)
 {
-        struct snd_dummy *dummy = snd_pcm_substream_chip(substream);
-
-        return dummy->timer_ops->pointer(substream);
+        return get_dummy_ops(substream)->pointer(substream);
 }
 
@@ -562 +563 @@
         struct dummy_model *model = dummy->model;
         struct snd_pcm_runtime *runtime = substream->runtime;
+        const struct dummy_timer_ops *ops;
         int err;
 
-        dummy->timer_ops = &dummy_systimer_ops;
+        ops = &dummy_systimer_ops;
 #ifdef CONFIG_HIGH_RES_TIMERS
         if (hrtimer)
-                dummy->timer_ops = &dummy_hrtimer_ops;
+                ops = &dummy_hrtimer_ops;
 #endif
 
-        err = dummy->timer_ops->create(substream);
+        err = ops->create(substream);
         if (err < 0)
                 return err;
+        get_dummy_ops(substream) = ops;
 
         runtime->hw = dummy->pcm_hw;
@@ -594 +597 @@
         }
         if (err < 0) {
-                dummy->timer_ops->free(substream);
+                get_dummy_ops(substream)->free(substream);
                 return err;
         }
@@ -602 +605 @@
 static int dummy_pcm_close(struct snd_pcm_substream *substream)
 {
-        struct snd_dummy *dummy = snd_pcm_substream_chip(substream);
-        dummy->timer_ops->free(substream);
+        get_dummy_ops(substream)->free(substream);
         return 0;
 }