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>

diff --git a/drivers/staging/winbond/wbhal.c b/drivers/staging/winbond/wbhal.c
index 6f1964c47bc5c5b415a11c20f70824610ebd6ee4..14253f05aee5dfd5fe8ac7accaa269a2f3b65d3a 100644 (file)
--- a/drivers/staging/winbond/wbhal.c
+++ b/drivers/staging/winbond/wbhal.c
@@ -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)
 {

diff --git a/drivers/staging/winbond/wbhal_f.h b/drivers/staging/winbond/wbhal_f.h
index d51709f7515147d27f0adcbb50cce49b7848de01..bdea22fbbc266b0e68f6eeb70d0d78637ceb59b6 100644 (file)
--- a/drivers/staging/winbond/wbhal_f.h
+++ b/drivers/staging/winbond/wbhal_f.h
@@ -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 )

diff --git a/drivers/staging/winbond/wbusb.c b/drivers/staging/winbond/wbusb.c
index 29d5a6223c752d36aac41157955120391745808a..692e19c8e8b05f285cb59998d71ca958df273d21 100644 (file)
--- a/drivers/staging/winbond/wbusb.c
+++ b/drivers/staging/winbond/wbusb.c
@@ -504,7 +504,7 @@ error_reg_destroy:
 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;