diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2010-09-07 16:21:48 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2010-09-07 16:21:48 +0000 |
| commit | 0909b33ee356b8b24e8cfd8ef9abfcce75eac449 (patch) | |
| tree | 60b4dbc9eaed4dfda443b0bf3fa9ec06a75b03ad /sys/dev/usb/ehci.c | |
| parent | 06c96fb315950bff13bd7a73d355ebdc21e85191 (diff) | |
remove the powerhook code. All architectures now use the ca_activate tree
traversal code to suspend/resume
ok oga kettenis blambert
Diffstat (limited to 'sys/dev/usb/ehci.c')
| -rw-r--r-- | sys/dev/usb/ehci.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/sys/dev/usb/ehci.c b/sys/dev/usb/ehci.c index 38bc81d01e1..714b3f08de2 100644 --- a/sys/dev/usb/ehci.c +++ b/sys/dev/usb/ehci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ehci.c,v 1.109 2010/08/31 17:13:47 deraadt Exp $ */ +/* $OpenBSD: ehci.c,v 1.110 2010/09/07 16:21:46 deraadt Exp $ */ /* $NetBSD: ehci.c,v 1.66 2004/06/30 03:11:56 mycroft Exp $ */ /* @@ -123,8 +123,6 @@ struct ehci_pipe { u_int8_t ehci_reverse_bits(u_int8_t, int); -void ehci_powerhook(int, void *); - usbd_status ehci_open(usbd_pipe_handle); void ehci_poll(struct usbd_bus *); void ehci_softintr(void *); @@ -419,8 +417,6 @@ ehci_init(ehci_softc_t *sc) sc->sc_bus.methods = &ehci_bus_methods; sc->sc_bus.pipe_size = sizeof(struct ehci_pipe); - sc->sc_powerhook = powerhook_establish(ehci_powerhook, sc); - sc->sc_eintrs = EHCI_NORMAL_INTRS; /* @@ -1012,8 +1008,6 @@ ehci_detach(struct ehci_softc *sc, int flags) timeout_del(&sc->sc_tmo_intrlist); - if (sc->sc_powerhook != NULL) - powerhook_disestablish(sc->sc_powerhook); if (sc->sc_shutdownhook != NULL) shutdownhook_disestablish(sc->sc_shutdownhook); @@ -1141,12 +1135,6 @@ ehci_activate(struct device *self, int act) return (rv); } -void -ehci_powerhook(int why, void *v) -{ - ehci_activate(v, why); -} - /* * Shut down the controller when the system is going down. */ |