git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
msnd_* is ISA-only
[safe/jmp/linux-2.6]
/
sound
/
oss
/
msnd_pinnacle.c
diff --git
a/sound/oss/msnd_pinnacle.c
b/sound/oss/msnd_pinnacle.c
index
6ba03f8
..
f1f49eb
100644
(file)
--- a/
sound/oss/msnd_pinnacle.c
+++ b/
sound/oss/msnd_pinnacle.c
@@
-39,7
+39,6
@@
********************************************************************/
#include <linux/kernel.h>
********************************************************************/
#include <linux/kernel.h>
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/slab.h>
#include <linux/types.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;
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;
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)
{
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
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)
{
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
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);
{
/* Send ack to DSP */
msnd_inb(dev.io + HP_RXL);
@@
-1107,7
+1106,7
@@
static irqreturn_t intr(int irq, void *dev_id, struct pt_regs *regs)
return IRQ_HANDLED;
}
return IRQ_HANDLED;
}
-static struct file_operations dev_fileops = {
+static
const
struct file_operations dev_fileops = {
.owner = THIS_MODULE,
.read = dev_read,
.write = dev_write,
.owner = THIS_MODULE,
.read = dev_read,
.write = dev_write,