Merge branch 'linus'

1 files changed, 17 insertions, 17 deletions

diff --git a/sound/sparc/cs4231.c b/sound/sparc/cs4231.c
index fd6543998788..53a148b01b6b 100644
--- a/sound/sparc/cs4231.c
+++ b/sound/sparc/cs4231.c
@@ -115,8 +115,8 @@ struct snd_cs4231 {
         unsigned char           image[32];      /* registers image */
         int                     mce_bit;
         int                     calibrate_mute;
-        struct semaphore        mce_mutex;
-        struct semaphore        open_mutex;
+        struct mutex            mce_mutex;
+        struct mutex            open_mutex;
 
         union {
 #ifdef SBUS_SUPPORT
@@ -775,7 +775,7 @@ static void snd_cs4231_playback_format(struct snd_cs4231 *chip, struct snd_pcm_h
 {
         unsigned long flags;
 
-        down(&chip->mce_mutex);
+        mutex_lock(&chip->mce_mutex);
         snd_cs4231_calibrate_mute(chip, 1);
 
         snd_cs4231_mce_up(chip);
@@ -790,7 +790,7 @@ static void snd_cs4231_playback_format(struct snd_cs4231 *chip, struct snd_pcm_h
         snd_cs4231_mce_down(chip);
 
         snd_cs4231_calibrate_mute(chip, 0);
-        up(&chip->mce_mutex);
+        mutex_unlock(&chip->mce_mutex);
 }
 
 static void snd_cs4231_capture_format(struct snd_cs4231 *chip, struct snd_pcm_hw_params *params,
@@ -798,7 +798,7 @@ static void snd_cs4231_capture_format(struct snd_cs4231 *chip, struct snd_pcm_hw
 {
         unsigned long flags;
 
-        down(&chip->mce_mutex);
+        mutex_lock(&chip->mce_mutex);
         snd_cs4231_calibrate_mute(chip, 1);
 
         snd_cs4231_mce_up(chip);
@@ -819,7 +819,7 @@ static void snd_cs4231_capture_format(struct snd_cs4231 *chip, struct snd_pcm_hw
         snd_cs4231_mce_down(chip);
 
         snd_cs4231_calibrate_mute(chip, 0);
-        up(&chip->mce_mutex);
+        mutex_unlock(&chip->mce_mutex);
 }
 
 /*
@@ -933,14 +933,14 @@ static int snd_cs4231_open(struct snd_cs4231 *chip, unsigned int mode)
 {
         unsigned long flags;
 
-        down(&chip->open_mutex);
+        mutex_lock(&chip->open_mutex);
         if ((chip->mode & mode)) {
-                up(&chip->open_mutex);
+                mutex_unlock(&chip->open_mutex);
                 return -EAGAIN;
         }
         if (chip->mode & CS4231_MODE_OPEN) {
                 chip->mode |= mode;
-                up(&chip->open_mutex);
+                mutex_unlock(&chip->open_mutex);
                 return 0;
         }
         /* ok. now enable and ack CODEC IRQ */
@@ -960,7 +960,7 @@ static int snd_cs4231_open(struct snd_cs4231 *chip, unsigned int mode)
         spin_unlock_irqrestore(&chip->lock, flags);
 
         chip->mode = mode;
-        up(&chip->open_mutex);
+        mutex_unlock(&chip->open_mutex);
         return 0;
 }
 
@@ -968,10 +968,10 @@ static void snd_cs4231_close(struct snd_cs4231 *chip, unsigned int mode)
 {
         unsigned long flags;
 
-        down(&chip->open_mutex);
+        mutex_lock(&chip->open_mutex);
         chip->mode &= ~mode;
         if (chip->mode & CS4231_MODE_OPEN) {
-                up(&chip->open_mutex);
+                mutex_unlock(&chip->open_mutex);
                 return;
         }
         snd_cs4231_calibrate_mute(chip, 1);
@@ -1008,7 +1008,7 @@ static void snd_cs4231_close(struct snd_cs4231 *chip, unsigned int mode)
         snd_cs4231_calibrate_mute(chip, 0);
 
         chip->mode = 0;
-        up(&chip->open_mutex);
+        mutex_unlock(&chip->open_mutex);
 }
 
 /*
@@ -1969,8 +1969,8 @@ static int __init snd_cs4231_sbus_create(struct snd_card *card,
         spin_lock_init(&chip->lock);
         spin_lock_init(&chip->c_dma.sbus_info.lock);
         spin_lock_init(&chip->p_dma.sbus_info.lock);
-        init_MUTEX(&chip->mce_mutex);
-        init_MUTEX(&chip->open_mutex);
+        mutex_init(&chip->mce_mutex);
+        mutex_init(&chip->open_mutex);
         chip->card = card;
         chip->dev_u.sdev = sdev;
         chip->regs_size = sdev->reg_addrs[0].reg_size;
@@ -2157,8 +2157,8 @@ static int __init snd_cs4231_ebus_create(struct snd_card *card,
         spin_lock_init(&chip->lock);
         spin_lock_init(&chip->c_dma.ebus_info.lock);
         spin_lock_init(&chip->p_dma.ebus_info.lock);
-        init_MUTEX(&chip->mce_mutex);
-        init_MUTEX(&chip->open_mutex);
+        mutex_init(&chip->mce_mutex);
+        mutex_init(&chip->open_mutex);
         chip->flags |= CS4231_FLAG_EBUS;
         chip->card = card;
         chip->dev_u.pdev = edev->bus->self;