Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1

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

diff --git a/sound/oss/msnd_pinnacle.c b/sound/oss/msnd_pinnacle.c
index 9f18b40..24110d6 100644 (file)
--- a/sound/oss/msnd_pinnacle.c
+++ b/sound/oss/msnd_pinnacle.c
@@ -39,7 +39,6 @@
  ********************************************************************/
 
 #include <linux/kernel.h>
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/types.h>
@@ -892,7 +891,7 @@ static __inline__ int pack_DAPF_to_DAPQ(register int start)
 static int dsp_read(char __user *buf, size_t len)
 {
        int count = len;
-       char *page = (char *)__get_free_page(PAGE_SIZE);
+       char *page = (char *)__get_free_page(GFP_KERNEL);
 
        if (!page)
                return -ENOMEM;
@@ -1008,7 +1007,7 @@ static int dsp_write(const char __user *buf, size_t len)
 
 static ssize_t dev_read(struct file *file, char __user *buf, size_t count, loff_t *off)
 {
-       int minor = iminor(file->f_dentry->d_inode);
+       int minor = iminor(file->f_path.dentry->d_inode);
        if (minor == dev.dsp_minor)
                return dsp_read(buf, count);
        else
@@ -1017,7 +1016,7 @@ static ssize_t dev_read(struct file *file, char __user *buf, size_t count, loff_
 
 static ssize_t dev_write(struct file *file, const char __user *buf, size_t count, loff_t *off)
 {
-       int minor = iminor(file->f_dentry->d_inode);
+       int minor = iminor(file->f_path.dentry->d_inode);
        if (minor == dev.dsp_minor)
                return dsp_write(buf, count);
        else
@@ -1088,7 +1087,7 @@ static __inline__ void eval_dsp_msg(register WORD wMessage)
        }
 }
 
-static irqreturn_t intr(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t intr(int irq, void *dev_id)
 {
        /* Send ack to DSP */
        msnd_inb(dev.io + HP_RXL);
@@ -1603,24 +1602,6 @@ MODULE_AUTHOR                            ("Andrew Veliath <andrewtv@usa.net>");
 MODULE_DESCRIPTION                     ("Turtle Beach " LONGNAME " Linux Driver");
 MODULE_LICENSE("GPL");
 
-MODULE_PARM                            (io, "i");
-MODULE_PARM                            (irq, "i");
-MODULE_PARM                            (mem, "i");
-MODULE_PARM                            (write_ndelay, "i");
-MODULE_PARM                            (fifosize, "i");
-MODULE_PARM                            (calibrate_signal, "i");
-#ifndef MSND_CLASSIC
-MODULE_PARM                            (digital, "i");
-MODULE_PARM                            (cfg, "i");
-MODULE_PARM                            (reset, "i");
-MODULE_PARM                            (mpu_io, "i");
-MODULE_PARM                            (mpu_irq, "i");
-MODULE_PARM                            (ide_io0, "i");
-MODULE_PARM                            (ide_io1, "i");
-MODULE_PARM                            (ide_irq, "i");
-MODULE_PARM                            (joystick_io, "i");
-#endif
-
 static int io __initdata =             -1;
 static int irq __initdata =            -1;
 static int mem __initdata =            -1;
@@ -1726,6 +1707,23 @@ static int
 calibrate_signal __initdata =          CONFIG_MSND_CALSIGNAL;
 #endif /* MODULE */
 
+module_param                           (io, int, 0);
+module_param                           (irq, int, 0);
+module_param                           (mem, int, 0);
+module_param                           (write_ndelay, int, 0);
+module_param                           (fifosize, int, 0);
+module_param                           (calibrate_signal, int, 0);
+#ifndef MSND_CLASSIC
+module_param                           (digital, bool, 0);
+module_param                           (cfg, int, 0);
+module_param                           (reset, int, 0);
+module_param                           (mpu_io, int, 0);
+module_param                           (mpu_irq, int, 0);
+module_param                           (ide_io0, int, 0);
+module_param                           (ide_io1, int, 0);
+module_param                           (ide_irq, int, 0);
+module_param                           (joystick_io, int, 0);
+#endif
 
 static int __init msnd_init(void)
 {