aboutsummaryrefslogtreecommitdiff
path: root/drivers/usb/serial/keyspan.h
diff options
context:
space:
mode:
authorAlan Cox <alan@linux.intel.com>2011-02-14 16:26:14 +0000
committerGreg Kroah-Hartman <gregkh@suse.de>2011-02-17 11:47:33 -0800
commit60b33c133ca0b7c0b6072c87234b63fee6e80558 (patch)
tree379340a7ab563df42ddb2907be6f282202244077 /drivers/usb/serial/keyspan.h
parentadf9251fe9b87b5a50deebe489db2df8df4715fc (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.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/usb/serial/keyspan.h b/drivers/usb/serial/keyspan.h
index ce134dc28dd..5e5fc71e68d 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,
struct ktermios *old);
static void keyspan_break_ctl (struct tty_struct *tty,
int break_state);
-static int keyspan_tiocmget (struct tty_struct *tty,
- struct file *file);
+static int keyspan_tiocmget (struct tty_struct *tty);
static int keyspan_tiocmset (struct tty_struct *tty,
struct file *file, unsigned int set,
unsigned int clear);