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 /drivers/usb/serial/keyspan.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 'drivers/usb/serial/keyspan.h')
| -rw-r--r-- | drivers/usb/serial/keyspan.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/usb/serial/keyspan.h b/drivers/usb/serial/keyspan.h index ce134dc28ddf..5e5fc71e68df 100644 --- a/drivers/usb/serial/keyspan.h +++ b/drivers/usb/serial/keyspan.h | |||
| @@ -58,8 +58,7 @@ static void keyspan_set_termios (struct tty_struct *tty, | |||
| 58 | struct ktermios *old); | 58 | struct ktermios *old); |
| 59 | static void keyspan_break_ctl (struct tty_struct *tty, | 59 | static void keyspan_break_ctl (struct tty_struct *tty, |
| 60 | int break_state); | 60 | int break_state); |
| 61 | static int keyspan_tiocmget (struct tty_struct *tty, | 61 | static int keyspan_tiocmget (struct tty_struct *tty); |
| 62 | struct file *file); | ||
| 63 | static int keyspan_tiocmset (struct tty_struct *tty, | 62 | static int keyspan_tiocmset (struct tty_struct *tty, |
| 64 | struct file *file, unsigned int set, | 63 | struct file *file, unsigned int set, |
| 65 | unsigned int clear); | 64 | unsigned int clear); |