diff options
| author |   deraadt <deraadt@openbsd.org> | 2010-09-07 16:21:35 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2010-09-07 16:21:35 +0000 |
| commit | b07c7932b7553c750603267a7dfb3701c6b7051b (patch) | |
| tree | 15e26beb119d957ddf417bf5ddbd441000309c2d /sys/dev/pci/if_em.c | |
| parent | shorten fpu critical sections so that all frees and other manipulations (diff) | |
| download | wireguard-openbsd-b07c7932b7553c750603267a7dfb3701c6b7051b.tar.xz wireguard-openbsd-b07c7932b7553c750603267a7dfb3701c6b7051b.zip | |
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/pci/if_em.c')
| -rw-r--r-- | sys/dev/pci/if_em.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/sys/dev/pci/if_em.c b/sys/dev/pci/if_em.c index 10991235aed..51152f746b5 100644 --- a/sys/dev/pci/if_em.c +++ b/sys/dev/pci/if_em.c @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. ***************************************************************************/ -/* $OpenBSD: if_em.c,v 1.246 2010/08/31 17:13:44 deraadt Exp $ */ +/* $OpenBSD: if_em.c,v 1.247 2010/09/07 16:21:44 deraadt Exp $ */ /* $FreeBSD: if_em.c,v 1.46 2004/09/29 18:28:28 mlaier Exp $ */ #include <dev/pci/if_em.h> @@ -170,7 +170,6 @@ void em_attach(struct device *, struct device *, void *); void em_defer_attach(struct device*); int em_detach(struct device *, int); int em_activate(struct device *, int); -void em_powerhook(int, void *); int em_intr(void *); void em_start(struct ifnet *); int em_ioctl(struct ifnet *, u_long, caddr_t); @@ -281,9 +280,6 @@ em_defer_attach(struct device *self) pci_intr_disestablish(pc, sc->sc_intrhand); sc->sc_intrhand = 0; - if (sc->sc_powerhook != NULL) - powerhook_disestablish(sc->sc_powerhook); - em_stop(sc, 1); em_free_pci_resources(sc); @@ -507,7 +503,6 @@ em_attach(struct device *parent, struct device *self, void *aux) sc->hw.icp_xxxx_is_link_up = FALSE; INIT_DEBUGOUT("em_attach: end"); - sc->sc_powerhook = powerhook_establish(em_powerhook, sc); return; err_mac_addr: @@ -1857,9 +1852,6 @@ em_detach(struct device *self, int flags) pci_intr_disestablish(pc, sc->sc_intrhand); sc->sc_intrhand = 0; - if (sc->sc_powerhook != NULL) - powerhook_disestablish(sc->sc_powerhook); - em_stop(sc, 1); em_free_pci_resources(sc); @@ -1898,12 +1890,6 @@ em_activate(struct device *self, int act) return (rv); } -void -em_powerhook(int why, void *arg) -{ - em_activate(arg, why); -} - /********************************************************************* * * Workaround for SmartSpeed on 82541 and 82547 controllers |