4 files changed, 6 insertions, 6 deletions

diff --git a/include/sound/ac97_codec.h b/include/sound/ac97_codec.h
index b0b3ea7b365e..ad3fe046f6cf 100644
--- a/include/sound/ac97_codec.h
+++ b/include/sound/ac97_codec.h
@@ -456,8 +456,8 @@ struct snd_ac97 {
         struct snd_info_entry *proc_regs;
         unsigned short subsystem_vendor;
         unsigned short subsystem_device;
-        struct semaphore reg_mutex;
-        struct semaphore page_mutex;    /* mutex for AD18xx multi-codecs and paging (2.3) */
+        struct mutex reg_mutex;
+        struct mutex page_mutex;        /* mutex for AD18xx multi-codecs and paging (2.3) */
         unsigned short num;     /* number of codec: 0 = primary, 1 = secondary */
         unsigned short addr;    /* physical address of codec [0-3] */
         unsigned int id;        /* identification of codec */
diff --git a/include/sound/ak4531_codec.h b/include/sound/ak4531_codec.h
index edf04070ce7c..fb30faab43a8 100644
--- a/include/sound/ak4531_codec.h
+++ b/include/sound/ak4531_codec.h
@@ -71,7 +71,7 @@ struct snd_ak4531 {
         void (*private_free) (struct snd_ak4531 *ak4531);
         /* --- */
         unsigned char regs[0x20];
-        struct semaphore reg_mutex;
+        struct mutex reg_mutex;
 };
 
 int snd_ak4531_mixer(struct snd_card *card, struct snd_ak4531 *_ak4531,
diff --git a/include/sound/cs46xx.h b/include/sound/cs46xx.h
index 199b5098ff7e..80b2979c0cba 100644
--- a/include/sound/cs46xx.h
+++ b/include/sound/cs46xx.h
@@ -1711,7 +1711,7 @@ struct snd_cs46xx {
         int current_gpio;
 #endif
 #ifdef CONFIG_SND_CS46XX_NEW_DSP
-        struct semaphore spos_mutex;
+        struct mutex spos_mutex;
 
         struct dsp_spos_instance * dsp_spos_instance;
 
diff --git a/include/sound/emu10k1.h b/include/sound/emu10k1.h
index 951e40d720d9..186e00ad9e79 100644
--- a/include/sound/emu10k1.h
+++ b/include/sound/emu10k1.h
@@ -33,6 +33,7 @@
 #include <sound/pcm-indirect.h>
 #include <sound/timer.h>
 #include <linux/interrupt.h>
+#include <linux/mutex.h>
 #include <asm/io.h>
 
 /* ------------------- DEFINES -------------------- */
@@ -1022,7 +1023,7 @@ struct snd_emu10k1_fx8010 {
         int gpr_size;                   /* size of allocated GPR controls */
         int gpr_count;                  /* count of used kcontrols */
         struct list_head gpr_ctl;       /* GPR controls */
-        struct semaphore lock;
+        struct mutex lock;
         struct snd_emu10k1_fx8010_pcm pcm[8];
         spinlock_t irq_lock;
         struct snd_emu10k1_fx8010_irq *irq_handlers;
@@ -1122,7 +1123,6 @@ struct snd_emu10k1 {
         spinlock_t reg_lock;
         spinlock_t emu_lock;
         spinlock_t voice_lock;
-        struct semaphore ptb_lock;
 
         struct snd_emu10k1_voice voices[NUM_G];
         struct snd_emu10k1_voice p16v_voices[4];