diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-09-09 17:17:20 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-09-15 15:52:03 +0200 |
| commit | db0a5214b8d6cc7a90ce3336d24a85b90cbb4e67 (patch) | |
| tree | fdfcfaee149e83613d9854a763bbe3fe95f60292 /include/sound | |
| parent | e7e69265b6269763799a5de9c263fbbce32cd3a3 (diff) | |
| download | linux-db0a5214b8d6cc7a90ce3336d24a85b90cbb4e67.tar.gz linux-db0a5214b8d6cc7a90ce3336d24a85b90cbb4e67.tar.bz2 linux-db0a5214b8d6cc7a90ce3336d24a85b90cbb4e67.zip | |
ALSA: vx: Use nonatomic PCM ops
Rewrite VXpocket and VX222 drivers to use the new PCM nonatomic ops.
The former irq tasklet is replaced with a threaded irq handler, and
the tasklet for the PCM delayed start is simply merged into the normal
PCM trigger, as well as the replacement of spinlock with mutex.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/vx_core.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/include/sound/vx_core.h b/include/sound/vx_core.h index f634f8f85db5..cae9c9d4ef22 100644 --- a/include/sound/vx_core.h +++ b/include/sound/vx_core.h @@ -80,8 +80,6 @@ struct vx_pipe { unsigned int references; /* an output pipe may be used for monitoring and/or playback */ struct vx_pipe *monitoring_pipe; /* pointer to the monitoring pipe (capture pipe only)*/ - - struct tasklet_struct start_tq; }; struct vx_core; @@ -165,9 +163,7 @@ struct vx_core { struct snd_vx_hardware *hw; struct snd_vx_ops *ops; - spinlock_t lock; - spinlock_t irq_lock; - struct tasklet_struct tq; + struct mutex lock; unsigned int chip_status; unsigned int pcm_running; @@ -223,6 +219,7 @@ void snd_vx_free_firmware(struct vx_core *chip); * interrupt handler; exported for pcmcia */ irqreturn_t snd_vx_irq_handler(int irq, void *dev); +irqreturn_t snd_vx_threaded_irq_handler(int irq, void *dev); /* * lowlevel functions |