Commit 9ca748ce authored by Pekka Enberg's avatar Pekka Enberg Committed by Greg Kroah-Hartman
Browse files

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: default avatarPavel Machek <pavel@ucw.cz>
Signed-off-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent bdbb8839

drivers/staging/winbond/wbhal.c

+0 −5
Original line number Diff line number Diff line
@@ -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)

{

drivers/staging/winbond/wbhal_f.h

+0 −1
Original line number Diff line number Diff line
@@ -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 )

drivers/staging/winbond/wbusb.c

+3 −5
Original line number Diff line number Diff line
@@ -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;