diff options
author | Alan Cox <alan@linux.intel.com> | 2011-02-14 11:27:22 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-17 14:59:56 -0500 |
commit | 6caa76b7786891b42b66a0e61e2c2fff2c884620 (patch) | |
tree | eb6e387e080a44680d6d8686999336e69ec97e71 /drivers/tty/pty.c | |
parent | 00a0d0d65b61241a718d0aee96f46b9a2d93bf26 (diff) |
tty: now phase out the ioctl file pointer for good
Only oddities here are a couple of drivers that bogusly called the ldisc
helpers instead of returning -ENOIOCTLCMD. Fix the bug and the rest goes
away.
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/tty/pty.c')
-rw-r--r-- | drivers/tty/pty.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c index 923a48585501..c88029af84dd 100644 --- a/drivers/tty/pty.c +++ b/drivers/tty/pty.c | |||
@@ -334,7 +334,7 @@ free_mem_out: | |||
334 | return -ENOMEM; | 334 | return -ENOMEM; |
335 | } | 335 | } |
336 | 336 | ||
337 | static int pty_bsd_ioctl(struct tty_struct *tty, struct file *file, | 337 | static int pty_bsd_ioctl(struct tty_struct *tty, |
338 | unsigned int cmd, unsigned long arg) | 338 | unsigned int cmd, unsigned long arg) |
339 | { | 339 | { |
340 | switch (cmd) { | 340 | switch (cmd) { |
@@ -489,7 +489,7 @@ static struct ctl_table pty_root_table[] = { | |||
489 | }; | 489 | }; |
490 | 490 | ||
491 | 491 | ||
492 | static int pty_unix98_ioctl(struct tty_struct *tty, struct file *file, | 492 | static int pty_unix98_ioctl(struct tty_struct *tty, |
493 | unsigned int cmd, unsigned long arg) | 493 | unsigned int cmd, unsigned long arg) |
494 | { | 494 | { |
495 | switch (cmd) { | 495 | switch (cmd) { |