From: Hasso Tepper <hasso@dragonflybsd.org>
Date: Tue, 7 Aug 2007 13:14:11 +0000 (+0000)
Subject: There is no need to explicitly call ttwakeup() and ttwwakeup() after
X-Git-Tag: v2.0.1~2454
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/1372169417827c0d384d051b7a9136b513ea84b9

There is no need to explicitly call ttwakeup() and ttwwakeup() after
ttyclose() has been called.  It's already been done once by ttyclose.

Obtained-from: FreeBSD
---

diff --git a/sys/dev/misc/dcons/dcons_os.c b/sys/dev/misc/dcons/dcons_os.c
index c318946571..cf7114224c 100644
--- a/sys/dev/misc/dcons/dcons_os.c
+++ b/sys/dev/misc/dcons/dcons_os.c
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  * 
  * $FreeBSD: src/sys/dev/dcons/dcons_os.c,v 1.4 2004/10/24 12:41:04 simokawa Exp $
- * $DragonFly: src/sys/dev/misc/dcons/dcons_os.c,v 1.12 2007/08/07 11:30:03 hasso Exp $
+ * $DragonFly: src/sys/dev/misc/dcons/dcons_os.c,v 1.13 2007/08/07 13:14:11 hasso Exp $
  */
 
 #include <sys/param.h>
@@ -597,8 +597,6 @@ dcons_detach(int port)
 #if __FreeBSD_version < 502113
 		(*linesw[tp->t_line].l_close)(tp, 0);
 		ttyclose(tp);
-		ttwakeup(tp);
-		ttwwakeup(tp);
 #else
 		ttyld_close(tp, 0);
 		tty_close(tp);
diff --git a/sys/dev/serial/sio/sio_pccard.c b/sys/dev/serial/sio/sio_pccard.c
index 798c1066a9..1366e2af06 100644
--- a/sys/dev/serial/sio/sio_pccard.c
+++ b/sys/dev/serial/sio/sio_pccard.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $DragonFly: src/sys/dev/serial/sio/sio_pccard.c,v 1.8 2007/08/07 11:30:03 hasso Exp $
+ * $DragonFly: src/sys/dev/serial/sio/sio_pccard.c,v 1.9 2007/08/07 13:14:11 hasso Exp $
  */
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -137,8 +137,6 @@ sio_pccard_detach(device_t dev)
 	if (com->tp && (com->tp->t_state & TS_ISOPEN)) {
 		device_printf(dev, "still open, forcing close\n");
 		ttyclose(com->tp);
-		ttwakeup(com->tp);
-		ttwwakeup(com->tp);
 	} else {
 		if (com->ibuf != NULL)
 			kfree(com->ibuf, M_DEVBUF);
diff --git a/sys/dev/usbmisc/ucom/ucom.c b/sys/dev/usbmisc/ucom/ucom.c
index f5818762fe..cc91b19e40 100644
--- a/sys/dev/usbmisc/ucom/ucom.c
+++ b/sys/dev/usbmisc/ucom/ucom.c
@@ -2,7 +2,7 @@
  * $NetBSD: ucom.c,v 1.39 2001/08/16 22:31:24 augustss Exp $
  * $NetBSD: ucom.c,v 1.40 2001/11/13 06:24:54 lukem Exp $
  * $FreeBSD: src/sys/dev/usb/ucom.c,v 1.35 2003/11/16 11:58:21 akiyama Exp $
- * $DragonFly: src/sys/dev/usbmisc/ucom/ucom.c,v 1.30 2007/08/07 11:30:03 hasso Exp $
+ * $DragonFly: src/sys/dev/usbmisc/ucom/ucom.c,v 1.31 2007/08/07 13:14:11 hasso Exp $
  */
 /*-
  * Copyright (c) 2001-2002, Shunsuke Akiyama <akiyama@jp.FreeBSD.org>.
@@ -207,8 +207,6 @@ ucom_detach(struct ucom_softc *sc)
 				      "still open, forcing close\n");
 			(*linesw[tp->t_line].l_close)(tp, 0);
 			ttyclose(tp);
-			ttwakeup(tp);
-			ttwwakeup(tp);
 		}
 	} else {
 		DPRINTF(("ucom_detach: no tty\n"));