aboutsummaryrefslogtreecommitdiff
path: root/drivers/staging/winbond/wbusb.c
diff options
context:
space:
mode:
authorPekka Enberg <penberg@cs.helsinki.fi>2009-04-08 11:14:03 +0300
committerGreg Kroah-Hartman <gregkh@suse.de>2009-06-19 11:00:37 -0700
commit9ca748ce517a09068a897fddf9672f2a3286573f (patch)
treeb0a25f40a8c38a69c09b2b603ee9064a63f6ddce /drivers/staging/winbond/wbusb.c
parentbdbb8839567c38f15bfba95e7df8a73a45f49067 (diff)
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>
Diffstat (limited to 'drivers/staging/winbond/wbusb.c')
-rw-r--r--drivers/staging/winbond/wbusb.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/staging/winbond/wbusb.c b/drivers/staging/winbond/wbusb.c
index 29d5a6223c7..692e19c8e8b 100644
--- 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;