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/usb-serial.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/usb-serial.c')
-rw-r--r-- | drivers/usb/serial/usb-serial.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c index 546a52179bec..df105c6531a1 100644 --- a/drivers/usb/serial/usb-serial.c +++ b/drivers/usb/serial/usb-serial.c | |||
@@ -496,14 +496,14 @@ static const struct file_operations serial_proc_fops = { | |||
496 | .release = single_release, | 496 | .release = single_release, |
497 | }; | 497 | }; |
498 | 498 | ||
499 | static int serial_tiocmget(struct tty_struct *tty, struct file *file) | 499 | static int serial_tiocmget(struct tty_struct *tty) |
500 | { | 500 | { |
501 | struct usb_serial_port *port = tty->driver_data; | 501 | struct usb_serial_port *port = tty->driver_data; |
502 | 502 | ||
503 | dbg("%s - port %d", __func__, port->number); | 503 | dbg("%s - port %d", __func__, port->number); |
504 | 504 | ||
505 | if (port->serial->type->tiocmget) | 505 | if (port->serial->type->tiocmget) |
506 | return port->serial->type->tiocmget(tty, file); | 506 | return port->serial->type->tiocmget(tty); |
507 | return -EINVAL; | 507 | return -EINVAL; |
508 | } | 508 | } |
509 | 509 | ||