linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / sound / pci / ac97 / ak4531_codec.c

diff --git a/sound/pci/ac97/ak4531_codec.c b/sound/pci/ac97/ak4531_codec.c
index 94c26ec..dcfb503 100644 (file)
--- a/sound/pci/ac97/ak4531_codec.c
+++ b/sound/pci/ac97/ak4531_codec.c
@@ -23,8 +23,6 @@
 #include <linux/delay.h>
 #include <linux/init.h>
 #include <linux/slab.h>
-#include <linux/mutex.h>
-
 #include <sound/core.h>
 #include <sound/ak4531_codec.h>
 
@@ -84,9 +82,9 @@ static int snd_ak4531_get_single(struct snd_kcontrol *kcontrol, struct snd_ctl_e
        int invert = (kcontrol->private_value >> 22) & 1;
        int val;
 
-       mutex_lock(&ak4531->reg_mutex);
+       down(&ak4531->reg_mutex);
        val = (ak4531->regs[reg] >> shift) & mask;
-       mutex_unlock(&ak4531->reg_mutex);
+       up(&ak4531->reg_mutex);
        if (invert) {
                val = mask - val;
        }
@@ -109,11 +107,11 @@ static int snd_ak4531_put_single(struct snd_kcontrol *kcontrol, struct snd_ctl_e
                val = mask - val;
        }
        val <<= shift;
-       mutex_lock(&ak4531->reg_mutex);
+       down(&ak4531->reg_mutex);
        val = (ak4531->regs[reg] & ~(mask << shift)) | val;
        change = val != ak4531->regs[reg];
        ak4531->write(ak4531, reg, ak4531->regs[reg] = val);
-       mutex_unlock(&ak4531->reg_mutex);
+       up(&ak4531->reg_mutex);
        return change;
 }
 
@@ -145,10 +143,10 @@ static int snd_ak4531_get_double(struct snd_kcontrol *kcontrol, struct snd_ctl_e
        int invert = (kcontrol->private_value >> 22) & 1;
        int left, right;
 
-       mutex_lock(&ak4531->reg_mutex);
+       down(&ak4531->reg_mutex);
        left = (ak4531->regs[left_reg] >> left_shift) & mask;
        right = (ak4531->regs[right_reg] >> right_shift) & mask;
-       mutex_unlock(&ak4531->reg_mutex);
+       up(&ak4531->reg_mutex);
        if (invert) {
                left = mask - left;
                right = mask - right;
@@ -178,7 +176,7 @@ static int snd_ak4531_put_double(struct snd_kcontrol *kcontrol, struct snd_ctl_e
        }
        left <<= left_shift;
        right <<= right_shift;
-       mutex_lock(&ak4531->reg_mutex);
+       down(&ak4531->reg_mutex);
        if (left_reg == right_reg) {
                left = (ak4531->regs[left_reg] & ~((mask << left_shift) | (mask << right_shift))) | left | right;
                change = left != ak4531->regs[left_reg];
@@ -190,7 +188,7 @@ static int snd_ak4531_put_double(struct snd_kcontrol *kcontrol, struct snd_ctl_e
                ak4531->write(ak4531, left_reg, ak4531->regs[left_reg] = left);
                ak4531->write(ak4531, right_reg, ak4531->regs[right_reg] = right);
        }
-       mutex_unlock(&ak4531->reg_mutex);
+       up(&ak4531->reg_mutex);
        return change;
 }
 
@@ -217,12 +215,12 @@ static int snd_ak4531_get_input_sw(struct snd_kcontrol *kcontrol, struct snd_ctl
        int left_shift = (kcontrol->private_value >> 16) & 0x0f;
        int right_shift = (kcontrol->private_value >> 24) & 0x0f;
 
-       mutex_lock(&ak4531->reg_mutex);
+       down(&ak4531->reg_mutex);
        ucontrol->value.integer.value[0] = (ak4531->regs[reg1] >> left_shift) & 1;
        ucontrol->value.integer.value[1] = (ak4531->regs[reg2] >> left_shift) & 1;
        ucontrol->value.integer.value[2] = (ak4531->regs[reg1] >> right_shift) & 1;
        ucontrol->value.integer.value[3] = (ak4531->regs[reg2] >> right_shift) & 1;
-       mutex_unlock(&ak4531->reg_mutex);
+       up(&ak4531->reg_mutex);
        return 0;
 }
 
@@ -236,7 +234,7 @@ static int snd_ak4531_put_input_sw(struct snd_kcontrol *kcontrol, struct snd_ctl
        int change;
        int val1, val2;
 
-       mutex_lock(&ak4531->reg_mutex);
+       down(&ak4531->reg_mutex);
        val1 = ak4531->regs[reg1] & ~((1 << left_shift) | (1 << right_shift));
        val2 = ak4531->regs[reg2] & ~((1 << left_shift) | (1 << right_shift));
        val1 |= (ucontrol->value.integer.value[0] & 1) << left_shift;
@@ -246,7 +244,7 @@ static int snd_ak4531_put_input_sw(struct snd_kcontrol *kcontrol, struct snd_ctl
        change = val1 != ak4531->regs[reg1] || val2 != ak4531->regs[reg2];
        ak4531->write(ak4531, reg1, ak4531->regs[reg1] = val1);
        ak4531->write(ak4531, reg2, ak4531->regs[reg2] = val2);
-       mutex_unlock(&ak4531->reg_mutex);
+       up(&ak4531->reg_mutex);
        return change;
 }
 
@@ -368,7 +366,7 @@ int snd_ak4531_mixer(struct snd_card *card, struct snd_ak4531 *_ak4531,
        if (ak4531 == NULL)
                return -ENOMEM;
        *ak4531 = *_ak4531;
-       mutex_init(&ak4531->reg_mutex);
+       init_MUTEX(&ak4531->reg_mutex);
        if ((err = snd_component_add(card, "AK4531")) < 0) {
                snd_ak4531_free(ak4531);
                return err;
@@ -453,7 +451,7 @@ static void snd_ak4531_proc_init(struct snd_card *card, struct snd_ak4531 *ak453
        struct snd_info_entry *entry;
 
        if (! snd_card_proc_new(card, "ak4531", &entry))
-               snd_info_set_text_ops(entry, ak4531, snd_ak4531_proc_read);
+               snd_info_set_text_ops(entry, ak4531, 1024, snd_ak4531_proc_read);
 }
 #endif