[ALSA] semaphore -> mutex (PCI part)

Semaphore to mutex conversion.

The conversion was generated via scripts, and the result was validated
automatically via a script as well.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

1 files changed, 27 insertions, 25 deletions

diff --git a/sound/pci/cs46xx/cs46xx_lib.c b/sound/pci/cs46xx/cs46xx_lib.c
index 8fb275d6eb77..69dbf542a6de 100644
--- a/sound/pci/cs46xx/cs46xx_lib.c
+++ b/sound/pci/cs46xx/cs46xx_lib.c
@@ -53,6 +53,8 @@
 #include <linux/interrupt.h>
 #include <linux/slab.h>
 #include <linux/gameport.h>
+#include <linux/mutex.h>
+
 
 #include <sound/core.h>
 #include <sound/control.h>
@@ -909,22 +911,22 @@ static int snd_cs46xx_playback_hw_params(struct snd_pcm_substream *substream,
 #ifdef CONFIG_SND_CS46XX_NEW_DSP
         snd_assert (sample_rate != 0, return -ENXIO);
 
-        down (&chip->spos_mutex);
+        mutex_lock(&chip->spos_mutex);
 
         if (_cs46xx_adjust_sample_rate (chip,cpcm,sample_rate)) {
-                up (&chip->spos_mutex);
+                mutex_unlock(&chip->spos_mutex);
                 return -ENXIO;
         }
 
         snd_assert (cpcm->pcm_channel != NULL);
         if (!cpcm->pcm_channel) {
-                up (&chip->spos_mutex);
+                mutex_unlock(&chip->spos_mutex);
                 return -ENXIO;
         }
 
 
         if (cs46xx_dsp_pcm_channel_set_period (chip,cpcm->pcm_channel,period_size)) {
-                 up (&chip->spos_mutex);
+                 mutex_unlock(&chip->spos_mutex);
                  return -EINVAL;
          }
 
@@ -965,7 +967,7 @@ static int snd_cs46xx_playback_hw_params(struct snd_pcm_substream *substream,
                 }
                 if ((err = snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params))) < 0) {
 #ifdef CONFIG_SND_CS46XX_NEW_DSP
-                        up (&chip->spos_mutex);
+                        mutex_unlock(&chip->spos_mutex);
 #endif
                         return err;
                 }
@@ -989,7 +991,7 @@ static int snd_cs46xx_playback_hw_params(struct snd_pcm_substream *substream,
         }
 
 #ifdef CONFIG_SND_CS46XX_NEW_DSP
-        up (&chip->spos_mutex);
+        mutex_unlock(&chip->spos_mutex);
 #endif
 
         return 0;
@@ -1319,7 +1321,7 @@ static int _cs46xx_playback_open_channel (struct snd_pcm_substream *substream,in
 
         cpcm->substream = substream;
 #ifdef CONFIG_SND_CS46XX_NEW_DSP
-        down (&chip->spos_mutex);
+        mutex_lock(&chip->spos_mutex);
         cpcm->pcm_channel = NULL; 
         cpcm->pcm_channel_id = pcm_channel_id;
 
@@ -1328,7 +1330,7 @@ static int _cs46xx_playback_open_channel (struct snd_pcm_substream *substream,in
                                    SNDRV_PCM_HW_PARAM_PERIOD_BYTES, 
                                    &hw_constraints_period_sizes);
 
-        up (&chip->spos_mutex);
+        mutex_unlock(&chip->spos_mutex);
 #else
         chip->playback_pcm = cpcm; /* HACK */
 #endif
@@ -1367,9 +1369,9 @@ static int snd_cs46xx_playback_open_iec958(struct snd_pcm_substream *substream)
 
         snd_printdd("open raw iec958 channel\n");
 
-        down (&chip->spos_mutex);
+        mutex_lock(&chip->spos_mutex);
         cs46xx_iec958_pre_open (chip);
-        up (&chip->spos_mutex);
+        mutex_unlock(&chip->spos_mutex);
 
         return _cs46xx_playback_open_channel(substream,DSP_IEC958_CHANNEL);
 }
@@ -1385,9 +1387,9 @@ static int snd_cs46xx_playback_close_iec958(struct snd_pcm_substream *substream)
 
         err = snd_cs46xx_playback_close(substream);
 
-        down (&chip->spos_mutex);
+        mutex_lock(&chip->spos_mutex);
         cs46xx_iec958_post_close (chip);
-        up (&chip->spos_mutex);
+        mutex_unlock(&chip->spos_mutex);
 
         return err;
 }
@@ -1428,12 +1430,12 @@ static int snd_cs46xx_playback_close(struct snd_pcm_substream *substream)
         if (!cpcm) return -ENXIO;
 
 #ifdef CONFIG_SND_CS46XX_NEW_DSP
-        down (&chip->spos_mutex);
+        mutex_lock(&chip->spos_mutex);
         if (cpcm->pcm_channel) {
                 cs46xx_dsp_destroy_pcm_channel(chip,cpcm->pcm_channel);
                 cpcm->pcm_channel = NULL;
         }
-        up (&chip->spos_mutex);
+        mutex_unlock(&chip->spos_mutex);
 #else
         chip->playback_pcm = NULL;
 #endif
