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/mct_u232.c | |
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/mct_u232.c')
-rw-r--r-- | drivers/usb/serial/mct_u232.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/serial/mct_u232.c b/drivers/usb/serial/mct_u232.c index 2849f8c32015..27447095feae 100644 --- a/drivers/usb/serial/mct_u232.c +++ b/drivers/usb/serial/mct_u232.c | |||
@@ -101,7 +101,7 @@ static void mct_u232_read_int_callback(struct urb *urb); | |||
101 | static void mct_u232_set_termios(struct tty_struct *tty, | 101 | static void mct_u232_set_termios(struct tty_struct *tty, |
102 | struct usb_serial_port *port, struct ktermios *old); | 102 | struct usb_serial_port *port, struct ktermios *old); |
103 | static void mct_u232_break_ctl(struct tty_struct *tty, int break_state); | 103 | static void mct_u232_break_ctl(struct tty_struct *tty, int break_state); |
104 | static int mct_u232_tiocmget(struct tty_struct *tty, struct file *file); | 104 | static int mct_u232_tiocmget(struct tty_struct *tty); |
105 | static int mct_u232_tiocmset(struct tty_struct *tty, struct file *file, | 105 | static int mct_u232_tiocmset(struct tty_struct *tty, struct file *file, |
106 | unsigned int set, unsigned int clear); | 106 | unsigned int set, unsigned int clear); |
107 | static void mct_u232_throttle(struct tty_struct *tty); | 107 | static void mct_u232_throttle(struct tty_struct *tty); |
@@ -762,7 +762,7 @@ static void mct_u232_break_ctl(struct tty_struct *tty, int break_state) | |||
762 | } /* mct_u232_break_ctl */ | 762 | } /* mct_u232_break_ctl */ |
763 | 763 | ||
764 | 764 | ||
765 | static int mct_u232_tiocmget(struct tty_struct *tty, struct file *file) | 765 | static int mct_u232_tiocmget(struct tty_struct *tty) |
766 | { | 766 | { |
767 | struct usb_serial_port *port = tty->driver_data; | 767 | struct usb_serial_port *port = tty->driver_data; |
768 | struct mct_u232_private *priv = usb_get_serial_port_data(port); | 768 | struct mct_u232_private *priv = usb_get_serial_port_data(port); |