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/tty/serial/ifx6x60.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/tty/serial/ifx6x60.c')
-rw-r--r-- | drivers/tty/serial/ifx6x60.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/serial/ifx6x60.c b/drivers/tty/serial/ifx6x60.c index b68b96f53e6c..4d26d39ec344 100644 --- a/drivers/tty/serial/ifx6x60.c +++ b/drivers/tty/serial/ifx6x60.c | |||
@@ -245,7 +245,7 @@ static void ifx_spi_timeout(unsigned long arg) | |||
245 | * Map the signal state into Linux modem flags and report the value | 245 | * Map the signal state into Linux modem flags and report the value |
246 | * in Linux terms | 246 | * in Linux terms |
247 | */ | 247 | */ |
248 | static int ifx_spi_tiocmget(struct tty_struct *tty, struct file *filp) | 248 | static int ifx_spi_tiocmget(struct tty_struct *tty) |
249 | { | 249 | { |
250 | unsigned int value; | 250 | unsigned int value; |
251 | struct ifx_spi_device *ifx_dev = tty->driver_data; | 251 | struct ifx_spi_device *ifx_dev = tty->driver_data; |