remove private copies of gpio methods that were needed when the hal

was an independent entity

5 files changed, 6 insertions, 32 deletions

diff --git a/sys/dev/ath/ath_hal/ah_internal.h b/sys/dev/ath/ath_hal/ah_internal.h
index 760207f..169a28f 100644
--- a/sys/dev/ath/ath_hal/ah_internal.h
+++ b/sys/dev/ath/ath_hal/ah_internal.h
@@ -242,12 +242,6 @@ struct ath_hal_private {
 				uint16_t *data);
 	HAL_BOOL	(*ah_eepromWrite)(struct ath_hal *, u_int off,
 				uint16_t data);
-	HAL_BOOL	(*ah_gpioCfgOutput)(struct ath_hal *, uint32_t gpio);
-	HAL_BOOL	(*ah_gpioCfgInput)(struct ath_hal *, uint32_t gpio);
-	uint32_t	(*ah_gpioGet)(struct ath_hal *, uint32_t gpio);
-	HAL_BOOL	(*ah_gpioSet)(struct ath_hal *,
-				uint32_t gpio, uint32_t val);
-	void		(*ah_gpioSetIntr)(struct ath_hal*, u_int, uint32_t);
 	HAL_BOOL	(*ah_getChipPowerLimits)(struct ath_hal *,
 				struct ieee80211_channel *);
 	int16_t		(*ah_getNfAdjust)(struct ath_hal *,
@@ -318,15 +312,15 @@ struct ath_hal_private {
 #define	ath_hal_eepromWrite(_ah, _off, _data) \
 	AH_PRIVATE(_ah)->ah_eepromWrite(_ah, _off, _data)
 #define	ath_hal_gpioCfgOutput(_ah, _gpio) \
-	AH_PRIVATE(_ah)->ah_gpioCfgOutput(_ah, _gpio)
+	(_ah)->ah_gpioCfgOutput(_ah, _gpio)
 #define	ath_hal_gpioCfgInput(_ah, _gpio) \
-	AH_PRIVATE(_ah)->ah_gpioCfgInput(_ah, _gpio)
+	(_ah)->ah_gpioCfgInput(_ah, _gpio)
 #define	ath_hal_gpioGet(_ah, _gpio) \
-	AH_PRIVATE(_ah)->ah_gpioGet(_ah, _gpio)
+	(_ah)->ah_gpioGet(_ah, _gpio)
 #define	ath_hal_gpioSet(_ah, _gpio, _val) \
-	AH_PRIVATE(_ah)->ah_gpioGet(_ah, _gpio, _val)
+	(_ah)->ah_gpioSet(_ah, _gpio, _val)
 #define	ath_hal_gpioSetIntr(_ah, _gpio, _ilevel) \
-	AH_PRIVATE(_ah)->ah_gpioSetIntr(_ah, _gpio, _ilevel)
+	(_ah)->ah_gpioSetIntr(_ah, _gpio, _ilevel)
 #define	ath_hal_getpowerlimits(_ah, _chan) \
 	AH_PRIVATE(_ah)->ah_getChipPowerLimits(_ah, _chan)
 #define ath_hal_getNfAdjust(_ah, _c) \
diff --git a/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c b/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c
index 555c14c..263edcc 100644
--- a/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c
+++ b/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c
@@ -155,11 +155,6 @@ static const struct ath_hal_private ar5210hal = {{
 #ifdef AH_SUPPORT_WRITE_EEPROM
 	.ah_eepromWrite			= ar5210EepromWrite,
 #endif
-	.ah_gpioCfgInput		= ar5210GpioCfgInput,
-	.ah_gpioCfgOutput		= ar5210GpioCfgOutput,
-	.ah_gpioGet			= ar5210GpioGet,
-	.ah_gpioSet			= ar5210GpioSet,
-	.ah_gpioSetIntr			= ar5210Gpio0SetIntr,
 	.ah_getChipPowerLimits		= ar5210GetChipPowerLimits,
 };
 
diff --git a/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c b/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c
index 8164ca4..c3c58a3 100644
--- a/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c
+++ b/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c
@@ -155,11 +155,6 @@ static const struct ath_hal_private ar5211hal = {{
 #ifdef AH_SUPPORT_WRITE_EEPROM
 	.ah_eepromWrite			= ar5211EepromWrite,
 #endif
-	.ah_gpioCfgInput		= ar5211GpioCfgInput,
-	.ah_gpioCfgOutput		= ar5211GpioCfgOutput,
-	.ah_gpioGet			= ar5211GpioGet,
-	.ah_gpioSet			= ar5211GpioSet,
-	.ah_gpioSetIntr			= ar5211GpioSetIntr,
 	.ah_getChipPowerLimits		= ar5211GetChipPowerLimits,
 };
 
diff --git a/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c b/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c
index da6a79e..7fa370e 100644
--- a/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c
+++ b/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c
@@ -151,11 +151,6 @@ static const struct ath_hal_private ar5212hal = {{
 #ifdef AH_SUPPORT_WRITE_EEPROM
 	.ah_eepromWrite			= ar5212EepromWrite,
 #endif
-	.ah_gpioCfgOutput		= ar5212GpioCfgOutput,
-	.ah_gpioCfgInput		= ar5212GpioCfgInput,
-	.ah_gpioGet			= ar5212GpioGet,
-	.ah_gpioSet			= ar5212GpioSet,
-	.ah_gpioSetIntr			= ar5212GpioSetIntr,
 	.ah_getChipPowerLimits		= ar5212GetChipPowerLimits,
 };
 
diff --git a/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c b/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c
index d5ffdae..ac7122d 100644
--- a/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c
+++ b/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c
@@ -14,7 +14,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $Id: ar5416_attach.c,v 1.27 2008/11/27 22:30:07 sam Exp $
+ * $FreeBSD$
  */
 #include "opt_ah.h"
 
@@ -147,11 +147,6 @@ ar5416InitState(struct ath_hal_5416 *ahp5416, uint16_t devid, HAL_SOFTC sc,
 #ifdef AH_SUPPORT_WRITE_EEPROM
 	ahp->ah_priv.ah_eepromWrite	= ar5416EepromWrite;
 #endif
-	ahp->ah_priv.ah_gpioCfgOutput	= ar5416GpioCfgOutput;
-	ahp->ah_priv.ah_gpioCfgInput	= ar5416GpioCfgInput;
-	ahp->ah_priv.ah_gpioGet		= ar5416GpioGet;
-	ahp->ah_priv.ah_gpioSet		= ar5416GpioSet;
-	ahp->ah_priv.ah_gpioSetIntr	= ar5416GpioSetIntr;
 	ahp->ah_priv.ah_getChipPowerLimits = ar5416GetChipPowerLimits;
 
 	/*