fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / sound / oss / ac97.c

diff --git a/sound/oss/ac97.c b/sound/oss/ac97.c
index 258060e..72cf4ed 100644 (file)
--- a/sound/oss/ac97.c
+++ b/sound/oss/ac97.c
@@ -112,28 +112,9 @@ ac97_init (struct ac97_hwint *dev)
     return 0;
 }
 
-/* Reset the mixer to the currently saved settings.  */
-int
-ac97_reset (struct ac97_hwint *dev)
-{
-    int x;
-
-    if (dev->reset_device (dev))
-       return -1;
-
-    /* Now set the registers back to their last-written values. */
-    for (x = 0; mixerRegs[x].ac97_regnum != -1; x++) {
-       int regnum = mixerRegs[x].ac97_regnum;
-       int value = dev->last_written_mixer_values [regnum / 2];
-       if (value >= 0)
-           ac97_put_register (dev, regnum, value);
-    }
-    return 0;
-}
-
 /* Return the contents of register REG; use the cache if the value in it
    is valid.  Returns a negative error code on failure. */
-int
+static int
 ac97_get_register (struct ac97_hwint *dev, u8 reg) 
 {
     if (reg > 127 || (reg & 1))
@@ -226,7 +207,7 @@ ac97_scale_from_oss_val (int value, int maxval, int is_stereo, int inv)
     }
 }
 
-int
+static int
 ac97_set_mixer (struct ac97_hwint *dev, int oss_channel, u16 oss_value)
 {
     int scaled_value;
@@ -262,7 +243,7 @@ ac97_set_mixer (struct ac97_hwint *dev, int oss_channel, u16 oss_value)
     return result;
 }
 
-int
+static int
 ac97_get_mixer_scaled (struct ac97_hwint *dev, int oss_channel)
 {
     struct ac97_chn_desc *channel = ac97_find_chndesc (dev, oss_channel);
@@ -292,7 +273,7 @@ ac97_get_mixer_scaled (struct ac97_hwint *dev, int oss_channel)
                                  channel->is_inverted);
 }
 
-int
+static int
 ac97_get_recmask (struct ac97_hwint *dev)
 {
     int recReg = ac97_get_register (dev, AC97_RECORD_SELECT);
@@ -309,7 +290,7 @@ ac97_get_recmask (struct ac97_hwint *dev)
     }
 }
 
-int
+static int
 ac97_set_recmask (struct ac97_hwint *dev, int oss_recmask)
 {
     int x;
@@ -369,7 +350,7 @@ ac97_set_values (struct ac97_hwint *dev,
 }
 
 int
-ac97_mixer_ioctl (struct ac97_hwint *dev, unsigned int cmd, caddr_t arg)
+ac97_mixer_ioctl (struct ac97_hwint *dev, unsigned int cmd, void __user *arg)
 {
     int ret;
 
@@ -380,7 +361,7 @@ ac97_mixer_ioctl (struct ac97_hwint *dev, unsigned int cmd, caddr_t arg)
 
     case SOUND_MIXER_WRITE_RECSRC:
        {
-           if (get_user (ret, (int *) arg))
+           if (get_user (ret, (int __user *) arg))
                ret = -EFAULT;
            else
                ret = ac97_set_recmask (dev, ret);
@@ -414,7 +395,7 @@ ac97_mixer_ioctl (struct ac97_hwint *dev, unsigned int cmd, caddr_t arg)
                ret = 0;
                if (dir & _SIOC_WRITE) {
                    int val;
-                   if (get_user (val, (int *) arg) == 0)
+                   if (get_user (val, (int __user *) arg) == 0)
                        ret = ac97_set_mixer (dev, channel, val);
                    else
                        ret = -EFAULT;
@@ -434,17 +415,13 @@ ac97_mixer_ioctl (struct ac97_hwint *dev, unsigned int cmd, caddr_t arg)
     if (ret < 0)
        return ret;
     else
-       return put_user(ret, (int *) arg);
+       return put_user(ret, (int __user *) arg);
 }
 
 EXPORT_SYMBOL(ac97_init);
 EXPORT_SYMBOL(ac97_set_values);
-EXPORT_SYMBOL(ac97_set_mixer);
-EXPORT_SYMBOL(ac97_get_register);
 EXPORT_SYMBOL(ac97_put_register);
-EXPORT_SYMBOL(ac97_get_mixer_scaled);
 EXPORT_SYMBOL(ac97_mixer_ioctl);
-EXPORT_SYMBOL(ac97_reset);
 MODULE_LICENSE("GPL");
 
 \f