Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / sound / pci / ice1712 / hoontech.c

diff --git a/sound/pci/ice1712/hoontech.c b/sound/pci/ice1712/hoontech.c
index ab5fbd0..3f27d04 100644 (file)
--- a/sound/pci/ice1712/hoontech.c
+++ b/sound/pci/ice1712/hoontech.c
@@ -27,13 +27,15 @@
 #include <linux/interrupt.h>
 #include <linux/init.h>
 #include <linux/slab.h>
+#include <linux/mutex.h>
+
 #include <sound/core.h>
 
 #include "ice1712.h"
 #include "hoontech.h"
 
 
-static void __devinit snd_ice1712_stdsp24_gpio_write(ice1712_t *ice, unsigned char byte)
+static void __devinit snd_ice1712_stdsp24_gpio_write(struct snd_ice1712 *ice, unsigned char byte)
 {
        byte |= ICE1712_STDSP24_CLOCK_BIT;
        udelay(100);
@@ -46,33 +48,33 @@ static void __devinit snd_ice1712_stdsp24_gpio_write(ice1712_t *ice, unsigned ch
        snd_ice1712_write(ice, ICE1712_IREG_GPIO_DATA, byte);
 }
 
-static void __devinit snd_ice1712_stdsp24_darear(ice1712_t *ice, int activate)
+static void __devinit snd_ice1712_stdsp24_darear(struct snd_ice1712 *ice, int activate)
 {
-       down(&ice->gpio_mutex);
+       mutex_lock(&ice->gpio_mutex);
        ICE1712_STDSP24_0_DAREAR(ice->spec.hoontech.boxbits, activate);
        snd_ice1712_stdsp24_gpio_write(ice, ice->spec.hoontech.boxbits[0]);
-       up(&ice->gpio_mutex);
+       mutex_unlock(&ice->gpio_mutex);
 }
 
-static void __devinit snd_ice1712_stdsp24_mute(ice1712_t *ice, int activate)
+static void __devinit snd_ice1712_stdsp24_mute(struct snd_ice1712 *ice, int activate)
 {
-       down(&ice->gpio_mutex);
+       mutex_lock(&ice->gpio_mutex);
        ICE1712_STDSP24_3_MUTE(ice->spec.hoontech.boxbits, activate);
        snd_ice1712_stdsp24_gpio_write(ice, ice->spec.hoontech.boxbits[3]);
-       up(&ice->gpio_mutex);
+       mutex_unlock(&ice->gpio_mutex);
 }
 
-static void __devinit snd_ice1712_stdsp24_insel(ice1712_t *ice, int activate)
+static void __devinit snd_ice1712_stdsp24_insel(struct snd_ice1712 *ice, int activate)
 {
-       down(&ice->gpio_mutex);
+       mutex_lock(&ice->gpio_mutex);
        ICE1712_STDSP24_3_INSEL(ice->spec.hoontech.boxbits, activate);
        snd_ice1712_stdsp24_gpio_write(ice, ice->spec.hoontech.boxbits[3]);
-       up(&ice->gpio_mutex);
+       mutex_unlock(&ice->gpio_mutex);
 }
 
-static void __devinit snd_ice1712_stdsp24_box_channel(ice1712_t *ice, int box, int chn, int activate)
+static void __devinit snd_ice1712_stdsp24_box_channel(struct snd_ice1712 *ice, int box, int chn, int activate)
 {
-       down(&ice->gpio_mutex);
+       mutex_lock(&ice->gpio_mutex);
 
        /* select box */
        ICE1712_STDSP24_0_BOX(ice->spec.hoontech.boxbits, box);
@@ -115,12 +117,12 @@ static void __devinit snd_ice1712_stdsp24_box_channel(ice1712_t *ice, int box, i
        ICE1712_STDSP24_2_MIDI1(ice->spec.hoontech.boxbits, 0);
        snd_ice1712_stdsp24_gpio_write(ice, ice->spec.hoontech.boxbits[2]);
 
-       up(&ice->gpio_mutex);
+       mutex_unlock(&ice->gpio_mutex);
 }
 
-static void __devinit snd_ice1712_stdsp24_box_midi(ice1712_t *ice, int box, int master)
+static void __devinit snd_ice1712_stdsp24_box_midi(struct snd_ice1712 *ice, int box, int master)
 {
-       down(&ice->gpio_mutex);
+       mutex_lock(&ice->gpio_mutex);
 
        /* select box */
        ICE1712_STDSP24_0_BOX(ice->spec.hoontech.boxbits, box);
@@ -141,18 +143,18 @@ static void __devinit snd_ice1712_stdsp24_box_midi(ice1712_t *ice, int box, int
        ICE1712_STDSP24_2_MIDIIN(ice->spec.hoontech.boxbits, 1);
        snd_ice1712_stdsp24_gpio_write(ice, ice->spec.hoontech.boxbits[2]);
 
-       up(&ice->gpio_mutex);
+       mutex_unlock(&ice->gpio_mutex);
 }
 
-static void __devinit snd_ice1712_stdsp24_midi2(ice1712_t *ice, int activate)
+static void __devinit snd_ice1712_stdsp24_midi2(struct snd_ice1712 *ice, int activate)
 {
-       down(&ice->gpio_mutex);
+       mutex_lock(&ice->gpio_mutex);
        ICE1712_STDSP24_3_MIDI2(ice->spec.hoontech.boxbits, activate);
        snd_ice1712_stdsp24_gpio_write(ice, ice->spec.hoontech.boxbits[3]);
-       up(&ice->gpio_mutex);
+       mutex_unlock(&ice->gpio_mutex);
 }
 
-static int __devinit snd_ice1712_hoontech_init(ice1712_t *ice)
+static int __devinit snd_ice1712_hoontech_init(struct snd_ice1712 *ice)
 {
        int box, chn;
 
@@ -221,9 +223,9 @@ static int __devinit snd_ice1712_hoontech_init(ice1712_t *ice)
  */
 
 /* start callback for STDSP24 with modified hardware */
-static void stdsp24_ak4524_lock(akm4xxx_t *ak, int chip)
+static void stdsp24_ak4524_lock(struct snd_akm4xxx *ak, int chip)
 {
-       ice1712_t *ice = ak->private_data[0];
+       struct snd_ice1712 *ice = ak->private_data[0];
        unsigned char tmp;
        snd_ice1712_save_gpio_status(ice);
        tmp =   ICE1712_STDSP24_SERIAL_DATA |
@@ -234,10 +236,10 @@ static void stdsp24_ak4524_lock(akm4xxx_t *ak, int chip)
        snd_ice1712_write(ice, ICE1712_IREG_GPIO_WRITE_MASK, ~tmp);
 }
 
-static int __devinit snd_ice1712_value_init(ice1712_t *ice)
+static int __devinit snd_ice1712_value_init(struct snd_ice1712 *ice)
 {
        /* Hoontech STDSP24 with modified hardware */
-       static akm4xxx_t akm_stdsp24_mv __devinitdata = {
+       static struct snd_akm4xxx akm_stdsp24_mv __devinitdata = {
                .num_adcs = 2,
                .num_dacs = 2,
                .type = SND_AK4524,
@@ -258,7 +260,7 @@ static int __devinit snd_ice1712_value_init(ice1712_t *ice)
        };
 
        int err;
-       akm4xxx_t *ak;
+       struct snd_akm4xxx *ak;
 
        /* set the analog DACs */
        ice->num_total_dacs = 2;
@@ -267,7 +269,7 @@ static int __devinit snd_ice1712_value_init(ice1712_t *ice)
        ice->num_total_adcs = 2;
        
        /* analog section */
-       ak = ice->akm = kmalloc(sizeof(akm4xxx_t), GFP_KERNEL);
+       ak = ice->akm = kmalloc(sizeof(struct snd_akm4xxx), GFP_KERNEL);
        if (! ak)
                return -ENOMEM;
        ice->akm_codecs = 1;
@@ -284,7 +286,7 @@ static int __devinit snd_ice1712_value_init(ice1712_t *ice)
        return 0;
 }
 
-static int __devinit snd_ice1712_ez8_init(ice1712_t *ice)
+static int __devinit snd_ice1712_ez8_init(struct snd_ice1712 *ice)
 {
        ice->gpio.write_mask = ice->eeprom.gpiomask;
        ice->gpio.direction = ice->eeprom.gpiodir;