[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>

4 files changed, 52 insertions, 48 deletions

diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index 4a6dd97deba6..208a3341ec20 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -25,6 +25,7 @@
 #include <linux/slab.h>
 #include <linux/pci.h>
 #include <linux/moduleparam.h>
+#include <linux/mutex.h>
 #include <sound/core.h>
 #include "hda_codec.h"
 #include <sound/asoundef.h>
@@ -76,12 +77,12 @@ unsigned int snd_hda_codec_read(struct hda_codec *codec, hda_nid_t nid, int dire
                                 unsigned int verb, unsigned int parm)
 {
         unsigned int res;
-        down(&codec->bus->cmd_mutex);
+        mutex_lock(&codec->bus->cmd_mutex);
         if (! codec->bus->ops.command(codec, nid, direct, verb, parm))
                 res = codec->bus->ops.get_response(codec);
         else
                 res = (unsigned int)-1;
-        up(&codec->bus->cmd_mutex);
+        mutex_unlock(&codec->bus->cmd_mutex);
         return res;
 }
 
@@ -101,9 +102,9 @@ int snd_hda_codec_write(struct hda_codec *codec, hda_nid_t nid, int direct,
                          unsigned int verb, unsigned int parm)
 {
         int err;
-        down(&codec->bus->cmd_mutex);
+        mutex_lock(&codec->bus->cmd_mutex);
         err = codec->bus->ops.command(codec, nid, direct, verb, parm);
-        up(&codec->bus->cmd_mutex);
+        mutex_unlock(&codec->bus->cmd_mutex);
         return err;
 }
 
@@ -371,7 +372,7 @@ int snd_hda_bus_new(struct snd_card *card, const struct hda_bus_template *temp,
         bus->modelname = temp->modelname;
         bus->ops = temp->ops;
 
-        init_MUTEX(&bus->cmd_mutex);
+        mutex_init(&bus->cmd_mutex);
         INIT_LIST_HEAD(&bus->codec_list);
 
         if ((err = snd_device_new(card, SNDRV_DEV_BUS, bus, &dev_ops)) < 0) {
@@ -523,7 +524,7 @@ int snd_hda_codec_new(struct hda_bus *bus, unsigned int codec_addr,
 
         codec->bus = bus;
         codec->addr = codec_addr;
-        init_MUTEX(&codec->spdif_mutex);
+        mutex_init(&codec->spdif_mutex);
         init_amp_hash(codec);
 
         list_add_tail(&codec->list, &bus->codec_list);
@@ -881,12 +882,12 @@ int snd_hda_mixer_bind_switch_get(struct snd_kcontrol *kcontrol, struct snd_ctl_
         unsigned long pval;
         int err;
 
-        down(&codec->spdif_mutex); /* reuse spdif_mutex */
+        mutex_lock(&codec->spdif_mutex); /* reuse spdif_mutex */
         pval = kcontrol->private_value;
         kcontrol->private_value = pval & ~AMP_VAL_IDX_MASK; /* index 0 */
         err = snd_hda_mixer_amp_switch_get(kcontrol, ucontrol);
         kcontrol->private_value = pval;
-        up(&codec->spdif_mutex);
+        mutex_unlock(&codec->spdif_mutex);
         return err;
 }
 
@@ -896,7 +897,7 @@ int snd_hda_mixer_bind_switch_put(struct snd_kcontrol *kcontrol, struct snd_ctl_
         unsigned long pval;
         int i, indices, err = 0, change = 0;
 
-        down(&codec->spdif_mutex); /* reuse spdif_mutex */
+        mutex_lock(&codec->spdif_mutex); /* reuse spdif_mutex */
         pval = kcontrol->private_value;
         indices = (pval & AMP_VAL_IDX_MASK) >> AMP_VAL_IDX_SHIFT;
         for (i = 0; i < indices; i++) {
@@ -907,7 +908,7 @@ int snd_hda_mixer_bind_switch_put(struct snd_kcontrol *kcontrol, struct snd_ctl_
                 change |= err;
         }
         kcontrol->private_value = pval;
-        up(&codec->spdif_mutex);
+        mutex_unlock(&codec->spdif_mutex);
         return err < 0 ? err : change;
 }
 
@@ -1011,7 +1012,7 @@ static int snd_hda_spdif_default_put(struct snd_kcontrol *kcontrol, struct snd_c
         unsigned short val;
         int change;
 
-        down(&codec->spdif_mutex);
+        mutex_lock(&codec->spdif_mutex);
         codec->spdif_status = ucontrol->value.iec958.status[0] |
                 ((unsigned int)ucontrol->value.iec958.status[1] << 8) |
                 ((unsigned int)ucontrol->value.iec958.status[2] << 16) |
@@ -1026,7 +1027,7 @@ static int snd_hda_spdif_default_put(struct snd_kcontrol *kcontrol, struct snd_c
                 snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_DIGI_CONVERT_2, val >> 8);
         }
 
-        up(&codec->spdif_mutex);
+        mutex_unlock(&codec->spdif_mutex);
         return change;
 }
 
@@ -1054,7 +1055,7 @@ static int snd_hda_spdif_out_switch_put(struct snd_kcontrol *kcontrol, struct sn
         unsigned short val;
         int change;
 
-        down(&codec->spdif_mutex);
+        mutex_lock(&codec->spdif_mutex);
         val = codec->spdif_ctls & ~1;
         if (ucontrol->value.integer.value[0])
                 val |= 1;
@@ -1066,7 +1067,7 @@ static int snd_hda_spdif_out_switch_put(struct snd_kcontrol *kcontrol, struct sn
                                     AC_AMP_SET_RIGHT | AC_AMP_SET_LEFT |
                                     AC_AMP_SET_OUTPUT | ((val & 1) ? 0 : 0x80));
         }
-        up(&codec->spdif_mutex);
+        mutex_unlock(&codec->spdif_mutex);
         return change;
 }
 
@@ -1150,13 +1151,13 @@ static int snd_hda_spdif_in_switch_put(struct snd_kcontrol *kcontrol, struct snd
         unsigned int val = !!ucontrol->value.integer.value[0];
         int change;
 
-        down(&codec->spdif_mutex);
+        mutex_lock(&codec->spdif_mutex);
         change = codec->spdif_in_enable != val;
         if (change || codec->in_resume) {
                 codec->spdif_in_enable = val;
                 snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_DIGI_CONVERT_1, val);
         }
-        up(&codec->spdif_mutex);
+        mutex_unlock(&codec->spdif_mutex);
         return change;
 }
 
@@ -1824,13 +1825,13 @@ int snd_hda_input_mux_put(struct hda_codec *codec, const struct hda_input_mux *i
  */
 int snd_hda_multi_out_dig_open(struct hda_codec *codec, struct hda_multi_out *mout)
 {
-        down(&codec->spdif_mutex);
+        mutex_lock(&codec->spdif_mutex);
         if (mout->dig_out_used) {
-                up(&codec->spdif_mutex);
+                mutex_unlock(&codec->spdif_mutex);
                 return -EBUSY; /* already being used */
         }
         mout->dig_out_used = HDA_DIG_EXCLUSIVE;
-        up(&codec->spdif_mutex);
+        mutex_unlock(&codec->spdif_mutex);
         return 0;
 }
 
@@ -1839,9 +1840,9 @@ int snd_hda_multi_out_dig_open(struct hda_codec *codec, struct hda_multi_out *mo
  */
 int snd_hda_multi_out_dig_close(struct hda_codec *codec, struct hda_multi_out *mout)
 {
-        down(&codec->spdif_mutex);
+        mutex_lock(&codec->spdif_mutex);
         mout->dig_out_used = 0;
-        up(&codec->spdif_mutex);
+        mutex_unlock(&codec->spdif_mutex);
         return 0;
 }
 
@@ -1869,7 +1870,7 @@ int snd_hda_multi_out_analog_prepare(struct hda_codec *codec, struct hda_multi_o
         int chs = substream->runtime->channels;
         int i;
 
-        down(&codec->spdif_mutex);
+        mutex_lock(&codec->spdif_mutex);
         if (mout->dig_out_nid && mout->dig_out_used != HDA_DIG_EXCLUSIVE) {
                 if (chs == 2 &&
                     snd_hda_is_supported_format(codec, mout->dig_out_nid, format) &&
@@ -1883,7 +1884,7 @@ int snd_hda_multi_out_analog_prepare(struct hda_codec *codec, struct hda_multi_o
                         snd_hda_codec_setup_stream(codec, mout->dig_out_nid, 0, 0, 0);
                 }
         }
-        up(&codec->spdif_mutex);
+        mutex_unlock(&codec->spdif_mutex);
 
         /* front */
         snd_hda_codec_setup_stream(codec, nids[HDA_FRONT], stream_tag, 0, format);
@@ -1914,12 +1915,12 @@ int snd_hda_multi_out_analog_cleanup(struct hda_codec *codec, struct hda_multi_o
                 snd_hda_codec_setup_stream(codec, nids[i], 0, 0, 0);
         if (mout->hp_nid)
                 snd_hda_codec_setup_stream(codec, mout->hp_nid, 0, 0, 0);
-        down(&codec->spdif_mutex);
+        mutex_lock(&codec->spdif_mutex);
         if (mout->dig_out_nid && mout->dig_out_used == HDA_DIG_ANALOG_DUP) {
                 snd_hda_codec_setup_stream(codec, mout->dig_out_nid, 0, 0, 0);
                 mout->dig_out_used = 0;
         }
-        up(&codec->spdif_mutex);
+        mutex_unlock(&codec->spdif_mutex);
         return 0;
 }
 
diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h
index 63e26c7a2b7a..40520e9d5a4b 100644
--- a/sound/pci/hda/hda_codec.h
+++ b/sound/pci/hda/hda_codec.h
@@ -438,7 +438,7 @@ struct hda_bus {
         struct list_head codec_list;
         struct hda_codec *caddr_tbl[HDA_MAX_CODEC_ADDRESS + 1]; /* caddr -> codec */
 
-        struct semaphore cmd_mutex;
+        struct mutex cmd_mutex;
 
         /* unsolicited event queue */
         struct hda_bus_unsolicited *unsol;
@@ -559,7 +559,7 @@ struct hda_codec {
         int amp_info_size;
         struct hda_amp_info *amp_info;
 
-        struct semaphore spdif_mutex;
+        struct mutex spdif_mutex;
         unsigned int spdif_status;      /* IEC958 status bits */
         unsigned short spdif_ctls;      /* SPDIF control bits */
         unsigned int spdif_in_enable;   /* SPDIF input enable? */
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index b3f37e7b33c0..dbed2644a192 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -43,6 +43,7 @@
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/pci.h>
+#include <linux/mutex.h>
 #include <sound/core.h>
 #include <sound/initval.h>
 #include "hda_codec.h"
@@ -297,7 +298,7 @@ struct azx {
 
         /* locks */
         spinlock_t reg_lock;
-        struct semaphore open_mutex;
+        struct mutex open_mutex;
 
         /* streams (x num_streams) */
         struct azx_dev *azx_dev;
@@ -993,10 +994,10 @@ static int azx_pcm_open(struct snd_pcm_substream *substream)
         unsigned long flags;
         int err;
 
-        down(&chip->open_mutex);
+        mutex_lock(&chip->open_mutex);
         azx_dev = azx_assign_device(chip, substream->stream);
         if (azx_dev == NULL) {
-                up(&chip->open_mutex);
+                mutex_unlock(&chip->open_mutex);
                 return -EBUSY;
         }
         runtime->hw = azx_pcm_hw;
@@ -1008,7 +1009,7 @@ static int azx_pcm_open(struct snd_pcm_substream *substream)
         snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS);
         if ((err = hinfo->ops.open(hinfo, apcm->codec, substream)) < 0) {
                 azx_release_device(azx_dev);
-                up(&chip->open_mutex);
+                mutex_unlock(&chip->open_mutex);
                 return err;
         }
         spin_lock_irqsave(&chip->reg_lock, flags);
@@ -1017,7 +1018,7 @@ static int azx_pcm_open(struct snd_pcm_substream *substream)
         spin_unlock_irqrestore(&chip->reg_lock, flags);
 
         runtime->private_data = azx_dev;
-        up(&chip->open_mutex);
+        mutex_unlock(&chip->open_mutex);
         return 0;
 }
 
@@ -1029,14 +1030,14 @@ static int azx_pcm_close(struct snd_pcm_substream *substream)
         struct azx_dev *azx_dev = get_azx_dev(substream);
         unsigned long flags;
 
-        down(&chip->open_mutex);
+        mutex_lock(&chip->open_mutex);
         spin_lock_irqsave(&chip->reg_lock, flags);
         azx_dev->substream = NULL;
         azx_dev->running = 0;
         spin_unlock_irqrestore(&chip->reg_lock, flags);
         azx_release_device(azx_dev);
         hinfo->ops.close(hinfo, apcm->codec, substream);
-        up(&chip->open_mutex);
+        mutex_unlock(&chip->open_mutex);
         return 0;
 }
 
@@ -1408,7 +1409,7 @@ static int __devinit azx_create(struct snd_card *card, struct pci_dev *pci,
         }
 
         spin_lock_init(&chip->reg_lock);
-        init_MUTEX(&chip->open_mutex);
+        mutex_init(&chip->open_mutex);
         chip->card = card;
         chip->pci = pci;
         chip->irq = -1;
diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c
index 1ada1b075c9a..5a3821ae93a8 100644
--- a/sound/pci/hda/patch_analog.c
+++ b/sound/pci/hda/patch_analog.c
@@ -23,6 +23,8 @@
 #include <linux/delay.h>
 #include <linux/slab.h>
 #include <linux/pci.h>
+#include <linux/mutex.h>
+
 #include <sound/core.h>
 #include "hda_codec.h"
 #include "hda_local.h"
@@ -60,7 +62,7 @@ struct ad198x_spec {
         /* PCM information */
         struct hda_pcm pcm_rec[2];      /* used in alc_build_pcms() */
 
-        struct semaphore amp_mutex;     /* PCM volume/mute control mutex */
+        struct mutex amp_mutex; /* PCM volume/mute control mutex */
         unsigned int spdif_route;
 
         /* dynamic controls, init_verbs and input_mux */
@@ -371,9 +373,9 @@ static int ad1986a_pcm_amp_vol_get(struct snd_kcontrol *kcontrol, struct snd_ctl
         struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
         struct ad198x_spec *ad = codec->spec;
 
-        down(&ad->amp_mutex);
+        mutex_lock(&ad->amp_mutex);
         snd_hda_mixer_amp_volume_get(kcontrol, ucontrol);
-        up(&ad->amp_mutex);
+        mutex_unlock(&ad->amp_mutex);
         return 0;
 }
 
@@ -383,13 +385,13 @@ static int ad1986a_pcm_amp_vol_put(struct snd_kcontrol *kcontrol, struct snd_ctl
         struct ad198x_spec *ad = codec->spec;
         int i, change = 0;
 
-        down(&ad->amp_mutex);
+        mutex_lock(&ad->amp_mutex);
         for (i = 0; i < ARRAY_SIZE(ad1986a_dac_nids); i++) {
                 kcontrol->private_value = HDA_COMPOSE_AMP_VAL(ad1986a_dac_nids[i], 3, 0, HDA_OUTPUT);
                 change |= snd_hda_mixer_amp_volume_put(kcontrol, ucontrol);
         }
         kcontrol->private_value = HDA_COMPOSE_AMP_VAL(AD1986A_FRONT_DAC, 3, 0, HDA_OUTPUT);
-        up(&ad->amp_mutex);
+        mutex_unlock(&ad->amp_mutex);
         return change;
 }
 
@@ -400,9 +402,9 @@ static int ad1986a_pcm_amp_sw_get(struct snd_kcontrol *kcontrol, struct snd_ctl_
         struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
         struct ad198x_spec *ad = codec->spec;
 
-        down(&ad->amp_mutex);
+        mutex_lock(&ad->amp_mutex);
         snd_hda_mixer_amp_switch_get(kcontrol, ucontrol);
-        up(&ad->amp_mutex);
+        mutex_unlock(&ad->amp_mutex);
         return 0;
 }
 
@@ -412,13 +414,13 @@ static int ad1986a_pcm_amp_sw_put(struct snd_kcontrol *kcontrol, struct snd_ctl_
         struct ad198x_spec *ad = codec->spec;
         int i, change = 0;
 
-        down(&ad->amp_mutex);
+        mutex_lock(&ad->amp_mutex);
         for (i = 0; i < ARRAY_SIZE(ad1986a_dac_nids); i++) {
                 kcontrol->private_value = HDA_COMPOSE_AMP_VAL(ad1986a_dac_nids[i], 3, 0, HDA_OUTPUT);
                 change |= snd_hda_mixer_amp_switch_put(kcontrol, ucontrol);
         }
         kcontrol->private_value = HDA_COMPOSE_AMP_VAL(AD1986A_FRONT_DAC, 3, 0, HDA_OUTPUT);
-        up(&ad->amp_mutex);
+        mutex_unlock(&ad->amp_mutex);
         return change;
 }
 
@@ -544,7 +546,7 @@ static int patch_ad1986a(struct hda_codec *codec)
         if (spec == NULL)
                 return -ENOMEM;
 
-        init_MUTEX(&spec->amp_mutex);
+        mutex_init(&spec->amp_mutex);
         codec->spec = spec;
 
         spec->multiout.max_channels = 6;
@@ -708,7 +710,7 @@ static int patch_ad1983(struct hda_codec *codec)
         if (spec == NULL)
                 return -ENOMEM;
 
-        init_MUTEX(&spec->amp_mutex);
+        mutex_init(&spec->amp_mutex);
         codec->spec = spec;
 
         spec->multiout.max_channels = 2;
@@ -854,7 +856,7 @@ static int patch_ad1981(struct hda_codec *codec)
         if (spec == NULL)
                 return -ENOMEM;
 
-        init_MUTEX(&spec->amp_mutex);
+        mutex_init(&spec->amp_mutex);
         codec->spec = spec;
 
         spec->multiout.max_channels = 2;
@@ -2032,7 +2034,7 @@ static int patch_ad1988(struct hda_codec *codec)
         if (spec == NULL)
                 return -ENOMEM;
 
-        init_MUTEX(&spec->amp_mutex);
+        mutex_init(&spec->amp_mutex);
         codec->spec = spec;
 
         if (codec->revision_id == AD1988A_REV2)