linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / sound / pci / au88x0 / au88x0_eq.c

diff --git a/sound/pci/au88x0/au88x0_eq.c b/sound/pci/au88x0/au88x0_eq.c
index 0c86a31..c8280f8 100644 (file)
--- a/sound/pci/au88x0/au88x0_eq.c
+++ b/sound/pci/au88x0/au88x0_eq.c
@@ -377,23 +377,23 @@ static void vortex_EqHw_GetLevels(vortex_t * vortex, u16 a[])
 
 #endif
 /* Global Control */
-static void vortex_EqHw_SetControlReg(vortex_t * vortex, u32 reg)
+static void vortex_EqHw_SetControlReg(vortex_t * vortex, unsigned long reg)
 {
        hwwrite(vortex->mmio, 0x2b440, reg);
 }
 
-static void vortex_EqHw_SetSampleRate(vortex_t * vortex, u32 sr)
+static void vortex_EqHw_SetSampleRate(vortex_t * vortex, int sr)
 {
        hwwrite(vortex->mmio, 0x2b440, ((sr & 0x1f) << 3) | 0xb800);
 }
 
 #if 0
-static void vortex_EqHw_GetControlReg(vortex_t * vortex, u32 *reg)
+static void vortex_EqHw_GetControlReg(vortex_t * vortex, unsigned long *reg)
 {
        *reg = hwread(vortex->mmio, 0x2b440);
 }
 
-static void vortex_EqHw_GetSampleRate(vortex_t * vortex, u32 *sr)
+static void vortex_EqHw_GetSampleRate(vortex_t * vortex, int *sr)
 {
        *sr = (hwread(vortex->mmio, 0x2b440) >> 3) & 0x1f;
 }
@@ -554,7 +554,7 @@ static void vortex_Eqlzr_SetRightGain(vortex_t * vortex, u16 index, u16 gain)
 
 #if 0
 static int
-vortex_Eqlzr_GetAllBands(vortex_t * vortex, u16 * gains, s32 *cnt)
+vortex_Eqlzr_GetAllBands(vortex_t * vortex, u16 * gains, unsigned long *cnt)
 {
        eqlzr_t *eq = &(vortex->eq);
        int si = 0;
@@ -586,7 +586,7 @@ static int vortex_Eqlzr_SetAllBandsFromActiveCoeffSet(vortex_t * vortex)
 }
 
 static int
-vortex_Eqlzr_SetAllBands(vortex_t * vortex, u16 gains[], s32 count)
+vortex_Eqlzr_SetAllBands(vortex_t * vortex, u16 gains[], unsigned long count)
 {
        eqlzr_t *eq = &(vortex->eq);
        int i;
@@ -604,10 +604,11 @@ vortex_Eqlzr_SetAllBands(vortex_t * vortex, u16 gains[], s32 count)
 }
 
 static void
-vortex_Eqlzr_SetA3dBypassGain(vortex_t * vortex, u32 a, u32 b)
+vortex_Eqlzr_SetA3dBypassGain(vortex_t * vortex, unsigned long a,
+                             unsigned long b)
 {
        eqlzr_t *eq = &(vortex->eq);
-       u32 eax, ebx;
+       int eax, ebx;
 
        eq->this58 = a;
        eq->this5c = b;
@@ -623,7 +624,7 @@ vortex_Eqlzr_SetA3dBypassGain(vortex_t * vortex, u32 a, u32 b)
 static void vortex_Eqlzr_ProgramA3dBypassGain(vortex_t * vortex)
 {
        eqlzr_t *eq = &(vortex->eq);
-       u32 eax, ebx;
+       int eax, ebx;
 
        if (eq->this54)
                eax = eq->this0e;
@@ -640,7 +641,7 @@ static void vortex_Eqlzr_ShutDownA3d(vortex_t * vortex)
                vortex_EqHw_ZeroA3DIO(vortex);
 }
 
-static void vortex_Eqlzr_SetBypass(vortex_t * vortex, u32 bp)
+static void vortex_Eqlzr_SetBypass(vortex_t * vortex, long bp)
 {
        eqlzr_t *eq = &(vortex->eq);
        
@@ -650,8 +651,8 @@ static void vortex_Eqlzr_SetBypass(vortex_t * vortex, u32 bp)
                vortex_EqHw_SetBypassGain(vortex, eq->this08, eq->this08);
        } else {
                /* EQ disabled. */
-               vortex_EqHw_SetLeftGainsTarget(vortex, eq->this14_array);
-               vortex_EqHw_SetRightGainsTarget(vortex, eq->this14_array);
+               vortex_EqHw_SetLeftGainsTarget(vortex, (u16 *) (eq->this14));
+               vortex_EqHw_SetRightGainsTarget(vortex, (u16 *) (eq->this14));
                vortex_EqHw_SetBypassGain(vortex, eq->this0c, eq->this0c);
        }
        vortex_Eqlzr_ProgramA3dBypassGain(vortex);
@@ -705,7 +706,7 @@ static void vortex_Eqlzr_init(vortex_t * vortex)
        eq->this5c = 0xffff;
 
        /* Set gains. */
-       memset(eq->this14_array, 0, sizeof(eq->this14_array));
+       memset(eq->this14, 0, 2 * 10);
 
        /* Actual init. */
        vortex_EqHw_ZeroState(vortex);
@@ -791,7 +792,7 @@ snd_vortex_eq_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucon
 {
        vortex_t *vortex = snd_kcontrol_chip(kcontrol);
        int i = kcontrol->private_value;
-       u16 gainL = 0, gainR = 0;
+       u16 gainL, gainR;
 
        vortex_Eqlzr_GetLeftGain(vortex, i, &gainL);
        vortex_Eqlzr_GetRightGain(vortex, i, &gainR);
@@ -805,7 +806,7 @@ snd_vortex_eq_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucon
 {
        vortex_t *vortex = snd_kcontrol_chip(kcontrol);
        int changed = 0, i = kcontrol->private_value;
-       u16 gainL = 0, gainR = 0;
+       u16 gainL, gainR;
 
        vortex_Eqlzr_GetLeftGain(vortex, i, &gainL);
        vortex_Eqlzr_GetRightGain(vortex, i, &gainR);
@@ -885,7 +886,7 @@ static char *EqBandLabels[10] __devinitdata = {
 };
 
 /* ALSA driver entry points. Init and exit. */
-static int __devinit vortex_eq_init(vortex_t * vortex)
+static int vortex_eq_init(vortex_t * vortex)
 {
        struct snd_kcontrol *kcontrol;
        int err, i;