From 352cdfe2491abe959844953ffe3c7312f26fe9ae Mon Sep 17 00:00:00 2001
From: Theo de Raadt <deraadt@cvs.openbsd.org>
Date: Sat, 28 Aug 2010 18:08:08 +0000
Subject: rename the *_power functions to *_powerhook to indicate that we've
 been here already for the activate/powerhook cleanup

---
 sys/dev/ic/rt2560.c | 8 ++++----
 sys/dev/ic/rt2661.c | 8 ++++----
 sys/dev/ic/rt2860.c | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'sys/dev/ic')

diff --git a/sys/dev/ic/rt2560.c b/sys/dev/ic/rt2560.c
index eaa0c1b1424..5464bd2d7da 100644
--- a/sys/dev/ic/rt2560.c
+++ b/sys/dev/ic/rt2560.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rt2560.c,v 1.53 2010/08/27 17:08:00 jsg Exp $  */
+/*	$OpenBSD: rt2560.c,v 1.54 2010/08/28 18:08:07 deraadt Exp $  */
 
 /*-
  * Copyright (c) 2005, 2006
@@ -148,7 +148,7 @@ void		rt2560_read_eeprom(struct rt2560_softc *);
 int		rt2560_bbp_init(struct rt2560_softc *);
 int		rt2560_init(struct ifnet *);
 void		rt2560_stop(struct ifnet *, int);
-void		rt2560_power(int, void *);
+void		rt2560_powerhook(int, void *);
 
 static const struct {
 	uint32_t	reg;
@@ -295,7 +295,7 @@ rt2560_attach(void *xsc, int id)
 	sc->sc_txtap.wt_ihdr.it_present = htole32(RT2560_TX_RADIOTAP_PRESENT);
 #endif
 
-	sc->sc_powerhook = powerhook_establish(rt2560_power, sc);
+	sc->sc_powerhook = powerhook_establish(rt2560_powerhook, sc);
 	if (sc->sc_powerhook == NULL) {
 		printf("%s: WARNING: unable to establish power hook\n",
 		    sc->sc_dev.dv_xname);
@@ -2730,7 +2730,7 @@ rt2560_stop(struct ifnet *ifp, int disable)
 }
 
 void
-rt2560_power(int why, void *arg)
+rt2560_powerhook(int why, void *arg)
 {
 	struct rt2560_softc *sc = arg;
 	int s;
diff --git a/sys/dev/ic/rt2661.c b/sys/dev/ic/rt2661.c
index 07996c05f0d..ca017d0892b 100644
--- a/sys/dev/ic/rt2661.c
+++ b/sys/dev/ic/rt2661.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rt2661.c,v 1.59 2010/08/27 17:08:00 jsg Exp $	*/
+/*	$OpenBSD: rt2661.c,v 1.60 2010/08/28 18:08:07 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 2006
@@ -156,7 +156,7 @@ int		rt2661_prepare_beacon(struct rt2661_softc *);
 #endif
 void		rt2661_enable_tsf_sync(struct rt2661_softc *);
 int		rt2661_get_rssi(struct rt2661_softc *, uint8_t);
-void		rt2661_power(int, void *);
+void		rt2661_powerhook(int, void *);
 
 static const struct {
 	uint32_t	reg;
@@ -247,7 +247,7 @@ rt2661_attach(void *xsc, int id)
 	else
 		rt2661_attachhook(sc);
 
-	sc->sc_powerhook = powerhook_establish(rt2661_power, sc);
+	sc->sc_powerhook = powerhook_establish(rt2661_powerhook, sc);
 	if (sc->sc_powerhook == NULL) {
 		printf("%s: WARNING: unable to establish power hook\n",
 		    sc->sc_dev.dv_xname);
@@ -2925,7 +2925,7 @@ rt2661_get_rssi(struct rt2661_softc *sc, uint8_t raw)
 }
 
 void
-rt2661_power(int why, void *arg)
+rt2661_powerhook(int why, void *arg)
 {
 	struct rt2661_softc *sc = arg;
 	int s;
diff --git a/sys/dev/ic/rt2860.c b/sys/dev/ic/rt2860.c
index 492bdd697d3..859cfe71bca 100644
--- a/sys/dev/ic/rt2860.c
+++ b/sys/dev/ic/rt2860.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rt2860.c,v 1.61 2010/08/27 17:08:00 jsg Exp $	*/
+/*	$OpenBSD: rt2860.c,v 1.62 2010/08/28 18:08:07 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 2007-2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -166,7 +166,7 @@ void		rt2860_switch_chan(struct rt2860_softc *,
 int		rt2860_setup_beacon(struct rt2860_softc *);
 #endif
 void		rt2860_enable_tsf_sync(struct rt2860_softc *);
-void		rt2860_power(int, void *);
+void		rt2860_powerhook(int, void *);
 
 static const struct {
 	uint32_t	reg;
@@ -277,7 +277,7 @@ rt2860_attach(void *xsc, int id)
 	else
 		rt2860_attachhook(sc);
 
-	sc->sc_powerhook = powerhook_establish(rt2860_power, sc);
+	sc->sc_powerhook = powerhook_establish(rt2860_powerhook, sc);
 	if (sc->sc_powerhook == NULL) {
 		printf("%s: WARNING: unable to establish power hook\n",
 		    sc->sc_dev.dv_xname);
@@ -3865,7 +3865,7 @@ rt2860_enable_tsf_sync(struct rt2860_softc *sc)
 }
 
 void
-rt2860_power(int why, void *arg)
+rt2860_powerhook(int why, void *arg)
 {
 	struct rt2860_softc *sc = arg;
 	int s;
-- 
cgit v1.2.3