diff options
author | Alan Cox <alan@linux.intel.com> | 2011-02-14 11:26:14 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-17 14:47:33 -0500 |
commit | 60b33c133ca0b7c0b6072c87234b63fee6e80558 (patch) | |
tree | 379340a7ab563df42ddb2907be6f282202244077 /include/linux/tty_driver.h | |
parent | adf9251fe9b87b5a50deebe489db2df8df4715fc (diff) |
tiocmget: kill off the passing of the struct file
We don't actually need this and it causes problems for internal use of
this functionality. Currently there is a single use of the FILE * pointer.
That is the serial core which uses it to check tty_hung_up_p. However if
that is true then IO_ERROR is also already set so the check may be removed.
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include/linux/tty_driver.h')
-rw-r--r-- | include/linux/tty_driver.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/tty_driver.h b/include/linux/tty_driver.h index c3d43eb4150c..9539d74171db 100644 --- a/include/linux/tty_driver.h +++ b/include/linux/tty_driver.h | |||
@@ -271,7 +271,7 @@ struct tty_operations { | |||
271 | void (*set_ldisc)(struct tty_struct *tty); | 271 | void (*set_ldisc)(struct tty_struct *tty); |
272 | void (*wait_until_sent)(struct tty_struct *tty, int timeout); | 272 | void (*wait_until_sent)(struct tty_struct *tty, int timeout); |
273 | void (*send_xchar)(struct tty_struct *tty, char ch); | 273 | void (*send_xchar)(struct tty_struct *tty, char ch); |
274 | int (*tiocmget)(struct tty_struct *tty, struct file *file); | 274 | int (*tiocmget)(struct tty_struct *tty); |
275 | int (*tiocmset)(struct tty_struct *tty, struct file *file, | 275 | int (*tiocmset)(struct tty_struct *tty, struct file *file, |
276 | unsigned int set, unsigned int clear); | 276 | unsigned int set, unsigned int clear); |
277 | int (*resize)(struct tty_struct *tty, struct winsize *ws); | 277 | int (*resize)(struct tty_struct *tty, struct winsize *ws); |