From 1e0f9ac07c044ef730375049beceeb16c7af786c Mon Sep 17 00:00:00 2001 From: Mike McCormack Date: Tue, 10 Aug 2010 23:45:13 +0900 Subject: [PATCH] Staging: rtl8192e: Remove pointless return statements Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8192e/r8190_rtl8256.c | 2 -- drivers/staging/rtl8192e/r8192E_core.c | 1 - drivers/staging/rtl8192e/r8192E_dm.c | 4 +--- drivers/staging/rtl8192e/r819xE_phy.c | 13 ------------- 4 files changed, 1 insertion(+), 19 deletions(-) diff --git a/drivers/staging/rtl8192e/r8190_rtl8256.c b/drivers/staging/rtl8192e/r8190_rtl8256.c index 8bd5b173a7d2..e2abfd7fd246 100644 --- a/drivers/staging/rtl8192e/r8190_rtl8256.c +++ b/drivers/staging/rtl8192e/r8190_rtl8256.c @@ -80,7 +80,6 @@ void PHY_SetRF8256Bandwidth(struct net_device* dev , HT_CHANNEL_WIDTH Bandwidth) } } - return; } /*-------------------------------------------------------------------------- * Overview: Interface to config 8256 @@ -414,7 +413,6 @@ void PHY_SetRF8256OFDMTxPower(struct net_device* dev, u8 powerlevel) #endif #endif - return; } #define MAX_DOZE_WAITING_TIMES_9x 64 diff --git a/drivers/staging/rtl8192e/r8192E_core.c b/drivers/staging/rtl8192e/r8192E_core.c index b785527d581f..7f962c599c5c 100644 --- a/drivers/staging/rtl8192e/r8192E_core.c +++ b/drivers/staging/rtl8192e/r8192E_core.c @@ -1106,7 +1106,6 @@ void rtl8192_halt_adapter(struct net_device *dev, bool reset) } skb_queue_purge(&priv->skb_queue); - return; } #if 0 diff --git a/drivers/staging/rtl8192e/r8192E_dm.c b/drivers/staging/rtl8192e/r8192E_dm.c index 1bef5f3c5744..8d7c35bd2bb3 100644 --- a/drivers/staging/rtl8192e/r8192E_dm.c +++ b/drivers/staging/rtl8192e/r8192E_dm.c @@ -295,9 +295,7 @@ void dm_check_ac_dc_power(struct net_device *dev) return; } call_usermodehelper(ac_dc_check_script_path,argv,envp,1); - - return; -}; +} void hal_dm_watchdog(struct net_device *dev) { diff --git a/drivers/staging/rtl8192e/r819xE_phy.c b/drivers/staging/rtl8192e/r819xE_phy.c index 17b34439ee21..e89b241c7d42 100644 --- a/drivers/staging/rtl8192e/r819xE_phy.c +++ b/drivers/staging/rtl8192e/r819xE_phy.c @@ -1477,7 +1477,6 @@ void rtl8192_setBBreg(struct net_device* dev, u32 dwRegAddr, u32 dwBitMask, u32 write_nic_dword(dev, dwRegAddr, NewValue); }else write_nic_dword(dev, dwRegAddr, dwData); - return; } /****************************************************************************** *function: This function reads specific bits from BB register @@ -1705,8 +1704,6 @@ static void rtl8192_phy_RFSerialWrite(struct net_device* dev, RF90_RADIO_PATH_E #endif #endif } - - return; } /****************************************************************************** @@ -1764,7 +1761,6 @@ void rtl8192_phy_SetRFReg(struct net_device* dev, RF90_RADIO_PATH_E eRFPath, u32 } //spin_unlock_irqrestore(&priv->rf_lock, flags); //up(&priv->rf_sem); - return; } /****************************************************************************** @@ -1967,8 +1963,6 @@ if(Adapter->bInHctTest) } rtl8192_setBBreg(dev, pdwArray[i], pdwArray[i+1], pdwArray[i+2]); } - return; - } /****************************************************************************** @@ -2039,9 +2033,6 @@ void rtl8192_phyConfigBB(struct net_device* dev, u8 ConfigType) RT_TRACE(COMP_DBG, "i:%x, The rtl819XAGCTAB_Array[0] is %x rtl819XAGCTAB_Array[1] is %x \n",i, Rtl819XAGCTAB_Array_Table[i], Rtl819XAGCTAB_Array_Table[i+1]); } } - return; - - } /****************************************************************************** *function: This function initialize Register definition offset for Radio Path @@ -2381,7 +2372,6 @@ void rtl8192_phy_getTxPower(struct net_device* dev) rOFDM0_RxDetector3, priv->framesync); // read SIFS (save the value read fome MACPHY_REG.txt) priv->SifsTime = read_nic_word(dev, SIFS); - return; } /****************************************************************************** @@ -2503,7 +2493,6 @@ void rtl8192_phy_setTxPower(struct net_device* dev, u8 channel) RT_TRACE(COMP_ERR, "unknown rf chip in funtion %s()\n", __FUNCTION__); break; } - return; } /****************************************************************************** @@ -2546,7 +2535,6 @@ RT_STATUS rtl8192_phy_RFConfig(struct net_device* dev) * ***************************************************************************/ void rtl8192_phy_updateInitGain(struct net_device* dev) { - return; } /****************************************************************************** @@ -2653,7 +2641,6 @@ static void rtl8192_SetTxPowerLevel(struct net_device *dev, u8 channel) RT_TRACE(COMP_ERR, "unknown rf chip ID in rtl8192_SetTxPowerLevel()\n"); break; } - return; } /**************************************************************************************** *function: This function set command table variable(struct SwChnlCmd). -- 2.20.1