aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/lx6464es/lx6464es.h
diff options
context:
space:
mode:
Diffstat (limited to 'sound/pci/lx6464es/lx6464es.h')
-rw-r--r--sound/pci/lx6464es/lx6464es.h9
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 {
71 71
72 u8 mac_address[6]; 72 u8 mac_address[6];
73 73
74 spinlock_t lock; /* interrupt spinlock */ 74 struct mutex lock; /* interrupt lock */
75 struct mutex setup_mutex; /* mutex used in hw_params, open 75 struct mutex setup_mutex; /* mutex used in hw_params, open
76 * and close */ 76 * and close */
77 77
78 struct tasklet_struct trigger_tasklet; /* trigger tasklet */
79 struct tasklet_struct tasklet_capture;
80 struct tasklet_struct tasklet_playback;
81
82 /* ports */ 78 /* ports */
83 unsigned long port_plx; /* io port (size=256) */ 79 unsigned long port_plx; /* io port (size=256) */
84 void __iomem *port_plx_remapped; /* remapped plx port */ 80 void __iomem *port_plx_remapped; /* remapped plx port */
@@ -87,8 +83,9 @@ struct lx6464es {
87 * size=8K) */ 83 * size=8K) */
88 84
89 /* messaging */ 85 /* messaging */
90 spinlock_t msg_lock; /* message spinlock */ 86 struct mutex msg_lock; /* message lock */
91 struct lx_rmh rmh; 87 struct lx_rmh rmh;
88 u32 irqsrc;
92 89
93 /* configuration */ 90 /* configuration */
94 uint freq_ratio : 2; 91 uint freq_ratio : 2;