openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Staging: w35und: inline hal_set_phy_type() to wb35_hw_init() 

Impact: cleanup

The hal_set_phy_type() is called in wb35_hw_init() only so inline the
function there. Also remove a redundant assignment of ->phy_type to
RF_WB_242_1.

Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Pekka Enberg 2009-04-08 11:14:03 +03:00 committed by Greg Kroah-Hartman
parent bdbb883956
commit 9ca748ce51
3 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/staging/winbond/wbhal.c
View File

@ -145,11 +145,6 @@ unsigned char hal_idle(struct hw_data * pHwData)
return true;
}
//---------------------------------------------------------------------------------------------------
void hal_set_phy_type( struct hw_data * pHwData, u8 PhyType )
{
pHwData->phy_type = PhyType;
}
void hal_set_radio_mode( struct hw_data * pHwData, unsigned char radio_off)
{

1
drivers/staging/winbond/wbhal_f.h
View File

@ -42,7 +42,6 @@ void hal_set_accept_multicast( struct hw_data * pHwData, u8 enable );
void hal_set_accept_beacon( struct hw_data * pHwData, u8 enable );
void hal_stop( struct hw_data * pHwData );
void hal_start_tx0( struct hw_data * pHwData );
void hal_set_phy_type( struct hw_data * pHwData, u8 PhyType );
#define hal_get_cwmin( _A ) ( (_A)->cwmin )
void hal_set_cwmax( struct hw_data * pHwData, u16 cwin_max );
#define hal_get_cwmax( _A ) ( (_A)->cwmax )

8
drivers/staging/winbond/wbusb.c
View File

@ -504,7 +504,7 @@ static int hal_init_hardware(struct ieee80211_hw *hw)
static int wb35_hw_init(struct ieee80211_hw *hw)
{
struct wbsoft_priv *priv = hw->priv;
struct hw_data * pHwData;
struct hw_data * pHwData = &priv->sHwData;
u8 *pMacAddr;
u8 *pMacAddr2;
u8 EEPROM_region;
@ -516,18 +516,16 @@ static int wb35_hw_init(struct ieee80211_hw *hw)
priv->sLocalPara.bMacOperationMode = MODE_802_11_BG;
priv->Mds.TxRTSThreshold = DEFAULT_RTSThreshold;
priv->Mds.TxFragmentThreshold = DEFAULT_FRAGMENT_THRESHOLD;
hal_set_phy_type( &priv->sHwData, RF_WB_242_1 );
priv->sLocalPara.MTUsize = MAX_ETHERNET_PACKET_SIZE;
priv->sLocalPara.bPreambleMode = AUTO_MODE;
priv->sLocalPara.RadioOffStatus.boSwRadioOff = false;
pHwData = &priv->sHwData;
hal_set_phy_type( pHwData, RF_DECIDE_BY_INF );
pHwData->phy_type = RF_DECIDE_BY_INF;
priv->sLocalPara.bWepKeyError= false;
priv->sLocalPara.bToSelfPacketReceived = false;
priv->sLocalPara.WepKeyDetectTimerCount= 2 * 100; /* 2 seconds */
pHwData = &priv->sHwData;
err = hal_init_hardware(hw);
if (err)
goto error;