commit 6caa76b7786891b42b66a0e61e2c2fff2c884620
author Alan Cox <alan@linux.intel.com> Mon Feb 14 16:27:22 2011 +0000
committer Greg Kroah-Hartman <gregkh@suse.de> Thu Feb 17 11:59:56 2011 -0800
tree eb6e387e080a44680d6d8686999336e69ec97e71
parent 00a0d0d65b61241a718d0aee96f46b9a2d93bf26

tty: now phase out the ioctl file pointer for good

Only oddities here are a couple of drivers that bogusly called the ldisc
helpers instead of returning -ENOIOCTLCMD. Fix the bug and the rest goes
away.

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

drivers/isdn/i4l/isdn_tty.c

diff --git a/drivers/isdn/i4l/isdn_tty.c b/drivers/isdn/i4l/isdn_tty.c
index 0341c69..3d88f15 100644
--- a/drivers/isdn/i4l/isdn_tty.c
+++ b/drivers/isdn/i4l/isdn_tty.c
@@ -1413,8 +1413,7 @@
 }
 
 static int
-isdn_tty_ioctl(struct tty_struct *tty, struct file *file,
-	       uint cmd, ulong arg)
+isdn_tty_ioctl(struct tty_struct *tty, uint cmd, ulong arg)
 {
 	modem_info *info = (modem_info *) tty->driver_data;
 	int retval;