From: Luck, Tony Date: Tue, 22 Feb 2011 19:47:04 +0000 (-0800) Subject: tty: simserial: now phase out the ioctl file pointer for good X-Git-Tag: v2.6.39-rc1~470^2~34 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=10e82f6ce76351425644bccc56f8e2c2ad596ce6;p=profile%2Fivi%2Fkernel-x86-ivi.git 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: Tony Luck Cc: Alan Cox , Signed-off-by: Greg Kroah-Hartman --- diff --git a/arch/ia64/hp/sim/simserial.c b/arch/ia64/hp/sim/simserial.c index 13633da..bff0824 100644 --- a/arch/ia64/hp/sim/simserial.c +++ b/arch/ia64/hp/sim/simserial.c @@ -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) &&