tedu another bunch of DVACT_DEACTIVATE handlers that do nothing but set

the 'dying' flag.

13 files changed, 114 insertions, 347 deletions

diff --git a/sys/dev/usb/uark.c b/sys/dev/usb/uark.c
index 2999298c1e7..70e9067901a 100644
--- a/sys/dev/usb/uark.c
+++ b/sys/dev/usb/uark.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uark.c,v 1.19 2013/11/15 08:25:31 pirofti Exp $	*/
+/*	$OpenBSD: uark.c,v 1.20 2014/07/12 20:26:33 mpi Exp $	*/
 
 /*
  * Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
@@ -90,21 +90,16 @@ static const struct usb_devno uark_devs[] = {
 	{ USB_VENDOR_ARKMICRO,		USB_PRODUCT_ARKMICRO_ARK3116 }
 };
 
-int uark_match(struct device *, void *, void *); 
-void uark_attach(struct device *, struct device *, void *); 
-int uark_detach(struct device *, int); 
-int uark_activate(struct device *, int); 
-
-struct cfdriver uark_cd = { 
-	NULL, "uark", DV_DULL 
-}; 
-
-const struct cfattach uark_ca = { 
-	sizeof(struct uark_softc), 
-	uark_match, 
-	uark_attach, 
-	uark_detach, 
-	uark_activate, 
+int uark_match(struct device *, void *, void *);
+void uark_attach(struct device *, struct device *, void *);
+int uark_detach(struct device *, int);
+
+struct cfdriver uark_cd = {
+	NULL, "uark", DV_DULL
+};
+
+const struct cfattach uark_ca = {
+	sizeof(struct uark_softc), uark_match, uark_attach, uark_detach
 };
 
 int
@@ -203,19 +198,6 @@ uark_detach(struct device *self, int flags)
 	return (rv);
 }
 
-int
-uark_activate(struct device *self, int act)
-{
-	struct uark_softc *sc = (struct uark_softc *)self;
-
-	switch (act) {
-	case DVACT_DEACTIVATE:
-		usbd_deactivate(sc->sc_udev);
-		break;
-	}
-	return (0);
-}
-
 void
 uark_set(void *vsc, int portno, int reg, int onoff)
 {
diff --git a/sys/dev/usb/uberry.c b/sys/dev/usb/uberry.c
index 8089f05e697..9de45c87003 100644
--- a/sys/dev/usb/uberry.c
+++ b/sys/dev/usb/uberry.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uberry.c,v 1.21 2013/04/15 09:23:02 mglocker Exp $	*/
+/*	$OpenBSD: uberry.c,v 1.22 2014/07/12 20:26:33 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2006 Theo de Raadt <deraadt@openbsd.org>
@@ -54,24 +54,19 @@ struct usb_devno const uberry_devices[] = {
 	{ USB_VENDOR_RIM, USB_PRODUCT_RIM_PEARL }
 };
 
-int uberry_match(struct device *, void *, void *); 
-void uberry_attach(struct device *, struct device *, void *); 
-int uberry_detach(struct device *, int); 
-int uberry_activate(struct device *, int); 
+int uberry_match(struct device *, void *, void *);
+void uberry_attach(struct device *, struct device *, void *);
+int uberry_detach(struct device *, int);
 
 void uberry_pearlmode(struct uberry_softc *);
 void uberry_charge(struct uberry_softc *);
 
-struct cfdriver uberry_cd = { 
-	NULL, "uberry", DV_DULL 
-}; 
+struct cfdriver uberry_cd = {
+	NULL, "uberry", DV_DULL
+};
 
-const struct cfattach uberry_ca = { 
-	sizeof(struct uberry_softc), 
-	uberry_match, 
-	uberry_attach, 
-	uberry_detach, 
-	uberry_activate, 
+const struct cfattach uberry_ca = {
+	sizeof(struct uberry_softc), uberry_match, uberry_attach, uberry_detach
 };
 
 int
@@ -150,19 +145,6 @@ uberry_detach(struct device *self, int flags)
 	return 0;
 }
 
-int
-uberry_activate(struct device *self, int act)
-{
-	struct uberry_softc *sc = (struct uberry_softc *)self;
-
-	switch (act) {
-	case DVACT_DEACTIVATE:
-		usbd_deactivate(sc->sc_udev);
-		break;
-	}
-	return 0;
-}
-
 void
 uberry_pearlmode(struct uberry_softc *sc)
 {
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;
diff --git a/sys/dev/usb/uchcom.c b/sys/dev/usb/uchcom.c
index c2c136fd380..3d45d4327f7 100644
--- a/sys/dev/usb/uchcom.c
+++ b/sys/dev/usb/uchcom.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uchcom.c,v 1.21 2014/07/12 18:48:52 tedu Exp $	*/
+/*	$OpenBSD: uchcom.c,v 1.22 2014/07/12 20:26:33 mpi Exp $	*/
 /*	$NetBSD: uchcom.c,v 1.1 2007/09/03 17:57:37 tshiozak Exp $	*/
 
 /*
@@ -200,10 +200,9 @@ int		uchcom_setup_comm(struct uchcom_softc *);
 int		uchcom_setup_intr_pipe(struct uchcom_softc *);
 
 
-int		uchcom_match(struct device *, void *, void *); 
-void		uchcom_attach(struct device *, struct device *, void *); 
-int		uchcom_detach(struct device *, int); 
-int		uchcom_activate(struct device *, int);
+int		uchcom_match(struct device *, void *, void *);
+void		uchcom_attach(struct device *, struct device *, void *);
+int		uchcom_detach(struct device *, int);
 
 struct	ucom_methods uchcom_methods = {
 	uchcom_get_status,
@@ -222,16 +221,12 @@ static const struct usb_devno uchcom_devs[] = {
 	{ USB_VENDOR_WCH2, USB_PRODUCT_WCH2_CH341A }
 };
 
-struct cfdriver uchcom_cd = { 
-	NULL, "uchcom", DV_DULL 
-}; 
+struct cfdriver uchcom_cd = {
+	NULL, "uchcom", DV_DULL
+};
 
-const struct cfattach uchcom_ca = { 
-	sizeof(struct uchcom_softc), 
-	uchcom_match, 
-	uchcom_attach, 
-	uchcom_detach, 
-	uchcom_activate, 
+const struct cfattach uchcom_ca = {
+	sizeof(struct uchcom_softc), uchcom_match, uchcom_attach, uchcom_detach
 };
 
 /* ----------------------------------------------------------------------
@@ -327,20 +322,6 @@ uchcom_detach(struct device *self, int flags)
 }
 
 int
-uchcom_activate(struct device *self, int act)
-{
-	struct uchcom_softc *sc = (struct uchcom_softc *)self;
-
-	switch (act) {
-	case DVACT_DEACTIVATE:
-		uchcom_close_intr_pipe(sc);
-		usbd_deactivate(sc->sc_udev);
-		break;
-	}
-	return 0;
-}
-
-int
 uchcom_set_config(struct uchcom_softc *sc)
 {
 	usbd_status err;
diff --git a/sys/dev/usb/ucycom.c b/sys/dev/usb/ucycom.c
index a1d7b07be7d..587d5872e7f 100644
--- a/sys/dev/usb/ucycom.c
+++ b/sys/dev/usb/ucycom.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ucycom.c,v 1.28 2014/07/12 18:48:52 tedu Exp $	*/
+/*	$OpenBSD: ucycom.c,v 1.29 2014/07/12 20:26:33 mpi Exp $	*/
 /*	$NetBSD: ucycom.c,v 1.3 2005/08/05 07:27:47 skrll Exp $	*/
 
 /*
@@ -152,21 +152,16 @@ const struct usb_devno ucycom_devs[] = {
 	{ USB_VENDOR_DELORME, USB_PRODUCT_DELORME_EMLT20 },
 };
 
-int ucycom_match(struct device *, void *, void *); 
-void ucycom_attach(struct device *, struct device *, void *); 
-int ucycom_detach(struct device *, int); 
-int ucycom_activate(struct device *, int); 
-
-struct cfdriver ucycom_cd = { 
-	NULL, "ucycom", DV_DULL 
-}; 
-
-const struct cfattach ucycom_ca = { 
-	sizeof(struct ucycom_softc), 
-	ucycom_match, 
-	ucycom_attach, 
-	ucycom_detach, 
-	ucycom_activate, 
+int ucycom_match(struct device *, void *, void *);
+void ucycom_attach(struct device *, struct device *, void *);
+int ucycom_detach(struct device *, int);
+
+struct cfdriver ucycom_cd = {
+	NULL, "ucycom", DV_DULL
+};
+
+const struct cfattach ucycom_ca = {
+	sizeof(struct ucycom_softc), ucycom_match, ucycom_attach, ucycom_detach
 };
 
 int
@@ -588,18 +583,3 @@ ucycom_detach(struct device *self, int flags)
 
 	return (0);
 }
-
-int
-ucycom_activate(struct device *self, int act)
-{
-	struct ucycom_softc *sc = (struct ucycom_softc *)self;
-
-	DPRINTFN(5,("ucycom_activate: %d\n", act));
-
-	switch (act) {
-	case DVACT_DEACTIVATE:
-		usbd_deactivate(sc->sc_udev);
-		break;
-	}
-	return (0);
-}
diff --git a/sys/dev/usb/udcf.c b/sys/dev/usb/udcf.c
index 184c42ec403..8d4a42aaeed 100644
--- a/sys/dev/usb/udcf.c
+++ b/sys/dev/usb/udcf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: udcf.c,v 1.57 2013/04/15 09:23:02 mglocker Exp $ */
+/*	$OpenBSD: udcf.c,v 1.58 2014/07/12 20:26:33 mpi Exp $ */
 
 /*
  * Copyright (c) 2006, 2007, 2008 Marc Balmer <mbalmer@openbsd.org>
@@ -133,10 +133,9 @@ void	udcf_mg_probe(void *);
 void	udcf_sl_probe(void *);
 void	udcf_ct_probe(void *);
 
-int udcf_match(struct device *, void *, void *); 
-void udcf_attach(struct device *, struct device *, void *); 
-int udcf_detach(struct device *, int); 
-int udcf_activate(struct device *, int); 
+int udcf_match(struct device *, void *, void *);
+void udcf_attach(struct device *, struct device *, void *);
+int udcf_detach(struct device *, int);
 
 int udcf_nc_signal(struct udcf_softc *);
 int udcf_nc_init_hw(struct udcf_softc *);
@@ -148,11 +147,7 @@ struct cfdriver udcf_cd = {
 };
 
 const struct cfattach udcf_ca = {
-	sizeof(struct udcf_softc),
-	udcf_match,
-	udcf_attach,
-	udcf_detach,
-	udcf_activate
+	sizeof(struct udcf_softc), udcf_match, udcf_attach, udcf_detach,
 };
 
 static const struct usb_devno udcf_devs[] = {
@@ -794,15 +789,3 @@ udcf_ct_probe(void *xsc)
 		clockname[CLOCK_HBG] : clockname[CLOCK_DCF77]));
 }
 
-int
-udcf_activate(struct device *self, int act)
-{
-	struct udcf_softc *sc = (struct udcf_softc *)self;
-
-	switch (act) {
-	case DVACT_DEACTIVATE:
-		usbd_deactivate(sc->sc_udev);
-		break;
-	}
-	return 0;
-}
diff --git a/sys/dev/usb/uftdi.c b/sys/dev/usb/uftdi.c
index a491202d4b0..dd77648f96b 100644
--- a/sys/dev/usb/uftdi.c
+++ b/sys/dev/usb/uftdi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uftdi.c,v 1.71 2014/02/04 12:03:12 mpi Exp $ 	*/
+/*	$OpenBSD: uftdi.c,v 1.72 2014/07/12 20:26:33 mpi Exp $ 	*/
 /*	$NetBSD: uftdi.c,v 1.14 2003/02/23 04:20:07 simonb Exp $	*/
 
 /*
@@ -116,21 +116,16 @@ struct ucom_methods uftdi_methods = {
 	uftdi_write,
 };
 
-int uftdi_match(struct device *, void *, void *); 
-void uftdi_attach(struct device *, struct device *, void *); 
-int uftdi_detach(struct device *, int); 
-int uftdi_activate(struct device *, int); 
-
-struct cfdriver uftdi_cd = { 
-	NULL, "uftdi", DV_DULL 
-}; 
-
-const struct cfattach uftdi_ca = { 
-	sizeof(struct uftdi_softc), 
-	uftdi_match, 
-	uftdi_attach, 
-	uftdi_detach, 
-	uftdi_activate, 
+int uftdi_match(struct device *, void *, void *);
+void uftdi_attach(struct device *, struct device *, void *);
+int uftdi_detach(struct device *, int);
+
+struct cfdriver uftdi_cd = {
+	NULL, "uftdi", DV_DULL
+};
+
+const struct cfattach uftdi_ca = {
+	sizeof(struct uftdi_softc), uftdi_match, uftdi_attach, uftdi_detach
 };
 
 static const struct usb_devno uftdi_devs[] = {
@@ -896,19 +891,6 @@ bad:
 }
 
 int
-uftdi_activate(struct device *self, int act)
-{
-	struct uftdi_softc *sc = (struct uftdi_softc *)self;
-
-	switch (act) {
-	case DVACT_DEACTIVATE:
-		usbd_deactivate(sc->sc_udev);
-		break;
-	}
-	return (0);
-}
-
-int
 uftdi_detach(struct device *self, int flags)
 {
 	struct uftdi_softc *sc = (struct uftdi_softc *)self;
diff --git a/sys/dev/usb/ugen.c b/sys/dev/usb/ugen.c
index fdea5456cf2..c09747e18df 100644
--- a/sys/dev/usb/ugen.c
+++ b/sys/dev/usb/ugen.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ugen.c,v 1.78 2014/07/12 18:48:52 tedu Exp $ */
+/*	$OpenBSD: ugen.c,v 1.79 2014/07/12 20:26:33 mpi Exp $ */
 /*	$NetBSD: ugen.c,v 1.63 2002/11/26 18:49:48 christos Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/ugen.c,v 1.26 1999/11/17 22:33:41 n_hibma Exp $	*/
 
