Merge tty_attach() in ttymalloc() and tty_detach() in ttyfree(). The need for

separate tty registering is gone now that sparc has switched to wscons, and
this makes the code less error-prone.

Also, remove tests for ttymalloc() failure, since it uses M_WAITOK.

ok millert@ deraadt@, tested by various people as well besides me...

2 files changed, 2 insertions, 6 deletions

diff --git a/sys/arch/vax/qbus/dl.c b/sys/arch/vax/qbus/dl.c
index cf88407cadc..8e04c8c4e43 100644
--- a/sys/arch/vax/qbus/dl.c
+++ b/sys/arch/vax/qbus/dl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dl.c,v 1.4 2003/06/02 23:27:58 millert Exp $	*/
+/*	$OpenBSD: dl.c,v 1.5 2003/10/03 16:44:50 miod Exp $	*/
 /*	$NetBSD: dl.c,v 1.11 2000/01/24 02:40:29 matt Exp $	*/
 
 /*-
@@ -214,7 +214,6 @@ dl_attach (parent, self, aux)
 	/* Initialize our softc structure. Should be done in open? */
 	
 	sc->sc_tty = ttymalloc();
-	tty_attach(sc->sc_tty);
 
 	/* Now register the TX & RX interrupt handlers */
 	uba_intr_establish(ua->ua_icookie, ua->ua_cvec    , dlxint, sc);
diff --git a/sys/arch/vax/qbus/qd.c b/sys/arch/vax/qbus/qd.c
index 8567dda9e1a..0b92dc4e6c9 100644
--- a/sys/arch/vax/qbus/qd.c
+++ b/sys/arch/vax/qbus/qd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: qd.c,v 1.7 2003/06/02 23:27:58 millert Exp $	*/
+/*	$OpenBSD: qd.c,v 1.8 2003/10/03 16:44:50 miod Exp $	*/
 /*	$NetBSD: qd.c,v 1.17 2000/01/24 02:40:29 matt Exp $	*/
 
 /*-
@@ -830,9 +830,6 @@ qdopen(dev, flag, mode, p)
 	       if (qd_tty[minor_dev] == NULL)
 		       qd_tty[minor_dev] = ttymalloc();
 	      
-	       if (qd_tty[minor_dev] == NULL)
-		       return ENXIO;
-	   
 	       /*
 		* this is the console 
 		*/