Merge tag 'sound-3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[sfrench/cifs-2.6.git] / sound / pci / lx6464es / lx6464es.h

diff --git a/sound/pci/lx6464es/lx6464es.h b/sound/pci/lx6464es/lx6464es.h
index e2a124ae27e882f976736859bf60c81f718c770f..1bec187d772f8201a6e8cf8bf6d65986f999f287 100644 (file)
--- a/sound/pci/lx6464es/lx6464es.h
+++ b/sound/pci/lx6464es/lx6464es.h
@@ -26,7 +26,7 @@
 #define LX6464ES_H
 
 #include <linux/spinlock.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 
 #include <sound/core.h>
 #include <sound/pcm.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;