summaryrefslogtreecommitdiffstats
path: root/sys/dev/usb/umct.c
diff options
context:
space:
mode:
authormpi <mpi@openbsd.org>2014-07-12 20:26:33 +0000
committermpi <mpi@openbsd.org>2014-07-12 20:26:33 +0000
commitcf8c8cdaee4b9d25cd4799550a59beef27907aa3 (patch)
treeb937ed2912868e73e68192e13cfc066cb0c6705b /sys/dev/usb/umct.c
parentreboot(9): Shutdown system by signaling init(8) from kernel where appropriate (diff)
downloadwireguard-openbsd-cf8c8cdaee4b9d25cd4799550a59beef27907aa3.tar.xz
wireguard-openbsd-cf8c8cdaee4b9d25cd4799550a59beef27907aa3.zip
tedu another bunch of DVACT_DEACTIVATE handlers that do nothing but set
the 'dying' flag.
Diffstat (limited to 'sys/dev/usb/umct.c')
-rw-r--r--sys/dev/usb/umct.c40
1 files changed, 11 insertions, 29 deletions
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)
{