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/oti6858.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/oti6858.c')
-rw-r--r-- | drivers/usb/serial/oti6858.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/serial/oti6858.c b/drivers/usb/serial/oti6858.c index 73613205be7a..4cd3b0ef4e61 100644 --- a/drivers/usb/serial/oti6858.c +++ b/drivers/usb/serial/oti6858.c | |||
@@ -144,7 +144,7 @@ static int oti6858_write(struct tty_struct *tty, struct usb_serial_port *port, | |||
144 | const unsigned char *buf, int count); | 144 | const unsigned char *buf, int count); |
145 | static int oti6858_write_room(struct tty_struct *tty); | 145 | static int oti6858_write_room(struct tty_struct *tty); |
146 | static int oti6858_chars_in_buffer(struct tty_struct *tty); | 146 | static int oti6858_chars_in_buffer(struct tty_struct *tty); |
147 | static int oti6858_tiocmget(struct tty_struct *tty, struct file *file); | 147 | static int oti6858_tiocmget(struct tty_struct *tty); |
148 | static int oti6858_tiocmset(struct tty_struct *tty, struct file *file, | 148 | static int oti6858_tiocmset(struct tty_struct *tty, struct file *file, |
149 | unsigned int set, unsigned int clear); | 149 | unsigned int set, unsigned int clear); |
150 | static int oti6858_startup(struct usb_serial *serial); | 150 | static int oti6858_startup(struct usb_serial *serial); |
@@ -657,7 +657,7 @@ static int oti6858_tiocmset(struct tty_struct *tty, struct file *file, | |||
657 | return 0; | 657 | return 0; |
658 | } | 658 | } |
659 | 659 | ||
660 | static int oti6858_tiocmget(struct tty_struct *tty, struct file *file) | 660 | static int oti6858_tiocmget(struct tty_struct *tty) |
661 | { | 661 | { |
662 | struct usb_serial_port *port = tty->driver_data; | 662 | struct usb_serial_port *port = tty->driver_data; |
663 | struct oti6858_private *priv = usb_get_serial_port_data(port); | 663 | struct oti6858_private *priv = usb_get_serial_port_data(port); |