@@ -1848,7 +1850,7 @@ static int snd_cs46xx_iec958_put(struct snd_kcontrol *kcontrol,
 
         switch (kcontrol->private_value) {
         case CS46XX_MIXER_SPDIF_OUTPUT_ELEMENT:
-                down (&chip->spos_mutex);
+                mutex_lock(&chip->spos_mutex);
                 change = (chip->dsp_spos_instance->spdif_status_out & DSP_SPDIF_STATUS_OUTPUT_ENABLED);
                 if (ucontrol->value.integer.value[0] && !change) 
                         cs46xx_dsp_enable_spdif_out(chip);
@@ -1856,7 +1858,7 @@ static int snd_cs46xx_iec958_put(struct snd_kcontrol *kcontrol,
                         cs46xx_dsp_disable_spdif_out(chip);
 
                 res = (change != (chip->dsp_spos_instance->spdif_status_out & DSP_SPDIF_STATUS_OUTPUT_ENABLED));
-                up (&chip->spos_mutex);
+                mutex_unlock(&chip->spos_mutex);
                 break;
         case CS46XX_MIXER_SPDIF_INPUT_ELEMENT:
                 change = chip->dsp_spos_instance->spdif_status_in;
@@ -1997,12 +1999,12 @@ static int snd_cs46xx_spdif_default_get(struct snd_kcontrol *kcontrol,
         struct snd_cs46xx *chip = snd_kcontrol_chip(kcontrol);
         struct dsp_spos_instance * ins = chip->dsp_spos_instance;
 
-        down (&chip->spos_mutex);
+        mutex_lock(&chip->spos_mutex);
         ucontrol->value.iec958.status[0] = _wrap_all_bits((ins->spdif_csuv_default >> 24) & 0xff);
         ucontrol->value.iec958.status[1] = _wrap_all_bits((ins->spdif_csuv_default >> 16) & 0xff);
         ucontrol->value.iec958.status[2] = 0;
         ucontrol->value.iec958.status[3] = _wrap_all_bits((ins->spdif_csuv_default) & 0xff);
-        up (&chip->spos_mutex);
+        mutex_unlock(&chip->spos_mutex);
 
         return 0;
 }
@@ -2015,7 +2017,7 @@ static int snd_cs46xx_spdif_default_put(struct snd_kcontrol *kcontrol,
         unsigned int val;
         int change;
 
-        down (&chip->spos_mutex);
+        mutex_lock(&chip->spos_mutex);
         val = ((unsigned int)_wrap_all_bits(ucontrol->value.iec958.status[0]) << 24) |
                 ((unsigned int)_wrap_all_bits(ucontrol->value.iec958.status[2]) << 16) |
                 ((unsigned int)_wrap_all_bits(ucontrol->value.iec958.status[3]))  |
@@ -2029,7 +2031,7 @@ static int snd_cs46xx_spdif_default_put(struct snd_kcontrol *kcontrol,
         if ( !(ins->spdif_status_out & DSP_SPDIF_STATUS_PLAYBACK_OPEN) )
                 cs46xx_poke_via_dsp (chip,SP_SPDOUT_CSUV,val);
 
-        up (&chip->spos_mutex);
+        mutex_unlock(&chip->spos_mutex);
 
         return change;
 }
@@ -2050,12 +2052,12 @@ static int snd_cs46xx_spdif_stream_get(struct snd_kcontrol *kcontrol,
         struct snd_cs46xx *chip = snd_kcontrol_chip(kcontrol);
         struct dsp_spos_instance * ins = chip->dsp_spos_instance;
 
-        down (&chip->spos_mutex);
+        mutex_lock(&chip->spos_mutex);
         ucontrol->value.iec958.status[0] = _wrap_all_bits((ins->spdif_csuv_stream >> 24) & 0xff);
         ucontrol->value.iec958.status[1] = _wrap_all_bits((ins->spdif_csuv_stream >> 16) & 0xff);
         ucontrol->value.iec958.status[2] = 0;
         ucontrol->value.iec958.status[3] = _wrap_all_bits((ins->spdif_csuv_stream) & 0xff);
-        up (&chip->spos_mutex);
+        mutex_unlock(&chip->spos_mutex);
 
         return 0;
 }
@@ -2068,7 +2070,7 @@ static int snd_cs46xx_spdif_stream_put(struct snd_kcontrol *kcontrol,
         unsigned int val;
         int change;
 
-        down (&chip->spos_mutex);
+        mutex_lock(&chip->spos_mutex);
         val = ((unsigned int)_wrap_all_bits(ucontrol->value.iec958.status[0]) << 24) |
                 ((unsigned int)_wrap_all_bits(ucontrol->value.iec958.status[1]) << 16) |
                 ((unsigned int)_wrap_all_bits(ucontrol->value.iec958.status[3])) |
@@ -2082,7 +2084,7 @@ static int snd_cs46xx_spdif_stream_put(struct snd_kcontrol *kcontrol,
         if ( ins->spdif_status_out & DSP_SPDIF_STATUS_PLAYBACK_OPEN )
                 cs46xx_poke_via_dsp (chip,SP_SPDOUT_CSUV,val);
 
-        up (&chip->spos_mutex);
+        mutex_unlock(&chip->spos_mutex);
 
         return change;
 }
@@ -3755,7 +3757,7 @@ int __devinit snd_cs46xx_create(struct snd_card *card,
         }
         spin_lock_init(&chip->reg_lock);
 #ifdef CONFIG_SND_CS46XX_NEW_DSP
-        init_MUTEX(&chip->spos_mutex);
+        mutex_init(&chip->spos_mutex);
 #endif
         chip->card = card;
         chip->pci = pci;