summaryrefslogtreecommitdiffstats
path: root/arch/ia64/hp
diff options
context:
space:
mode:
authorLuck, Tony <tony.luck@intel.com>2011-02-22 11:47:04 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2011-02-22 15:48:18 -0800
commit10e82f6ce76351425644bccc56f8e2c2ad596ce6 (patch)
tree5218094201d52362120720b4922fad0f525e0990 /arch/ia64/hp
parentbdcffc5a1a28b566a38a4b0d5bcefc78a97f4ecb (diff)
downloadop-kernel-dev-10e82f6ce76351425644bccc56f8e2c2ad596ce6.zip
op-kernel-dev-10e82f6ce76351425644bccc56f8e2c2ad596ce6.tar.gz
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 <tony.luck@intel.com> Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>, Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch/ia64/hp')
-rw-r--r--arch/ia64/hp/sim/simserial.c3
1 files changed, 1 insertions, 2 deletions
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) &&
OpenPOWER on IntegriCloud