summaryrefslogtreecommitdiff
path: root/sys/dev/cardbus/ohci_cardbus.c
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2010-09-07 16:21:48 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2010-09-07 16:21:48 +0000
commit0909b33ee356b8b24e8cfd8ef9abfcce75eac449 (patch)
tree60b4dbc9eaed4dfda443b0bf3fa9ec06a75b03ad /sys/dev/cardbus/ohci_cardbus.c
parent06c96fb315950bff13bd7a73d355ebdc21e85191 (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/cardbus/ohci_cardbus.c')
-rw-r--r--sys/dev/cardbus/ohci_cardbus.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/sys/dev/cardbus/ohci_cardbus.c b/sys/dev/cardbus/ohci_cardbus.c
index 3aec5eb7b9c..c0f2cf4653a 100644
--- a/sys/dev/cardbus/ohci_cardbus.c
+++ b/sys/dev/cardbus/ohci_cardbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ohci_cardbus.c,v 1.16 2010/08/30 21:30:14 deraadt Exp $ */
+/* $OpenBSD: ohci_cardbus.c,v 1.17 2010/09/07 16:21:41 deraadt Exp $ */
/* $NetBSD: ohci_cardbus.c,v 1.19 2004/08/02 19:14:28 mycroft Exp $ */
/*
@@ -167,8 +167,6 @@ ohci_cardbus_attach(struct device *parent, struct device *self, void *aux)
return;
}
- sc->sc.sc_powerhook = powerhook_establish(ohci_powerhook, &sc->sc);
-
/* Attach usb device. */
sc->sc.sc_child = config_found((void *)sc, &sc->sc.sc_bus,
usbctlprint);
@@ -185,9 +183,6 @@ ohci_cardbus_detach(struct device *self, int flags)
if (rv)
return (rv);
- if (sc->sc.sc_powerhook != NULL)
- powerhook_disestablish(sc->sc.sc_powerhook);
-
if (sc->sc_ih != NULL) {
cardbus_intr_disestablish(sc->sc_cc, sc->sc_cf, sc->sc_ih);
sc->sc_ih = NULL;