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/mos7720.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/mos7720.c')
-rw-r--r-- | drivers/usb/serial/mos7720.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/serial/mos7720.c b/drivers/usb/serial/mos7720.c index 7d3bc9a3e2b6..5d40d4151b5a 100644 --- a/drivers/usb/serial/mos7720.c +++ b/drivers/usb/serial/mos7720.c | |||
@@ -1833,7 +1833,7 @@ static int get_lsr_info(struct tty_struct *tty, | |||
1833 | return 0; | 1833 | return 0; |
1834 | } | 1834 | } |
1835 | 1835 | ||
1836 | static int mos7720_tiocmget(struct tty_struct *tty, struct file *file) | 1836 | static int mos7720_tiocmget(struct tty_struct *tty) |
1837 | { | 1837 | { |
1838 | struct usb_serial_port *port = tty->driver_data; | 1838 | struct usb_serial_port *port = tty->driver_data; |
1839 | struct moschip_port *mos7720_port = usb_get_serial_port_data(port); | 1839 | struct moschip_port *mos7720_port = usb_get_serial_port_data(port); |
@@ -1865,7 +1865,7 @@ static int mos7720_tiocmset(struct tty_struct *tty, struct file *file, | |||
1865 | struct moschip_port *mos7720_port = usb_get_serial_port_data(port); | 1865 | struct moschip_port *mos7720_port = usb_get_serial_port_data(port); |
1866 | unsigned int mcr ; | 1866 | unsigned int mcr ; |
1867 | dbg("%s - port %d", __func__, port->number); | 1867 | dbg("%s - port %d", __func__, port->number); |
1868 | dbg("he was at tiocmget"); | 1868 | dbg("he was at tiocmset"); |
1869 | 1869 | ||
1870 | mcr = mos7720_port->shadowMCR; | 1870 | mcr = mos7720_port->shadowMCR; |
1871 | 1871 | ||