Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

arch/ia64/hp/sim/simserial.c

+1 −2
Original line number Diff line number Diff line
@@ -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) &&