aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/epca.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/char/epca.c')
-rw-r--r--drivers/char/epca.c13
1 files changed, 2 insertions, 11 deletions
diff --git a/drivers/char/epca.c b/drivers/char/epca.c
index 37d4dca5a5d4..39c6a36e395b 100644
--- a/drivers/char/epca.c
+++ b/drivers/char/epca.c
@@ -157,7 +157,6 @@ static void epca_error(int, char *);
157static void pc_close(struct tty_struct *, struct file *); 157static void pc_close(struct tty_struct *, struct file *);
158static void shutdown(struct channel *); 158static void shutdown(struct channel *);
159static void pc_hangup(struct tty_struct *); 159static void pc_hangup(struct tty_struct *);
160static void pc_put_char(struct tty_struct *, unsigned char);
161static int pc_write_room(struct tty_struct *); 160static int pc_write_room(struct tty_struct *);
162static int pc_chars_in_buffer(struct tty_struct *); 161static int pc_chars_in_buffer(struct tty_struct *);
163static void pc_flush_buffer(struct tty_struct *); 162static void pc_flush_buffer(struct tty_struct *);
@@ -459,8 +458,7 @@ static void pc_close(struct tty_struct *tty, struct file *filp)
459 setup_empty_event(tty, ch); 458 setup_empty_event(tty, ch);
460 tty_wait_until_sent(tty, 3000); /* 30 seconds timeout */ 459 tty_wait_until_sent(tty, 3000); /* 30 seconds timeout */
461 } 460 }
462 if (tty->driver->flush_buffer) 461 pc_flush_buffer(tty);
463 tty->driver->flush_buffer(tty);
464 462
465 tty_ldisc_flush(tty); 463 tty_ldisc_flush(tty);
466 shutdown(ch); 464 shutdown(ch);
@@ -532,8 +530,7 @@ static void pc_hangup(struct tty_struct *tty)
532 if ((ch = verifyChannel(tty)) != NULL) { 530 if ((ch = verifyChannel(tty)) != NULL) {
533 unsigned long flags; 531 unsigned long flags;
534 532
535 if (tty->driver->flush_buffer) 533 pc_flush_buffer(tty);
536 tty->driver->flush_buffer(tty);
537 tty_ldisc_flush(tty); 534 tty_ldisc_flush(tty);
538 shutdown(ch); 535 shutdown(ch);
539 536
@@ -645,11 +642,6 @@ static int pc_write(struct tty_struct *tty,
645 return amountCopied; 642 return amountCopied;
646} 643}
647 644
648static void pc_put_char(struct tty_struct *tty, unsigned char c)
649{
650 pc_write(tty, &c, 1);
651}
652
653static int pc_write_room(struct tty_struct *tty) 645static int pc_write_room(struct tty_struct *tty)
654{ 646{
655 int remain; 647 int remain;
@@ -1035,7 +1027,6 @@ static const struct tty_operations pc_ops = {
1035 .flush_buffer = pc_flush_buffer, 1027 .flush_buffer = pc_flush_buffer,
1036 .chars_in_buffer = pc_chars_in_buffer, 1028 .chars_in_buffer = pc_chars_in_buffer,
1037 .flush_chars = pc_flush_chars, 1029 .flush_chars = pc_flush_chars,
1038 .put_char = pc_put_char,
1039 .ioctl = pc_ioctl, 1030 .ioctl = pc_ioctl,
1040 .set_termios = pc_set_termios, 1031 .set_termios = pc_set_termios,
1041 .stop = pc_stop, 1032 .stop = pc_stop,