Commit 10e82f6c authored by Luck, Tony's avatar Luck, Tony Committed by Greg Kroah-Hartman

tty: simserial: now phase out the ioctl file pointer for good

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: default avatarTony Luck <tony.luck@intel.com>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>,
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent bdcffc5a
...@@ -390,8 +390,7 @@ static void rs_unthrottle(struct tty_struct * tty) ...@@ -390,8 +390,7 @@ static void rs_unthrottle(struct tty_struct * tty)
} }
static int rs_ioctl(struct tty_struct *tty, struct file * file, static int rs_ioctl(struct tty_struct *tty, unsigned int cmd, unsigned long arg)
unsigned int cmd, unsigned long arg)
{ {
if ((cmd != TIOCGSERIAL) && (cmd != TIOCSSERIAL) && if ((cmd != TIOCGSERIAL) && (cmd != TIOCSSERIAL) &&
(cmd != TIOCSERCONFIG) && (cmd != TIOCSERGSTRUCT) && (cmd != TIOCSERCONFIG) && (cmd != TIOCSERGSTRUCT) &&
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment