tedu another bunch of DVACT_DEACTIVATE handlers that do nothing but set

the 'dying' flag.

1 files changed, 11 insertions, 29 deletions

diff --git a/sys/dev/usb/ubsa.c b/sys/dev/usb/ubsa.c
index fbce92dc083..3b6e8a40ff4 100644
--- a/sys/dev/usb/ubsa.c
+++ b/sys/dev/usb/ubsa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ubsa.c,v 1.62 2014/07/12 18:48:52 tedu Exp $ 	*/
+/*	$OpenBSD: ubsa.c,v 1.63 2014/07/12 20:26:33 mpi Exp $ 	*/
 /*	$NetBSD: ubsa.c,v 1.5 2002/11/25 00:51:33 fvdl Exp $	*/
 /*-
  * Copyright (c) 2002, Alexander Kabaev <kan.FreeBSD.org>.
@@ -210,21 +210,16 @@ const struct usb_devno ubsa_devs[] = {
 	{ USB_VENDOR_ZTE, USB_PRODUCT_ZTE_AC8700 },
 };
 
-int ubsa_match(struct device *, void *, void *); 
-void ubsa_attach(struct device *, struct device *, void *); 
-int ubsa_detach(struct device *, int); 
-int ubsa_activate(struct device *, int); 
-
-struct cfdriver ubsa_cd = { 
-	NULL, "ubsa", DV_DULL 
-}; 
-
-const struct cfattach ubsa_ca = { 
-	sizeof(struct ubsa_softc), 
-	ubsa_match, 
-	ubsa_attach, 
-	ubsa_detach, 
-	ubsa_activate, 
+int ubsa_match(struct device *, void *, void *);
+void ubsa_attach(struct device *, struct device *, void *);
+int ubsa_detach(struct device *, int);
+
+struct cfdriver ubsa_cd = {
+	NULL, "ubsa", DV_DULL
+};
+
+const struct cfattach ubsa_ca = {
+	sizeof(struct ubsa_softc), ubsa_match, ubsa_attach, ubsa_detach
 };
 
 int
@@ -389,19 +384,6 @@ ubsa_detach(struct device *self, int flags)
 }
 
 int
-ubsa_activate(struct device *self, int act)
-{
-	struct ubsa_softc *sc = (struct ubsa_softc *)self;
-
-	switch (act) {
-	case DVACT_DEACTIVATE:
-		usbd_deactivate(sc->sc_udev);
-		break;
-	}
-	return (0);
-}
-
-int
 ubsa_request(struct ubsa_softc *sc, u_int8_t request, u_int16_t value)
 {
 	usb_device_request_t req;