summaryrefslogtreecommitdiff
path: root/sys/dev/usb/umbg.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev/usb/umbg.c')
-rw-r--r--sys/dev/usb/umbg.c28
1 files changed, 5 insertions, 23 deletions
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;
-}