diff options
| author |   reyk <reyk@openbsd.org> | 2010-07-02 06:06:30 +0000 |
|---|---|---|
| committer | reyk <reyk@openbsd.org> | 2010-07-02 06:06:30 +0000 |
| commit | 5217f498db2b1c7e758f6cddb89f12b162050b38 (patch) | |
| tree | cd3acff12b2c160a69899a05c2dd2db0b7db70fd | |
| parent | Bye-bye vstring, and add value type checking code to vgetstr/vsetstr/etc. (diff) | |
| download | wireguard-openbsd-5217f498db2b1c7e758f6cddb89f12b162050b38.tar.xz wireguard-openbsd-5217f498db2b1c7e758f6cddb89f12b162050b38.zip | |
cleanup and remove some #ifdef junk in the power hooks.
ok deraadt@
| -rw-r--r-- | sys/dev/ic/ath.c | 12 | ||||
| -rw-r--r-- | sys/dev/ic/athvar.h | 5 |
2 files changed, 2 insertions, 15 deletions
diff --git a/sys/dev/ic/ath.c b/sys/dev/ic/ath.c index 64640c2fea1..41b5455ee9d 100644 --- a/sys/dev/ic/ath.c +++ b/sys/dev/ic/ath.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ath.c,v 1.85 2010/04/20 22:05:43 tedu Exp $ */ +/* $OpenBSD: ath.c,v 1.86 2010/07/02 06:06:30 reyk Exp $ */ /* $NetBSD: ath.c,v 1.37 2004/08/18 21:59:39 dyoung Exp $ */ /*- @@ -140,7 +140,6 @@ void ath_recv_mgmt(struct ieee80211com *, struct mbuf *, struct ieee80211_node *, struct ieee80211_rxinfo *, int); #endif void ath_disable(struct ath_softc *); -void ath_power(int, void *); int ath_gpio_attach(struct ath_softc *, u_int16_t); int ath_gpio_pin_read(void *, int); @@ -505,12 +504,6 @@ ath_power(int why, void *arg) case PWR_RESUME: ath_resume(sc, why); break; -#if !defined(__OpenBSD__) - case PWR_SOFTSUSPEND: - case PWR_SOFTSTANDBY: - case PWR_SOFTRESUME: - break; -#endif } splx(s); } @@ -536,9 +529,6 @@ ath_resume(struct ath_softc *sc, int why) if (ifp->if_flags & IFF_UP) { ath_init(ifp); -#if 0 - (void)ath_intr(sc); -#endif if (sc->sc_power != NULL) (*sc->sc_power)(sc, why); if (ifp->if_flags & IFF_RUNNING) diff --git a/sys/dev/ic/athvar.h b/sys/dev/ic/athvar.h index cc0fe5944dc..f8283475189 100644 --- a/sys/dev/ic/athvar.h +++ b/sys/dev/ic/athvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: athvar.h,v 1.28 2009/10/13 19:33:16 pirofti Exp $ */ +/* $OpenBSD: athvar.h,v 1.29 2010/07/02 06:06:30 reyk Exp $ */ /* $NetBSD: athvar.h,v 1.10 2004/08/10 01:03:53 dyoung Exp $ */ /*- @@ -409,10 +409,7 @@ int ath_detach(struct ath_softc *, int); int ath_enable(struct ath_softc *); void ath_resume(struct ath_softc *, int); void ath_suspend(struct ath_softc *, int); -#ifdef __NetBSD__ -int ath_activate(struct device *, int); void ath_power(int, void *); -#endif int ath_intr(void *); int ath_enable(struct ath_softc *); |