diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-09-10 14:01:05 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-09-15 15:52:10 +0200 |
| commit | 6336c20cdaee1dd13d01dfa8c07ce3b18bbc846f (patch) | |
| tree | c974b279979eadaa0ace3768d7e231a59f62f3bd /sound/pci/lx6464es/lx6464es.h | |
| parent | 9bef72bdb26e291d6dffb04768741a0e49582666 (diff) | |
| download | lwn-6336c20cdaee1dd13d01dfa8c07ce3b18bbc846f.tar.gz lwn-6336c20cdaee1dd13d01dfa8c07ce3b18bbc846f.zip | |
ALSA: lx6464es: Use nonatomic PCM ops
Like the other previous changes, this patch for lx6464es takes the
same strategy for converting to nonatomic PCM ops: replacing spinlock
with mutex, converting the irq tasklet to the threaded irq, and
merging the trigger tasklets back to the trigger callback.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/lx6464es/lx6464es.h')
| -rw-r--r-- | sound/pci/lx6464es/lx6464es.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sound/pci/lx6464es/lx6464es.h b/sound/pci/lx6464es/lx6464es.h index 6792eda9c9a5..1bec187d772f 100644 --- a/sound/pci/lx6464es/lx6464es.h +++ b/sound/pci/lx6464es/lx6464es.h @@ -71,14 +71,10 @@ struct lx6464es { u8 mac_address[6]; - spinlock_t lock; /* interrupt spinlock */ + struct mutex lock; /* interrupt lock */ struct mutex setup_mutex; /* mutex used in hw_params, open * and close */ - struct tasklet_struct trigger_tasklet; /* trigger tasklet */ - struct tasklet_struct tasklet_capture; - struct tasklet_struct tasklet_playback; - /* ports */ unsigned long port_plx; /* io port (size=256) */ void __iomem *port_plx_remapped; /* remapped plx port */ @@ -87,8 +83,9 @@ struct lx6464es { * size=8K) */ /* messaging */ - spinlock_t msg_lock; /* message spinlock */ + struct mutex msg_lock; /* message lock */ struct lx_rmh rmh; + u32 irqsrc; /* configuration */ uint freq_ratio : 2; |