Commit f9b412a8c9adb17d50922f91962e8b1e48789430
Committed by
Greg Kroah-Hartman
Greg Kroah-Hartman
1 parent
a808ac0c4a
Exists in
master
and in
7 other branches
tty: moxa: Kill off the throttle method
The tty flag can be tested so the shadow flag isn't needed Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Showing 1 changed file with 1 additions and 20 deletions Side-by-side Diff
drivers/char/moxa.c
| ... | ... | @@ -154,7 +154,6 @@ |
| 154 | 154 | #define TXSTOPPED 1 |
| 155 | 155 | #define LOWWAIT 2 |
| 156 | 156 | #define EMPTYWAIT 3 |
| 157 | -#define THROTTLE 4 | |
| 158 | 157 | |
| 159 | 158 | #define SERIAL_DO_RESTART |
| 160 | 159 | |
| ... | ... | @@ -194,8 +193,6 @@ |
| 194 | 193 | static int moxa_write_room(struct tty_struct *); |
| 195 | 194 | static void moxa_flush_buffer(struct tty_struct *); |
| 196 | 195 | static int moxa_chars_in_buffer(struct tty_struct *); |
| 197 | -static void moxa_throttle(struct tty_struct *); | |
| 198 | -static void moxa_unthrottle(struct tty_struct *); | |
| 199 | 196 | static void moxa_set_termios(struct tty_struct *, struct ktermios *); |
| 200 | 197 | static void moxa_stop(struct tty_struct *); |
| 201 | 198 | static void moxa_start(struct tty_struct *); |
| ... | ... | @@ -415,8 +412,6 @@ |
| 415 | 412 | .flush_buffer = moxa_flush_buffer, |
| 416 | 413 | .chars_in_buffer = moxa_chars_in_buffer, |
| 417 | 414 | .ioctl = moxa_ioctl, |
| 418 | - .throttle = moxa_throttle, | |
| 419 | - .unthrottle = moxa_unthrottle, | |
| 420 | 415 | .set_termios = moxa_set_termios, |
| 421 | 416 | .stop = moxa_stop, |
| 422 | 417 | .start = moxa_start, |
| ... | ... | @@ -1327,20 +1322,6 @@ |
| 1327 | 1322 | return 0; |
| 1328 | 1323 | } |
| 1329 | 1324 | |
| 1330 | -static void moxa_throttle(struct tty_struct *tty) | |
| 1331 | -{ | |
| 1332 | - struct moxa_port *ch = tty->driver_data; | |
| 1333 | - | |
| 1334 | - set_bit(THROTTLE, &ch->statusflags); | |
| 1335 | -} | |
| 1336 | - | |
| 1337 | -static void moxa_unthrottle(struct tty_struct *tty) | |
| 1338 | -{ | |
| 1339 | - struct moxa_port *ch = tty->driver_data; | |
| 1340 | - | |
| 1341 | - clear_bit(THROTTLE, &ch->statusflags); | |
| 1342 | -} | |
| 1343 | - | |
| 1344 | 1325 | static void moxa_set_termios(struct tty_struct *tty, |
| 1345 | 1326 | struct ktermios *old_termios) |
| 1346 | 1327 | { |
| ... | ... | @@ -1418,7 +1399,7 @@ |
| 1418 | 1399 | tty_wakeup(tty); |
| 1419 | 1400 | } |
| 1420 | 1401 | |
| 1421 | - if (inited && !test_bit(THROTTLE, &p->statusflags) && | |
| 1402 | + if (inited && !test_bit(TTY_THROTTLED, &tty->flags) && | |
| 1422 | 1403 | MoxaPortRxQueue(p) > 0) { /* RX */ |
| 1423 | 1404 | MoxaPortReadData(p); |
| 1424 | 1405 | tty_schedule_flip(tty); |