Sort-out activate functionality for ucom(4) and it's parents.

The child should not have to call the parent for deactivation.
The parent should handle it.
So kill the activate routine in ucom(4) and adapt the parents
to no longer call it.


Also remove sc_dying in ucom(4) and use usbd_is_dying() instead.

Okay mpi@.

1 files changed, 2 insertions, 5 deletions

diff --git a/sys/dev/usb/uchcom.c b/sys/dev/usb/uchcom.c
index 3ef17be23ba..1f2ac628219 100644
--- a/sys/dev/usb/uchcom.c
+++ b/sys/dev/usb/uchcom.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uchcom.c,v 1.17 2013/11/07 10:33:27 pirofti Exp $	*/
+/*	$OpenBSD: uchcom.c,v 1.18 2013/11/15 08:25:31 pirofti Exp $	*/
 /*	$NetBSD: uchcom.c,v 1.1 2007/09/03 17:57:37 tshiozak Exp $	*/
 
 /*
@@ -331,17 +331,14 @@ int
 uchcom_activate(struct device *self, int act)
 {
 	struct uchcom_softc *sc = (struct uchcom_softc *)self;
-	int rv = 0;
 
 	switch (act) {
 	case DVACT_DEACTIVATE:
 		uchcom_close_intr_pipe(sc);
 		usbd_deactivate(sc->sc_udev);
-		if (sc->sc_subdev != NULL)
-			rv = config_deactivate(sc->sc_subdev);
 		break;
 	}
-	return rv;
+	return 0;
 }
 
 int