|
@@ -1696,8 +1696,8 @@ pfm_poll(struct file *filp, poll_table * wait)
|
|
|
return mask;
|
|
|
}
|
|
|
|
|
|
-static int
|
|
|
-pfm_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg)
|
|
|
+static long
|
|
|
+pfm_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
|
|
|
{
|
|
|
DPRINT(("pfm_ioctl called\n"));
|
|
|
return -EINVAL;
|
|
@@ -2174,15 +2174,15 @@ pfm_no_open(struct inode *irrelevant, struct file *dontcare)
|
|
|
|
|
|
|
|
|
static const struct file_operations pfm_file_ops = {
|
|
|
- .llseek = no_llseek,
|
|
|
- .read = pfm_read,
|
|
|
- .write = pfm_write,
|
|
|
- .poll = pfm_poll,
|
|
|
- .ioctl = pfm_ioctl,
|
|
|
- .open = pfm_no_open, /* special open code to disallow open via /proc */
|
|
|
- .fasync = pfm_fasync,
|
|
|
- .release = pfm_close,
|
|
|
- .flush = pfm_flush
|
|
|
+ .llseek = no_llseek,
|
|
|
+ .read = pfm_read,
|
|
|
+ .write = pfm_write,
|
|
|
+ .poll = pfm_poll,
|
|
|
+ .unlocked_ioctl = pfm_ioctl,
|
|
|
+ .open = pfm_no_open, /* special open code to disallow open via /proc */
|
|
|
+ .fasync = pfm_fasync,
|
|
|
+ .release = pfm_close,
|
|
|
+ .flush = pfm_flush
|
|
|
};
|
|
|
|
|
|
static int
|