From ad6384591f449026d93b136a6b5cb8b8bce6c743 Mon Sep 17 00:00:00 2001 From: Xenia Ragiadakou Date: Sun, 12 May 2013 03:15:08 +0300 Subject: [PATCH] STAGING: rtl8192u: fix checkpatch error by adding space after switch This patch fixes the following checkpatch error: ERROR: space required before the open parenthesis '(' Signed-off-by: Xenia Ragiadakou Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8192u/ieee80211/dot11d.c | 2 +- .../staging/rtl8192u/ieee80211/ieee80211_tx.c | 2 +- .../rtl8192u/ieee80211/rtl819x_HTProc.c | 6 ++-- .../rtl8192u/ieee80211/rtl819x_TSProc.c | 2 +- drivers/staging/rtl8192u/r8190_rtl8256.c | 8 ++--- drivers/staging/rtl8192u/r8192U_core.c | 30 ++++++++-------- drivers/staging/rtl8192u/r8192U_dm.c | 6 ++-- drivers/staging/rtl8192u/r8192U_wx.c | 2 +- drivers/staging/rtl8192u/r819xU_cmdpkt.c | 2 +- drivers/staging/rtl8192u/r819xU_firmware.c | 2 +- drivers/staging/rtl8192u/r819xU_phy.c | 34 +++++++++---------- 11 files changed, 48 insertions(+), 48 deletions(-) diff --git a/drivers/staging/rtl8192u/ieee80211/dot11d.c b/drivers/staging/rtl8192u/ieee80211/dot11d.c index c6f377a8a0f0..34edcfab96be 100644 --- a/drivers/staging/rtl8192u/ieee80211/dot11d.c +++ b/drivers/staging/rtl8192u/ieee80211/dot11d.c @@ -148,7 +148,7 @@ DOT11D_ScanComplete( { PRT_DOT11D_INFO pDot11dInfo = GET_DOT11D_INFO(dev); - switch(pDot11dInfo->State) + switch (pDot11dInfo->State) { case DOT11D_STATE_LEARNED: pDot11dInfo->State = DOT11D_STATE_DONE; diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c index 77b9e12ef014..995504207fc6 100644 --- a/drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c +++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c @@ -356,7 +356,7 @@ void ieee80211_tx_query_agg_cap(struct ieee80211_device *ieee, struct sk_buff *s } } FORCED_AGG_SETTING: - switch(pHTInfo->ForcedAMPDUMode ) + switch (pHTInfo->ForcedAMPDUMode ) { case HT_AGG_AUTO: break; diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c b/drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c index 02c843ae2f58..e956da5a2d76 100644 --- a/drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c +++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c @@ -177,7 +177,7 @@ void HTDebugHTInfo(u8 *InfoIE, u8 *TitleString) IEEE80211_DEBUG(IEEE80211_DL_HT, "\tPrimary channel = %d\n", pHTInfoEle->ControlChl); IEEE80211_DEBUG(IEEE80211_DL_HT, "\tSenondary channel ="); - switch(pHTInfoEle->ExtChlOffset) + switch (pHTInfoEle->ExtChlOffset) { case 0: IEEE80211_DEBUG(IEEE80211_DL_HT, "Not Present\n"); @@ -195,7 +195,7 @@ void HTDebugHTInfo(u8 *InfoIE, u8 *TitleString) IEEE80211_DEBUG(IEEE80211_DL_HT, "\tRecommended channel width = %s\n", (pHTInfoEle->RecommemdedTxWidth)?"20Mhz": "40Mhz"); IEEE80211_DEBUG(IEEE80211_DL_HT, "\tOperation mode for protection = "); - switch(pHTInfoEle->OptMode) + switch (pHTInfoEle->OptMode) { case 0: IEEE80211_DEBUG(IEEE80211_DL_HT, "No Protection\n"); @@ -801,7 +801,7 @@ u8 HT_PickMCSRate(struct ieee80211_device *ieee, u8 *pOperateMCS) return false; } - switch(ieee->mode) + switch (ieee->mode) { case IEEE_A: case IEEE_B: diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c b/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c index cdcb23fdd3fd..3058120a3243 100644 --- a/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c +++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c @@ -367,7 +367,7 @@ bool GetTs( return false; } - switch(TID) + switch (TID) { case 0: case 3: diff --git a/drivers/staging/rtl8192u/r8190_rtl8256.c b/drivers/staging/rtl8192u/r8190_rtl8256.c index 3f447cc564c6..37cb5072d269 100644 --- a/drivers/staging/rtl8192u/r8190_rtl8256.c +++ b/drivers/staging/rtl8192u/r8190_rtl8256.c @@ -34,7 +34,7 @@ void PHY_SetRF8256Bandwidth(struct net_device *dev , HT_CHANNEL_WIDTH Bandwidth) if (!rtl8192_phy_CheckIsLegalRFPath(dev, eRFPath)) continue; - switch(Bandwidth) + switch (Bandwidth) { case HT_CHANNEL_WIDTH_20: if(priv->card_8192_version == VERSION_819xU_A || priv->card_8192_version == VERSION_819xU_B)// 8256 D-cut, E-cut, xiong: consider it later! @@ -133,7 +133,7 @@ void phy_RF8256_Config_ParaFile(struct net_device *dev) // pHalData->RfReg0Value[eRFPath] = rtl8192_phy_QueryRFReg(dev, (RF90_RADIO_PATH_E)eRFPath, rGlobalCtrl, bMaskDWord); /*----Store original RFENV control type----*/ - switch(eRFPath) + switch (eRFPath) { case RF90_PATH_A: case RF90_PATH_C: @@ -168,7 +168,7 @@ void phy_RF8256_Config_ParaFile(struct net_device *dev) RetryTimes = ConstRetryTimes; RF3_Final_Value = 0; /*----Initialize RF fom connfiguration file----*/ - switch(eRFPath) + switch (eRFPath) { case RF90_PATH_A: while(RF3_Final_Value!=RegValueToBeCheck && RetryTimes!=0) @@ -209,7 +209,7 @@ void phy_RF8256_Config_ParaFile(struct net_device *dev) } /*----Restore RFENV control type----*/; - switch(eRFPath) + switch (eRFPath) { case RF90_PATH_A: case RF90_PATH_C: diff --git a/drivers/staging/rtl8192u/r8192U_core.c b/drivers/staging/rtl8192u/r8192U_core.c index 6ea9049be986..7c602d804bb0 100644 --- a/drivers/staging/rtl8192u/r8192U_core.c +++ b/drivers/staging/rtl8192u/r8192U_core.c @@ -1014,7 +1014,7 @@ int alloc_tx_beacon_desc_ring(struct net_device *dev, int count) inline u16 ieeerate2rtlrate(int rate) { - switch(rate){ + switch (rate){ case 10: return 0; case 20: @@ -1543,7 +1543,7 @@ void rtl8192_config_rate(struct net_device *dev, u16 *rate_config) for (i=0; irates_len; i++) { basic_rate = net->rates[i]&0x7f; - switch(basic_rate) + switch (basic_rate) { case MGN_1M: *rate_config |= RRSR_1M; break; case MGN_2M: *rate_config |= RRSR_2M; break; @@ -1562,7 +1562,7 @@ void rtl8192_config_rate(struct net_device *dev, u16 *rate_config) for (i=0; irates_ex_len; i++) { basic_rate = net->rates_ex[i]&0x7f; - switch(basic_rate) + switch (basic_rate) { case MGN_1M: *rate_config |= RRSR_1M; break; case MGN_2M: *rate_config |= RRSR_2M; break; @@ -1698,7 +1698,7 @@ u16 N_DBPSOfRate(u16 DataRate) { u16 N_DBPS = 24; - switch(DataRate) + switch (DataRate) { case 60: N_DBPS = 24; @@ -1824,7 +1824,7 @@ u8 MapHwQueueToFirmwareQueue(u8 QueueID) { u8 QueueSelect = 0x0; //defualt set to - switch(QueueID) { + switch (QueueID) { case BE_QUEUE: QueueSelect = QSLT_BE; //or QSelect = pTcb->priority; break; @@ -1870,7 +1870,7 @@ u8 MRateToHwRate8190Pci(u8 rate) { u8 ret = DESC90_RATE1M; - switch(rate) { + switch (rate) { case MGN_1M: ret = DESC90_RATE1M; break; case MGN_2M: ret = DESC90_RATE2M; break; case MGN_5_5M: ret = DESC90_RATE5_5M; break; @@ -2581,7 +2581,7 @@ u8 rtl8192_getSupportedWireleeMode(struct net_device *dev) { struct r8192_priv *priv = ieee80211_priv(dev); u8 ret = 0; - switch(priv->rf_chip) + switch (priv->rf_chip) { case RF_8225: case RF_8256: @@ -3019,7 +3019,7 @@ static void rtl8192_read_eeprom_info(struct net_device *dev) }//end if VersionID == VERSION_819xU_A //added by vivi, for dlink led, 20080416 - switch(priv->eeprom_CustomerID) + switch (priv->eeprom_CustomerID) { case EEPROM_CID_RUNTOP: priv->CustomerID = RT_CID_819x_RUNTOP; @@ -3035,7 +3035,7 @@ static void rtl8192_read_eeprom_info(struct net_device *dev) } - switch(priv->CustomerID) + switch (priv->CustomerID) { case RT_CID_819x_RUNTOP: priv->LedStrategy = SW_LED_MODE2; @@ -3146,7 +3146,7 @@ void rtl8192_hwconfig(struct net_device *dev) // Set RRSR, RATR, and BW_OPMODE registers // - switch(priv->ieee80211->mode) + switch (priv->ieee80211->mode) { case WIRELESS_MODE_B: regBwOpMode = BW_OPMODE_20MHZ; @@ -4402,7 +4402,7 @@ u8 HwRateToMRate90(bool bIsHT, u8 rate) u8 ret_rate = 0xff; if(!bIsHT) { - switch(rate) { + switch (rate) { case DESC90_RATE1M: ret_rate = MGN_1M; break; case DESC90_RATE2M: ret_rate = MGN_2M; break; case DESC90_RATE5_5M: ret_rate = MGN_5_5M; break; @@ -4423,7 +4423,7 @@ u8 HwRateToMRate90(bool bIsHT, u8 rate) } } else { - switch(rate) { + switch (rate) { case DESC90_RATEMCS0: ret_rate = MGN_MCS0; break; case DESC90_RATEMCS1: ret_rate = MGN_MCS1; break; case DESC90_RATEMCS2: ret_rate = MGN_MCS2; break; @@ -4890,7 +4890,7 @@ static void rtl8192_query_rxphystatus( { report = pcck_buf->cck_agc_rpt & 0xc0; report = report>>6; - switch(report) + switch (report) { //Fixed by Jacken from Bryant 2008-03-20 //Original value is -38 , -26 , -14 , -2 @@ -4913,7 +4913,7 @@ static void rtl8192_query_rxphystatus( { report = pcck_buf->cck_agc_rpt & 0x60; report = report>>5; - switch(report) + switch (report) { case 0x3: rx_pwr_all = -35 - ((pcck_buf->cck_agc_rpt & 0x1f)<<1) ; @@ -5180,7 +5180,7 @@ UpdateReceivedRateHistogramStatistics8190( else preamble_guardinterval = 0;// long - switch(stats->rate) + switch (stats->rate) { // // CCK rate diff --git a/drivers/staging/rtl8192u/r8192U_dm.c b/drivers/staging/rtl8192u/r8192U_dm.c index bc410f45d8e9..3d7a343e2cc0 100644 --- a/drivers/staging/rtl8192u/r8192U_dm.c +++ b/drivers/staging/rtl8192u/r8192U_dm.c @@ -3581,7 +3581,7 @@ void dm_check_fsync(struct net_device *dev) { if(priv->ieee80211->bfsync_enable == 0) { - switch(priv->ieee80211->fsync_state) + switch (priv->ieee80211->fsync_state) { case Default_Fsync: dm_StartHWFsync(dev); @@ -3599,7 +3599,7 @@ void dm_check_fsync(struct net_device *dev) } else { - switch(priv->ieee80211->fsync_state) + switch (priv->ieee80211->fsync_state) { case Default_Fsync: dm_StartSWFsync(dev); @@ -3632,7 +3632,7 @@ void dm_check_fsync(struct net_device *dev) } else { - switch(priv->ieee80211->fsync_state) + switch (priv->ieee80211->fsync_state) { case HW_Fsync: dm_EndHWFsync(dev); diff --git a/drivers/staging/rtl8192u/r8192U_wx.c b/drivers/staging/rtl8192u/r8192U_wx.c index fc0de373f63d..f191f04404d8 100644 --- a/drivers/staging/rtl8192u/r8192U_wx.c +++ b/drivers/staging/rtl8192u/r8192U_wx.c @@ -709,7 +709,7 @@ static int r8192_wx_set_enc(struct net_device *dev, #define CONF_WEP40 0x4 #define CONF_WEP104 0x14 - switch(wrqu->encoding.flags & IW_ENCODE_INDEX){ + switch (wrqu->encoding.flags & IW_ENCODE_INDEX){ case 0: key_idx = ieee->tx_keyidx; break; case 1: key_idx = 0; break; case 2: key_idx = 1; break; diff --git a/drivers/staging/rtl8192u/r819xU_cmdpkt.c b/drivers/staging/rtl8192u/r819xU_cmdpkt.c index fbd5f4b9374f..d5c75ed7a445 100644 --- a/drivers/staging/rtl8192u/r819xU_cmdpkt.c +++ b/drivers/staging/rtl8192u/r819xU_cmdpkt.c @@ -732,7 +732,7 @@ cmpk_message_handle_rx( /* 2007/01/17 MH We support aggregation of different cmd in the same packet. */ element_id = pcmd_buff[0]; - switch(element_id) + switch (element_id) { case RX_TX_FEEDBACK: cmpk_handle_tx_feedback (dev, pcmd_buff); diff --git a/drivers/staging/rtl8192u/r819xU_firmware.c b/drivers/staging/rtl8192u/r819xU_firmware.c index c6b97e242884..0c477754d9be 100644 --- a/drivers/staging/rtl8192u/r819xU_firmware.c +++ b/drivers/staging/rtl8192u/r819xU_firmware.c @@ -333,7 +333,7 @@ bool init_firmware(struct net_device *dev) goto download_firmware_fail; } - switch(init_step) { + switch (init_step) { case FW_INIT_STEP0_BOOT: /* Download boot * initialize command descriptor. diff --git a/drivers/staging/rtl8192u/r819xU_phy.c b/drivers/staging/rtl8192u/r819xU_phy.c index a6a8f90c2748..54f4cba08cfa 100644 --- a/drivers/staging/rtl8192u/r819xU_phy.c +++ b/drivers/staging/rtl8192u/r819xU_phy.c @@ -710,7 +710,7 @@ u8 rtl8192_phy_checkBBAndRF(struct net_device *dev, HW90_BLOCK_E CheckBlock, RF9 // // Write Data to register and readback // - switch(CheckBlock) + switch (CheckBlock) { case HW90_BLOCK_MAC: RT_TRACE(COMP_ERR, "PHY_CheckBBRFOK(): Never Write 0x100 here!"); @@ -892,7 +892,7 @@ void rtl8192_phy_setTxPower(struct net_device *dev, u8 channel) u8 powerlevel = priv->TxPowerLevelCCK[channel-1]; u8 powerlevelOFDM24G = priv->TxPowerLevelOFDM24G[channel-1]; - switch(priv->rf_chip) + switch (priv->rf_chip) { case RF_8256: PHY_SetRF8256CCKTxPower(dev, powerlevel); //need further implement @@ -917,7 +917,7 @@ void rtl8192_phy_RFConfig(struct net_device *dev) { struct r8192_priv *priv = ieee80211_priv(dev); - switch(priv->rf_chip) + switch (priv->rf_chip) { case RF_8256: PHY_RF8256_Config(dev); @@ -956,7 +956,7 @@ u8 rtl8192_phy_ConfigRFWithHeaderFile(struct net_device *dev, RF90_RADIO_PATH_E //u32* pRFArray; u8 ret = 0; - switch(eRFPath){ + switch (eRFPath){ case RF90_PATH_A: for(i = 0;iTxPowerLevelCCK[channel-1]; u8 powerlevelOFDM24G = priv->TxPowerLevelOFDM24G[channel-1]; - switch(priv->rf_chip) + switch (priv->rf_chip) { case RF_8225: #ifdef TO_DO_LIST @@ -1071,10 +1071,10 @@ bool rtl8192_SetRFPowerState(struct net_device *dev, RT_RF_POWER_STATE eRFPowerS priv->SetRFPowerStateInProgress = true; - switch(priv->rf_chip) + switch (priv->rf_chip) { case RF_8256: - switch( eRFPowerState ) + switch ( eRFPowerState ) { case eRfOn: //RF-A, RF-B @@ -1129,10 +1129,10 @@ bool rtl8192_SetRFPowerState(struct net_device *dev, RT_RF_POWER_STATE eRFPowerS { // Update current RF state variable. pHalData->eRFPowerState = eRFPowerState; - switch(pHalData->RFChipID ) + switch (pHalData->RFChipID ) { case RF_8256: - switch(pHalData->eRFPowerState) + switch (pHalData->eRFPowerState) { case eRfOff: // @@ -1283,7 +1283,7 @@ u8 rtl8192_phy_SwChnlStepByStep(struct net_device *dev, u8 channel, u8 *stage, u // <3> Fill up RF dependent command. RfDependCmdCnt = 0; - switch( priv->rf_chip ) + switch ( priv->rf_chip ) { case RF_8225: if (!(channel >= 1 && channel <= 14)) @@ -1321,7 +1321,7 @@ u8 rtl8192_phy_SwChnlStepByStep(struct net_device *dev, u8 channel, u8 *stage, u do{ - switch(*stage) + switch (*stage) { case 0: CurrentCmd=&PreCommonCmd[*step]; @@ -1349,7 +1349,7 @@ u8 rtl8192_phy_SwChnlStepByStep(struct net_device *dev, u8 channel, u8 *stage, u } } - switch(CurrentCmd->CmdID) + switch (CurrentCmd->CmdID) { case CmdID_SetTxPowerLevel: if(priv->card_8192_version == (u8)VERSION_819xU_A) //xiong: consider it later! @@ -1452,7 +1452,7 @@ if (0) //to test current channel from RF reg 0x7. } } //-------------------------------------------- - switch(priv->ieee80211->mode) + switch (priv->ieee80211->mode) { case WIRELESS_MODE_A: case WIRELESS_MODE_N_5G: @@ -1527,7 +1527,7 @@ void rtl8192_SetBWModeWorkItem(struct net_device *dev) //<1>Set MAC register regBwOpMode = read_nic_byte(dev, BW_OPMODE); - switch(priv->CurrentChannelBW) + switch (priv->CurrentChannelBW) { case HT_CHANNEL_WIDTH_20: regBwOpMode |= BW_OPMODE_20MHZ; @@ -1547,7 +1547,7 @@ void rtl8192_SetBWModeWorkItem(struct net_device *dev) } //<2>Set PHY related register - switch(priv->CurrentChannelBW) + switch (priv->CurrentChannelBW) { case HT_CHANNEL_WIDTH_20: // Add by Vivi 20071119 @@ -1617,7 +1617,7 @@ void rtl8192_SetBWModeWorkItem(struct net_device *dev) //Skip over setting of J-mode in BB register here. Default value is "None J mode". Emily 20070315 //<3>Set RF related register - switch( priv->rf_chip ) + switch ( priv->rf_chip ) { case RF_8225: #ifdef TO_DO_LIST @@ -1704,7 +1704,7 @@ extern void InitialGainOperateWorkItemCallBack(struct work_struct *work) Operation = priv->InitialGainOperateType; - switch(Operation) + switch (Operation) { case IG_Backup: RT_TRACE(COMP_SCAN, "IG_Backup, backup the initial gain.\n"); -- 2.20.1