aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAlan Cox <alan@lxorguk.ukuu.org.uk>2007-10-15 15:53:35 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2007-10-25 15:18:44 -0400
commit3d3ddce568b79911bc893b9e8542f7e1d3bc72c7 (patch)
tree1a75796df4ee43261eac7cb9329bf3b5def6c9ca /drivers
parent3328d9752f3796a5f5f8695d27a175c34407a5ed (diff)
USB: mos7840: Clean up old checks and stuff
Signed-off-by: Alan Cox <alan@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/usb/serial/mos7840.c23
1 files changed, 2 insertions, 21 deletions
diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c
index f76480f1455..a5ced7e08cb 100644
--- a/drivers/usb/serial/mos7840.c
+++ b/drivers/usb/serial/mos7840.c
@@ -1977,11 +1977,6 @@ static void mos7840_change_port_settings(struct moschip_port *mos7840_port,
1977 1977
1978 tty = mos7840_port->port->tty; 1978 tty = mos7840_port->port->tty;
1979 1979
1980 if ((!tty) || (!tty->termios)) {
1981 dbg("%s - no tty structures", __FUNCTION__);
1982 return;
1983 }
1984
1985 dbg("%s", "Entering .......... \n"); 1980 dbg("%s", "Entering .......... \n");
1986 1981
1987 lData = LCR_BITS_8; 1982 lData = LCR_BITS_8;
@@ -2151,11 +2146,6 @@ static void mos7840_set_termios(struct usb_serial_port *port,
2151 2146
2152 tty = port->tty; 2147 tty = port->tty;
2153 2148
2154 if (!port->tty || !port->tty->termios) {
2155 dbg("%s - no tty or termios", __FUNCTION__);
2156 return;
2157 }
2158
2159 if (!mos7840_port->open) { 2149 if (!mos7840_port->open) {
2160 dbg("%s - port not opened", __FUNCTION__); 2150 dbg("%s - port not opened", __FUNCTION__);
2161 return; 2151 return;
@@ -2165,19 +2155,10 @@ static void mos7840_set_termios(struct usb_serial_port *port,
2165 2155
2166 cflag = tty->termios->c_cflag; 2156 cflag = tty->termios->c_cflag;
2167 2157
2168 if (!cflag) {
2169 dbg("%s %s\n", __FUNCTION__, "cflag is NULL");
2170 return;
2171 }
2172
2173 dbg("%s - clfag %08x iflag %08x", __FUNCTION__, 2158 dbg("%s - clfag %08x iflag %08x", __FUNCTION__,
2174 tty->termios->c_cflag, RELEVANT_IFLAG(tty->termios->c_iflag)); 2159 tty->termios->c_cflag, RELEVANT_IFLAG(tty->termios->c_iflag));
2175 2160 dbg("%s - old clfag %08x old iflag %08x", __FUNCTION__,
2176 if (old_termios) { 2161 old_termios->c_cflag, RELEVANT_IFLAG(old_termios->c_iflag));
2177 dbg("%s - old clfag %08x old iflag %08x", __FUNCTION__,
2178 old_termios->c_cflag, RELEVANT_IFLAG(old_termios->c_iflag));
2179 }
2180
2181 dbg("%s - port %d", __FUNCTION__, port->number); 2162 dbg("%s - port %d", __FUNCTION__, port->number);
2182 2163
2183 /* change the port settings to the new ones specified */ 2164 /* change the port settings to the new ones specified */