diff options
author | Jiri Slaby <jirislaby@gmail.com> | 2007-02-10 04:44:55 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-11 13:51:26 -0500 |
commit | b963a8441cb95999c97bea379607071a869c65f0 (patch) | |
tree | 111fa0624be52ba830902fac3777febf340cf5e8 /drivers/isdn/gigaset | |
parent | 1ed0c0b7306d7c93e83ebe30087a12684b280cdc (diff) |
[PATCH] Char: tty_wakeup cleanup
tty_wakeup cleanup
- remove wake_up_interruptible(&tty->write_wait) surrounding
tty_wakup(tty);
- substitute tty->ldisc.write_wakeup(tty) + wake_up() by tty_wakeup(tty);
Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Acked-by: Tilman Schmidt <tilman@imap.cc>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/isdn/gigaset')
-rw-r--r-- | drivers/isdn/gigaset/interface.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/drivers/isdn/gigaset/interface.c b/drivers/isdn/gigaset/interface.c index 458b6462f937..f13de20947e0 100644 --- a/drivers/isdn/gigaset/interface.c +++ b/drivers/isdn/gigaset/interface.c | |||
@@ -599,19 +599,9 @@ out: | |||
599 | static void if_wake(unsigned long data) | 599 | static void if_wake(unsigned long data) |
600 | { | 600 | { |
601 | struct cardstate *cs = (struct cardstate *) data; | 601 | struct cardstate *cs = (struct cardstate *) data; |
602 | struct tty_struct *tty; | ||
603 | |||
604 | tty = cs->tty; | ||
605 | if (!tty) | ||
606 | return; | ||
607 | |||
608 | if ((tty->flags & (1 << TTY_DO_WRITE_WAKEUP)) && | ||
609 | tty->ldisc.write_wakeup) { | ||
610 | gig_dbg(DEBUG_IF, "write wakeup call"); | ||
611 | tty->ldisc.write_wakeup(tty); | ||
612 | } | ||
613 | 602 | ||
614 | wake_up_interruptible(&tty->write_wait); | 603 | if (cs->tty) |
604 | tty_wakeup(cs->tty); | ||
615 | } | 605 | } |
616 | 606 | ||
617 | /*** interface to common ***/ | 607 | /*** interface to common ***/ |