@@ -121,15 +121,13 @@ int ugen_get_alt_index(struct ugen_softc *sc, int ifaceidx);
 int ugen_match(struct device *, void *, void *);
 void ugen_attach(struct device *, struct device *, void *);
 int ugen_detach(struct device *, int);
-int ugen_activate(struct device *, int);
 
 struct cfdriver ugen_cd = {
 	NULL, "ugen", DV_DULL
 };
 
 const struct cfattach ugen_ca = {
-	sizeof(struct ugen_softc), ugen_match, ugen_attach, ugen_detach,
-	ugen_activate,
+	sizeof(struct ugen_softc), ugen_match, ugen_attach, ugen_detach
 };
 
 int
@@ -738,19 +736,6 @@ ugenwrite(dev_t dev, struct uio *uio, int flag)
 }
 
 int
-ugen_activate(struct device *self, int act)
-{
-	struct ugen_softc *sc = (struct ugen_softc *)self;
-
-	switch (act) {
-	case DVACT_DEACTIVATE:
-		usbd_deactivate(sc->sc_udev);
-		break;
-	}
-	return (0);
-}
-
-int
 ugen_detach(struct device *self, int flags)
 {
 	struct ugen_softc *sc = (struct ugen_softc *)self;
diff --git a/sys/dev/usb/uipaq.c b/sys/dev/usb/uipaq.c
index e2a2ed8fdd0..3f27e857095 100644
--- a/sys/dev/usb/uipaq.c
+++ b/sys/dev/usb/uipaq.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uipaq.c,v 1.23 2013/11/15 08:25:31 pirofti Exp $	*/
+/*	$OpenBSD: uipaq.c,v 1.24 2014/07/12 20:26:33 mpi Exp $	*/
 
 /*
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -123,21 +123,16 @@ static const struct uipaq_type uipaq_devs[] = {
 
 #define uipaq_lookup(v, p) ((struct uipaq_type *)usb_lookup(uipaq_devs, v, p))
 
-int uipaq_match(struct device *, void *, void *); 
-void uipaq_attach(struct device *, struct device *, void *); 
-int uipaq_detach(struct device *, int); 
-int uipaq_activate(struct device *, int); 
-
-struct cfdriver uipaq_cd = { 
-	NULL, "uipaq", DV_DULL 
-}; 
-
-const struct cfattach uipaq_ca = { 
-	sizeof(struct uipaq_softc), 
-	uipaq_match, 
-	uipaq_attach, 
-	uipaq_detach, 
-	uipaq_activate, 
+int uipaq_match(struct device *, void *, void *);
+void uipaq_attach(struct device *, struct device *, void *);
+int uipaq_detach(struct device *, int);
+
+struct cfdriver uipaq_cd = {
+	NULL, "uipaq", DV_DULL
+};
+
+const struct cfattach uipaq_ca = {
+	sizeof(struct uipaq_softc), uipaq_match, uipaq_attach, uipaq_detach
 };
 
 int
@@ -353,19 +348,6 @@ uipaq_set(void *addr, int portno, int reg, int onoff)
 
 
 int
-uipaq_activate(struct device *self, int act)
-{
-	struct uipaq_softc *sc = (struct uipaq_softc *)self;
-
-	switch (act) {
-	case DVACT_DEACTIVATE:
-		usbd_deactivate(sc->sc_udev);
-		break;
-	}
-	return (0);
-}
-
-int
 uipaq_detach(struct device *self, int flags)
 {
 	struct uipaq_softc *sc = (struct uipaq_softc *)self;
diff --git a/sys/dev/usb/ulpt.c b/sys/dev/usb/ulpt.c
index 81ae3d146a7..436c0f9d77f 100644
--- a/sys/dev/usb/ulpt.c
+++ b/sys/dev/usb/ulpt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ulpt.c,v 1.46 2014/07/12 18:48:52 tedu Exp $ */
+/*	$OpenBSD: ulpt.c,v 1.47 2014/07/12 20:26:33 mpi Exp $ */
 /*	$NetBSD: ulpt.c,v 1.57 2003/01/05 10:19:42 scw Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/ulpt.c,v 1.24 1999/11/17 22:33:44 n_hibma Exp $	*/
 
@@ -154,21 +154,16 @@ void ieee1284_print_id(char *);
 #define	ULPTFLAGS(s)	(minor(s) & 0xe0)
 
 
-int ulpt_match(struct device *, void *, void *); 
-void ulpt_attach(struct device *, struct device *, void *); 
-int ulpt_detach(struct device *, int); 
-int ulpt_activate(struct device *, int); 
+int ulpt_match(struct device *, void *, void *);
+void ulpt_attach(struct device *, struct device *, void *);
+int ulpt_detach(struct device *, int);
 
-struct cfdriver ulpt_cd = { 
-	NULL, "ulpt", DV_DULL 
-}; 
+struct cfdriver ulpt_cd = {
+	NULL, "ulpt", DV_DULL
+};
 
-const struct cfattach ulpt_ca = { 
-	sizeof(struct ulpt_softc), 
-	ulpt_match, 
-	ulpt_attach, 
-	ulpt_detach, 
-	ulpt_activate, 
+const struct cfattach ulpt_ca = {
+	sizeof(struct ulpt_softc), ulpt_match, ulpt_attach, ulpt_detach
 };
 
 int
@@ -358,19 +353,6 @@ ulpt_attach(struct device *parent, struct device *self, void *aux)
 }
 
 int
-ulpt_activate(struct device *self, int act)
-{
-	struct ulpt_softc *sc = (struct ulpt_softc *)self;
-
-	switch (act) {
-	case DVACT_DEACTIVATE:
-		usbd_deactivate(sc->sc_udev);
-		break;
-	}
-	return (0);
-}
-
-int
 ulpt_detach(struct device *self, int flags)
 {
 	struct ulpt_softc *sc = (struct ulpt_softc *)self;
diff --git a/sys/dev/usb/umbg.c b/sys/dev/usb/umbg.c
index 3d84cf65bb6..53e9ffdb149 100644
--- a/sys/dev/usb/umbg.c
+++ b/sys/dev/usb/umbg.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: umbg.c,v 1.22 2013/11/15 10:17:39 pirofti Exp $ */
+/*	$OpenBSD: umbg.c,v 1.23 2014/07/12 20:26:33 mpi Exp $ */
 
 /*
  * Copyright (c) 2007 Marc Balmer <mbalmer@openbsd.org>
@@ -132,10 +132,9 @@ static int t_wait, t_trust;
 void umbg_intr(void *);
 void umbg_it_intr(void *);
 
-int umbg_match(struct device *, void *, void *); 
-void umbg_attach(struct device *, struct device *, void *); 
-int umbg_detach(struct device *, int); 
-int umbg_activate(struct device *, int); 
+int umbg_match(struct device *, void *, void *);
+void umbg_attach(struct device *, struct device *, void *);
+int umbg_detach(struct device *, int);
 
 void umbg_task(void *);
 
@@ -147,11 +146,7 @@ struct cfdriver umbg_cd = {
 };
 
 const struct cfattach umbg_ca = {
-	sizeof(struct umbg_softc),
-	umbg_match,
-	umbg_attach,
-	umbg_detach,
-	umbg_activate
+	sizeof(struct umbg_softc), umbg_match, umbg_attach, umbg_detach
 };
 
 int
@@ -438,16 +433,3 @@ umbg_it_intr(void *xsc)
 	} else
 		sc->sc_timedelta.status = SENSOR_S_CRIT;
 }
-
-int
-umbg_activate(struct device *self, int act)
-{
-	struct umbg_softc *sc = (struct umbg_softc *)self;
-
-	switch (act) {
-	case DVACT_DEACTIVATE:
-		usbd_deactivate(sc->sc_udev);
-		break;
-	}
-	return 0;
-}
diff --git a/sys/dev/usb/umct.c b/sys/dev/usb/umct.c
index dac07953d91..229a2958e8b 100644
--- a/sys/dev/usb/umct.c
+++ b/sys/dev/usb/umct.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: umct.c,v 1.40 2014/07/12 18:48:52 tedu Exp $	*/
+/*	$OpenBSD: umct.c,v 1.41 2014/07/12 20:26:33 mpi Exp $	*/
 /*	$NetBSD: umct.c,v 1.10 2003/02/23 04:20:07 simonb Exp $	*/
 /*
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -144,21 +144,16 @@ static const struct usb_devno umct_devs[] = {
 	{ USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5U409 },
 };
 
-int umct_match(struct device *, void *, void *); 
-void umct_attach(struct device *, struct device *, void *); 
-int umct_detach(struct device *, int); 
-int umct_activate(struct device *, int); 
-
-struct cfdriver umct_cd = { 
-	NULL, "umct", DV_DULL 
-}; 
-
-const struct cfattach umct_ca = { 
-	sizeof(struct umct_softc), 
-	umct_match, 
-	umct_attach, 
-	umct_detach, 
-	umct_activate, 
+int umct_match(struct device *, void *, void *);
+void umct_attach(struct device *, struct device *, void *);
+int umct_detach(struct device *, int);
+
+struct cfdriver umct_cd = {
+	NULL, "umct", DV_DULL
+};
+
+const struct cfattach umct_ca = {
+	sizeof(struct umct_softc), umct_match, umct_attach, umct_detach
 };
 
 int
@@ -327,19 +322,6 @@ umct_detach(struct device *self, int flags)
 	return (rv);
 }
 
-int
-umct_activate(struct device *self, int act)
-{
-	struct umct_softc *sc = (struct umct_softc *)self;
-
-	switch (act) {
-	case DVACT_DEACTIVATE:
-		usbd_deactivate(sc->sc_udev);
-		break;
-	}
-	return (0);
-}
-
 void
 umct_set_line_state(struct umct_softc *sc)
 {
diff --git a/sys/dev/usb/umodem.c b/sys/dev/usb/umodem.c
index 2a5c95ebce6..41f18f33d3c 100644
--- a/sys/dev/usb/umodem.c
+++ b/sys/dev/usb/umodem.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: umodem.c,v 1.56 2014/05/01 03:45:08 sasano Exp $ */
+/*	$OpenBSD: umodem.c,v 1.57 2014/07/12 20:26:33 mpi Exp $ */
 /*	$NetBSD: umodem.c,v 1.45 2002/09/23 05:51:23 simonb Exp $	*/
 
 /*
@@ -138,23 +138,18 @@ struct ucom_methods umodem_methods = {
 	NULL,
 };
 
-int umodem_match(struct device *, void *, void *); 
-void umodem_attach(struct device *, struct device *, void *); 
-int umodem_detach(struct device *, int); 
-int umodem_activate(struct device *, int); 
+int umodem_match(struct device *, void *, void *);
+void umodem_attach(struct device *, struct device *, void *);
+int umodem_detach(struct device *, int);
 
 void umodem_get_caps(struct usb_attach_arg *, int, int *, int *, int *);
 
-struct cfdriver umodem_cd = { 
-	NULL, "umodem", DV_DULL 
-}; 
+struct cfdriver umodem_cd = {
+	NULL, "umodem", DV_DULL
+};
 
-const struct cfattach umodem_ca = { 
-	sizeof(struct umodem_softc), 
-	umodem_match, 
-	umodem_attach, 
-	umodem_detach, 
-	umodem_activate, 
+const struct cfattach umodem_ca = {
+	sizeof(struct umodem_softc), umodem_match, umodem_attach, umodem_detach
 };
 
 void
@@ -741,19 +736,6 @@ umodem_set_comm_feature(struct umodem_softc *sc, int feature, int state)
 }
 
 int
-umodem_activate(struct device *self, int act)
-{
-	struct umodem_softc *sc = (struct umodem_softc *)self;
-
-	switch (act) {
-	case DVACT_DEACTIVATE:
-		usbd_deactivate(sc->sc_udev);
-		break;
-	}
-	return (0);
-}
-
-int
 umodem_detach(struct device *self, int flags)
 {
 	struct umodem_softc *sc = (struct umodem_softc *)self;