diff options
| author | Jiri Slaby | 2006-12-08 11:38:24 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2006-12-08 17:28:54 +0100 |
| commit | 7e8bcf9add02176be7e052b1f0675f7a462eaf3d (patch) | |
| tree | dc19caf11a531ef02d2aec8f92cb94dabe565ce7 | |
| parent | [PATCH] char: remove unneded termbits redefinitions (mxser_new) (diff) | |
| download | kernel-qcow2-linux-7e8bcf9add02176be7e052b1f0675f7a462eaf3d.tar.gz kernel-qcow2-linux-7e8bcf9add02176be7e052b1f0675f7a462eaf3d.tar.xz kernel-qcow2-linux-7e8bcf9add02176be7e052b1f0675f7a462eaf3d.zip | |
[PATCH] Char: mxser_new, eliminate tty ldisc deref
Use tty_ldisc_flush and tty_wakeup helpers for accessing ldisc internals.
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | drivers/char/mxser_new.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/char/mxser_new.c b/drivers/char/mxser_new.c index 8a26ce125975..71381f955567 100644 --- a/drivers/char/mxser_new.c +++ b/drivers/char/mxser_new.c @@ -1065,7 +1065,6 @@ static void mxser_close(struct tty_struct *tty, struct file *filp) unsigned long timeout; unsigned long flags; - struct tty_ldisc *ld; if (tty->index == MXSER_PORTS) return; @@ -1145,12 +1144,7 @@ static void mxser_close(struct tty_struct *tty, struct file *filp) if (tty->driver->flush_buffer) tty->driver->flush_buffer(tty); - ld = tty_ldisc_ref(tty); - if (ld) { - if (ld->flush_buffer) - ld->flush_buffer(tty); - tty_ldisc_deref(ld); - } + tty_ldisc_flush(tty); tty->closing = 0; info->event = 0; @@ -1303,9 +1297,7 @@ static void mxser_flush_buffer(struct tty_struct *tty) spin_unlock_irqrestore(&info->slock, flags); /* above added by shinhay */ - wake_up_interruptible(&tty->write_wait); - if ((tty->flags & (1 << TTY_DO_WRITE_WAKEUP)) && tty->ldisc.write_wakeup) - (tty->ldisc.write_wakeup) (tty); + tty_wakeup(tty); } /* |