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/char/rocket.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/char/rocket.c')
-rw-r--r-- | drivers/char/rocket.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/rocket.c b/drivers/char/rocket.c index 3e4e73a0d7c1..75e98efbc8e9 100644 --- a/drivers/char/rocket.c +++ b/drivers/char/rocket.c | |||
@@ -1169,7 +1169,7 @@ static int sGetChanRI(CHANNEL_T * ChP) | |||
1169 | * Returns the state of the serial modem control lines. These next 2 functions | 1169 | * Returns the state of the serial modem control lines. These next 2 functions |
1170 | * are the way kernel versions > 2.5 handle modem control lines rather than IOCTLs. | 1170 | * are the way kernel versions > 2.5 handle modem control lines rather than IOCTLs. |
1171 | */ | 1171 | */ |
1172 | static int rp_tiocmget(struct tty_struct *tty, struct file *file) | 1172 | static int rp_tiocmget(struct tty_struct *tty) |
1173 | { | 1173 | { |
1174 | struct r_port *info = tty->driver_data; | 1174 | struct r_port *info = tty->driver_data; |
1175 | unsigned int control, result, ChanStatus; | 1175 | unsigned int control, result, ChanStatus; |