tty: simserial: now phase out the ioctl file pointer for good
authorLuck, Tony <tony.luck@intel.com>
Tue, 22 Feb 2011 19:47:04 +0000 (11:47 -0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 22 Feb 2011 23:48:18 +0000 (15:48 -0800)
Alan missed the ia64 simulator serial driver (because it was hidden
in arch/... rather than located under drivers/... where one might
expect to find a driver).  Drop the "file *" argument from rs_ioctl()
in arch/ia64/hp/sim/simserial.c

Signed-off-by: Tony Luck <tony.luck@intel.com>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>,
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
arch/ia64/hp/sim/simserial.c

index 13633da..bff0824 100644 (file)
@@ -390,8 +390,7 @@ static void rs_unthrottle(struct tty_struct * tty)
 }
 
 
-static int rs_ioctl(struct tty_struct *tty, struct file * file,
-                   unsigned int cmd, unsigned long arg)
+static int rs_ioctl(struct tty_struct *tty, unsigned int cmd, unsigned long arg)
 {
        if ((cmd != TIOCGSERIAL) && (cmd != TIOCSSERIAL) &&
            (cmd != TIOCSERCONFIG) && (cmd != TIOCSERGSTRUCT) &&