diff options
author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2014-07-12 21:24:34 +0000 |
---|---|---|
committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2014-07-12 21:24:34 +0000 |
commit | 7218293edcb3f911f58ac2c24941f16832a60815 (patch) | |
tree | 5895fb66ea8ec846d48404d7627a3ed4b34796e9 /sys/dev/usb/uvscom.c | |
parent | 89eb00cda19e05441de4605900ef60f51681288d (diff) |
Kill the last dumb DVACT_DEACTIVATE handlers.
Diffstat (limited to 'sys/dev/usb/uvscom.c')
-rw-r--r-- | sys/dev/usb/uvscom.c | 40 |
1 files changed, 11 insertions, 29 deletions
diff --git a/sys/dev/usb/uvscom.c b/sys/dev/usb/uvscom.c index e14b30606ab..ce431f80012 100644 --- a/sys/dev/usb/uvscom.c +++ b/sys/dev/usb/uvscom.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvscom.c,v 1.31 2014/07/12 18:48:53 tedu Exp $ */ +/* $OpenBSD: uvscom.c,v 1.32 2014/07/12 21:24:33 mpi Exp $ */ /* $NetBSD: uvscom.c,v 1.9 2003/02/12 15:36:20 ichiro Exp $ */ /*- * Copyright (c) 2001-2002, Shunsuke Akiyama <akiyama@jp.FreeBSD.org>. @@ -203,21 +203,16 @@ static const struct usb_devno uvscom_devs [] = { { USB_VENDOR_SUNTAC, USB_PRODUCT_SUNTAC_IS96U }, }; -int uvscom_match(struct device *, void *, void *); -void uvscom_attach(struct device *, struct device *, void *); -int uvscom_detach(struct device *, int); -int uvscom_activate(struct device *, int); - -struct cfdriver uvscom_cd = { - NULL, "uvscom", DV_DULL -}; - -const struct cfattach uvscom_ca = { - sizeof(struct uvscom_softc), - uvscom_match, - uvscom_attach, - uvscom_detach, - uvscom_activate, +int uvscom_match(struct device *, void *, void *); +void uvscom_attach(struct device *, struct device *, void *); +int uvscom_detach(struct device *, int); + +struct cfdriver uvscom_cd = { + NULL, "uvscom", DV_DULL +}; + +const struct cfattach uvscom_ca = { + sizeof(struct uvscom_softc), uvscom_match, uvscom_attach, uvscom_detach }; int @@ -384,19 +379,6 @@ uvscom_detach(struct device *self, int flags) return (rv); } -int -uvscom_activate(struct device *self, int act) -{ - struct uvscom_softc *sc = (struct uvscom_softc *)self; - - switch (act) { - case DVACT_DEACTIVATE: - usbd_deactivate(sc->sc_udev); - break; - } - return (0); -} - usbd_status uvscom_readstat(struct uvscom_softc *sc) { |