From: Pekka Enberg <penberg at cs.helsinki.fi>
Impact: cleanup
It's a trivial wrapper that is used in only one place, so lets inline it.
Acked-by: Pavel Machek <pavel at ucw.cz>
Signed-off-by: Pekka Enberg <penberg at cs.helsinki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
---
drivers/staging/winbond/mto.c | 2 +-
drivers/staging/winbond/wbhal.c | 5 -----
drivers/staging/winbond/wbhal_f.h | 1 -
3 files changed, 1 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/winbond/mto.c b/drivers/staging/winbond/mto.c
index 94a060b..7deb5c7 100644
--- a/drivers/staging/winbond/mto.c
+++ b/drivers/staging/winbond/mto.c
@@ -175,7 +175,7 @@ void MTO_Init(struct wbsoft_priv *adapter)
}
else //follow the setting from EEPROM
MTOPARA_TXPOWER_INDEX() = MTO_TXPOWER_FROM_EEPROM;
- hal_set_rf_power(MTO_HAL(), (u8)MTOPARA_TXPOWER_INDEX());
+ RFSynthesizer_SetPowerIndex(MTO_HAL(), (u8)MTOPARA_TXPOWER_INDEX());
//------------------------------------------------
// For RSSI turning 20060808.4 Cancel load from EEPROM
diff --git a/drivers/staging/winbond/wbhal.c b/drivers/staging/winbond/wbhal.c
index 01626a1..b9a6e38 100644
--- a/drivers/staging/winbond/wbhal.c
+++ b/drivers/staging/winbond/wbhal.c
@@ -18,8 +18,3 @@ unsigned char hal_set_dxx_reg(struct hw_data *pHwData, u16 number, u32 value)
ret = Wb35Reg_WriteSync(pHwData, number, value);
return ret;
}
-
-void hal_set_rf_power(struct hw_data *pHwData, u8 PowerIndex)
-{
- RFSynthesizer_SetPowerIndex(pHwData, PowerIndex);
-}
diff --git a/drivers/staging/winbond/wbhal_f.h b/drivers/staging/winbond/wbhal_f.h
index c4934cb..fd1d3c2 100644
--- a/drivers/staging/winbond/wbhal_f.h
+++ b/drivers/staging/winbond/wbhal_f.h
@@ -39,7 +39,6 @@ void hal_set_cwmax( struct hw_data * pHwData, u16 cwin_max );
void hal_set_rsn_wpa( struct hw_data * pHwData, u32 * RSN_IE_Bitmap , u32 * RSN_OUI_type , unsigned char bDesiredAuthMode);
void hal_set_connect_info( struct hw_data * pHwData, unsigned char boConnect );
u8 hal_get_est_sq3( struct hw_data * pHwData, u8 Count );
-void hal_set_rf_power( struct hw_data * pHwData, u8 PowerIndex ); // 20060621 Modify
void hal_descriptor_indicate( struct hw_data * pHwData, PDESCRIPTOR pDes );
u8 hal_get_antenna_number( struct hw_data * pHwData );
u32 hal_get_bss_pk_cnt( struct hw_data * pHwData );
--
1.6.3.2
