diff options
author | Alan Cox <alan@redhat.com> | 2008-07-22 06:10:53 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-22 16:03:23 -0400 |
commit | 77336828c01933d37102c4bef6e2a2cf7e3243b3 (patch) | |
tree | cad1beadfa13dc96fa0c89750ae5b8cf9b5576de /drivers/usb | |
parent | 813a224fa5bff3e34309a6494e231d5ebfa0fb4e (diff) |
usb-cypress: There is no 0 case to go with CS5/6/7/8 so remove the test
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/usb')
-rw-r--r-- | drivers/usb/serial/cypress_m8.c | 37 |
1 files changed, 17 insertions, 20 deletions
diff --git a/drivers/usb/serial/cypress_m8.c b/drivers/usb/serial/cypress_m8.c index bb9c7c45e98f..22837a3f2f89 100644 --- a/drivers/usb/serial/cypress_m8.c +++ b/drivers/usb/serial/cypress_m8.c | |||
@@ -1093,27 +1093,24 @@ static void cypress_set_termios(struct tty_struct *tty, | |||
1093 | } else | 1093 | } else |
1094 | parity_enable = parity_type = 0; | 1094 | parity_enable = parity_type = 0; |
1095 | 1095 | ||
1096 | if (cflag & CSIZE) { | 1096 | switch (cflag & CSIZE) { |
1097 | switch (cflag & CSIZE) { | 1097 | case CS5: |
1098 | case CS5: | 1098 | data_bits = 0; |
1099 | data_bits = 0; | 1099 | break; |
1100 | break; | 1100 | case CS6: |
1101 | case CS6: | 1101 | data_bits = 1; |
1102 | data_bits = 1; | 1102 | break; |
1103 | break; | 1103 | case CS7: |
1104 | case CS7: | 1104 | data_bits = 2; |
1105 | data_bits = 2; | 1105 | break; |
1106 | break; | 1106 | case CS8: |
1107 | case CS8: | ||
1108 | data_bits = 3; | ||
1109 | break; | ||
1110 | default: | ||
1111 | err("%s - CSIZE was set, but not CS5-CS8", | ||
1112 | __func__); | ||
1113 | data_bits = 3; | ||
1114 | } else | ||
1115 | data_bits = 3; | 1107 | data_bits = 3; |
1116 | 1108 | break; | |
1109 | default: | ||
1110 | err("%s - CSIZE was set, but not CS5-CS8", | ||
1111 | __func__); | ||
1112 | data_bits = 3; | ||
1113 | } | ||
1117 | spin_lock_irqsave(&priv->lock, flags); | 1114 | spin_lock_irqsave(&priv->lock, flags); |
1118 | oldlines = priv->line_control; | 1115 | oldlines = priv->line_control; |
1119 | if ((cflag & CBAUD) == B0) { | 1116 | if ((cflag & CBAUD) == B0) { |