Change "if(" to "if (" and the same changes for "while", "for", "switch" and "do"

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2013-05-08 23:04:25 -05:00
parent 124abebb96
commit a55f866a62
105 changed files with 6893 additions and 6893 deletions

View file

@ -60,12 +60,12 @@ void ips_enter(_adapter * padapter)
#ifdef CONFIG_BT_COEXIST
BTDM_TurnOffBtCoexistBeforeEnterIPS(padapter);
#endif
if(rf_off == pwrpriv->change_rfpwrstate )
if (rf_off == pwrpriv->change_rfpwrstate )
{
pwrpriv->bpower_saving = _TRUE;
DBG_871X_LEVEL(_drv_always_, "nolinked power save enter\n");
if(pwrpriv->ips_mode == IPS_LEVEL_2)
if (pwrpriv->ips_mode == IPS_LEVEL_2)
pwrpriv->bkeepfwalive = _TRUE;
rtw_ips_pwr_down(padapter);
@ -88,7 +88,7 @@ int ips_leave(_adapter * padapter)
_enter_pwrlock(&pwrpriv->lock);
if((pwrpriv->rf_pwrstate == rf_off) &&(!pwrpriv->bips_processing))
if ((pwrpriv->rf_pwrstate == rf_off) &&(!pwrpriv->bips_processing))
{
pwrpriv->bips_processing = _TRUE;
pwrpriv->change_rfpwrstate = rf_on;
@ -100,13 +100,13 @@ int ips_leave(_adapter * padapter)
}
DBG_871X_LEVEL(_drv_always_, "nolinked power save leave\n");
if((_WEP40_ == psecuritypriv->dot11PrivacyAlgrthm) ||(_WEP104_ == psecuritypriv->dot11PrivacyAlgrthm))
if ((_WEP40_ == psecuritypriv->dot11PrivacyAlgrthm) ||(_WEP104_ == psecuritypriv->dot11PrivacyAlgrthm))
{
DBG_871X("==>%s,channel(%d),processing(%x)\n",__FUNCTION__,padapter->mlmeextpriv.cur_channel,pwrpriv->bips_processing);
set_channel_bwmode(padapter, padapter->mlmeextpriv.cur_channel, HAL_PRIME_CHNL_OFFSET_DONT_CARE, HT_CHANNEL_WIDTH_20);
for(keyid=0;keyid<4;keyid++){
if(pmlmepriv->key_mask & BIT(keyid)){
if(keyid == psecuritypriv->dot11PrivacyKeyIndex)
for (keyid=0;keyid<4;keyid++){
if (pmlmepriv->key_mask & BIT(keyid)){
if (keyid == psecuritypriv->dot11PrivacyKeyIndex)
result=rtw_set_key(padapter,psecuritypriv, keyid, 1);
else
result=rtw_set_key(padapter,psecuritypriv, keyid, 0);
@ -214,25 +214,25 @@ void rtw_ps_processor(_adapter*padapter)
pwrpriv->ps_processing = _TRUE;
#ifdef SUPPORT_HW_RFOFF_DETECTED
if(pwrpriv->bips_processing == _TRUE)
if (pwrpriv->bips_processing == _TRUE)
goto exit;
//DBG_871X("==> fw report state(0x%x)\n",rtw_read8(padapter,0x1ca));
if(padapter->pwrctrlpriv.bHWPwrPindetect)
if (padapter->pwrctrlpriv.bHWPwrPindetect)
{
#ifdef CONFIG_AUTOSUSPEND
if(padapter->registrypriv.usbss_enable)
if (padapter->registrypriv.usbss_enable)
{
if(pwrpriv->rf_pwrstate == rf_on)
if (pwrpriv->rf_pwrstate == rf_on)
{
if(padapter->net_closed == _TRUE)
if (padapter->net_closed == _TRUE)
pwrpriv->ps_flag = _TRUE;
rfpwrstate = RfOnOffDetect(padapter);
DBG_871X("@@@@- #1 %s==> rfstate:%s \n",__FUNCTION__,(rfpwrstate==rf_on)?"rf_on":"rf_off");
if(rfpwrstate!= pwrpriv->rf_pwrstate)
if (rfpwrstate!= pwrpriv->rf_pwrstate)
{
if(rfpwrstate == rf_off)
if (rfpwrstate == rf_off)
{
pwrpriv->change_rfpwrstate = rf_off;
@ -250,9 +250,9 @@ void rtw_ps_processor(_adapter*padapter)
rfpwrstate = RfOnOffDetect(padapter);
DBG_871X("@@@@- #2 %s==> rfstate:%s \n",__FUNCTION__,(rfpwrstate==rf_on)?"rf_on":"rf_off");
if(rfpwrstate!= pwrpriv->rf_pwrstate)
if (rfpwrstate!= pwrpriv->rf_pwrstate)
{
if(rfpwrstate == rf_off)
if (rfpwrstate == rf_off)
{
pwrpriv->change_rfpwrstate = rf_off;
pwrpriv->brfoffbyhw = _TRUE;
@ -281,7 +281,7 @@ void rtw_ps_processor(_adapter*padapter)
if (rtw_pwr_unassociated_idle(padapter) == _FALSE)
goto exit;
if((pwrpriv->rf_pwrstate == rf_on) && ((pwrpriv->pwr_state_check_cnts%4)==0))
if ((pwrpriv->rf_pwrstate == rf_on) && ((pwrpriv->pwr_state_check_cnts%4)==0))
{
DBG_871X("==>%s .fw_state(%x)\n",__FUNCTION__,get_fwstate(pmlmepriv));
#if defined (CONFIG_BT_COEXIST)&& defined (CONFIG_AUTOSUSPEND)
@ -289,12 +289,12 @@ void rtw_ps_processor(_adapter*padapter)
pwrpriv->change_rfpwrstate = rf_off;
#endif
#ifdef CONFIG_AUTOSUSPEND
if(padapter->registrypriv.usbss_enable)
if (padapter->registrypriv.usbss_enable)
{
if(pwrpriv->bHWPwrPindetect)
if (pwrpriv->bHWPwrPindetect)
pwrpriv->bkeepfwalive = _TRUE;
if(padapter->net_closed == _TRUE)
if (padapter->net_closed == _TRUE)
pwrpriv->ps_flag = _TRUE;
#if defined (CONFIG_BT_COEXIST)&& defined (CONFIG_AUTOSUSPEND)
@ -311,7 +311,7 @@ void rtw_ps_processor(_adapter*padapter)
autosuspend_enter(padapter);
#endif //if defined (CONFIG_BT_COEXIST)&& defined (CONFIG_AUTOSUSPEND)
}
else if(pwrpriv->bHWPwrPindetect)
else if (pwrpriv->bHWPwrPindetect)
{
}
else
@ -451,7 +451,7 @@ u8 PS_RDY_CHECK(_adapter * padapter)
curr_time = rtw_get_current_time();
delta_time = curr_time -pwrpriv->DelayLPSLastTimeStamp;
if(delta_time < LPS_DELAY_TIME)
if (delta_time < LPS_DELAY_TIME)
{
return _FALSE;
}
@ -463,15 +463,15 @@ u8 PS_RDY_CHECK(_adapter * padapter)
(check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) == _TRUE) )
return _FALSE;
#ifdef CONFIG_WOWLAN
if(_TRUE == pwrpriv->bInSuspend && pwrpriv->wowlan_mode)
if (_TRUE == pwrpriv->bInSuspend && pwrpriv->wowlan_mode)
return _TRUE;
else
return _FALSE;
#else
if(_TRUE == pwrpriv->bInSuspend )
if (_TRUE == pwrpriv->bInSuspend )
return _FALSE;
#endif
if( (padapter->securitypriv.dot11AuthAlgrthm == dot11AuthAlgrthm_8021X) && (padapter->securitypriv.binstallGrpkey == _FALSE) )
if ( (padapter->securitypriv.dot11AuthAlgrthm == dot11AuthAlgrthm_8021X) && (padapter->securitypriv.binstallGrpkey == _FALSE) )
{
DBG_871X("Group handshake still in progress !!!\n");
return _FALSE;
@ -504,7 +504,7 @@ _func_enter_;
("%s: PowerMode=%d Smart_PS=%d\n",
__FUNCTION__, ps_mode, smart_ps));
if(ps_mode > PM_Card_Disable) {
if (ps_mode > PM_Card_Disable) {
RT_TRACE(_module_rtl871x_pwrctrl_c_,_drv_err_,("ps_mode:%d error\n", ps_mode));
return;
}
@ -524,11 +524,11 @@ _func_enter_;
_enter_pwrlock(&pwrpriv->lock);
#endif
//if(pwrpriv->pwr_mode == PS_MODE_ACTIVE)
if(ps_mode == PS_MODE_ACTIVE)
//if (pwrpriv->pwr_mode == PS_MODE_ACTIVE)
if (ps_mode == PS_MODE_ACTIVE)
{
#ifdef CONFIG_P2P_PS
if(pwdinfo->opp_ps == 0)
if (pwdinfo->opp_ps == 0)
#endif //CONFIG_P2P_PS
{
DBG_871X("rtw_set_ps_mode: Leave 802.11 power save\n");
@ -536,7 +536,7 @@ _func_enter_;
#ifdef CONFIG_TDLS
_enter_critical_bh(&pstapriv->sta_hash_lock, &irqL);
for(i=0; i< NUM_STA; i++)
for (i=0; i< NUM_STA; i++)
{
phead = &(pstapriv->sta_hash[i]);
plist = get_next(phead);
@ -545,7 +545,7 @@ _func_enter_;
{
ptdls_sta = LIST_CONTAINOR(plist, struct sta_info, hash_list);
if( ptdls_sta->tdls_sta_state & TDLS_LINKED_STATE )
if ( ptdls_sta->tdls_sta_state & TDLS_LINKED_STATE )
issue_nulldata_to_TDLS_peer_STA(padapter, ptdls_sta, 0);
plist = get_next(plist);
}
@ -573,7 +573,7 @@ _func_enter_;
#ifdef CONFIG_TDLS
_enter_critical_bh(&pstapriv->sta_hash_lock, &irqL);
for(i=0; i< NUM_STA; i++)
for (i=0; i< NUM_STA; i++)
{
phead = &(pstapriv->sta_hash[i]);
plist = get_next(phead);
@ -582,7 +582,7 @@ _func_enter_;
{
ptdls_sta = LIST_CONTAINOR(plist, struct sta_info, hash_list);
if( ptdls_sta->tdls_sta_state & TDLS_LINKED_STATE )
if ( ptdls_sta->tdls_sta_state & TDLS_LINKED_STATE )
issue_nulldata_to_TDLS_peer_STA(padapter, ptdls_sta, 1);
plist = get_next(plist);
}
@ -599,7 +599,7 @@ _func_enter_;
#ifdef CONFIG_P2P_PS
// Set CTWindow after LPS
if(pwdinfo->opp_ps == 1)
if (pwdinfo->opp_ps == 1)
p2p_ps_wk_cmd(padapter, P2P_PS_ENABLE, 0);
#endif //CONFIG_P2P_PS
@ -708,9 +708,9 @@ _func_enter_;
if (_TRUE == pwrpriv->bLeisurePs)
{
// Idle for a while if we connect to AP a while ago.
if(pwrpriv->LpsIdleCount >= 2) // 4 Sec
if (pwrpriv->LpsIdleCount >= 2) // 4 Sec
{
if(pwrpriv->pwr_mode == PS_MODE_ACTIVE)
if (pwrpriv->pwr_mode == PS_MODE_ACTIVE)
{
pwrpriv->bpower_saving = _TRUE;
DBG_871X("%s smart_ps:%d\n", __func__, pwrpriv->smart_ps);
@ -750,11 +750,11 @@ _func_enter_;
if (pwrpriv->bLeisurePs)
{
if(pwrpriv->pwr_mode != PS_MODE_ACTIVE)
if (pwrpriv->pwr_mode != PS_MODE_ACTIVE)
{
rtw_set_ps_mode(padapter, PS_MODE_ACTIVE, 0, 0);
if(pwrpriv->pwr_mode == PS_MODE_ACTIVE)
if (pwrpriv->pwr_mode == PS_MODE_ACTIVE)
LPS_RF_ON_check(padapter, LPS_LEAVE_TIMEOUT_MS);
}
}
@ -799,10 +799,10 @@ _func_enter_;
}
else
{
if(Adapter->pwrctrlpriv.rf_pwrstate== rf_off)
if (Adapter->pwrctrlpriv.rf_pwrstate== rf_off)
{
#ifdef CONFIG_AUTOSUSPEND
if(Adapter->registrypriv.usbss_enable)
if (Adapter->registrypriv.usbss_enable)
{
#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,35))
usb_disable_autosuspend(adapter_to_dvobj(Adapter)->pusbdev);
@ -815,7 +815,7 @@ _func_enter_;
{
#if defined(CONFIG_PLATFORM_SPRD) && defined(CONFIG_RTL8188E)
#ifdef CONFIG_IPS
if(_FALSE == ips_leave(Adapter))
if (_FALSE == ips_leave(Adapter))
{
DBG_871X("======> ips_leave fail.............\n");
}
@ -845,7 +845,7 @@ _func_enter_;
rtw_yield_os();
while(1)
while (1)
{
_enter_pwrlock(&pwrpriv->lock);
@ -862,10 +862,10 @@ _func_enter_;
_exit_pwrlock(&pwrpriv->lock);
if(_TRUE == bReady)
if (_TRUE == bReady)
break;
if(rtw_get_passing_time_ms(start_time)>100)
if (rtw_get_passing_time_ms(start_time)>100)
{
DBG_871X("Wait for cpwm event than 100 ms!!!\n");
break;
@ -1488,7 +1488,7 @@ static void rtw_late_resume(struct early_suspend *h)
_adapter *adapter = container_of(pwrpriv, _adapter, pwrctrlpriv);
DBG_871X("%s\n",__FUNCTION__);
if(pwrpriv->do_late_resume) {
if (pwrpriv->do_late_resume) {
#if defined(CONFIG_USB_HCI) || defined(CONFIG_SDIO_HCI) || defined(CONFIG_GSPI_HCI)
rtw_resume_process(adapter);
pwrpriv->do_late_resume = _FALSE;
@ -1542,7 +1542,7 @@ static void rtw_late_resume(android_early_suspend_t *h)
_adapter *adapter = container_of(pwrpriv, _adapter, pwrctrlpriv);
DBG_871X("%s\n",__FUNCTION__);
if(pwrpriv->do_late_resume) {
if (pwrpriv->do_late_resume) {
#if defined(CONFIG_USB_HCI) || defined(CONFIG_SDIO_HCI) || defined(CONFIG_GSPI_HCI)
rtw_resume_process(adapter);
pwrpriv->do_late_resume = _FALSE;
@ -1631,13 +1631,13 @@ int _rtw_pwr_wakeup(_adapter *padapter, u32 ips_deffer_ms, const char *caller)
}
//System suspend is not allowed to wakeup
if((pwrpriv->bInternalAutoSuspend == _FALSE) && (_TRUE == pwrpriv->bInSuspend )){
if ((pwrpriv->bInternalAutoSuspend == _FALSE) && (_TRUE == pwrpriv->bInSuspend )){
ret = _FAIL;
goto exit;
}
//block???
if((pwrpriv->bInternalAutoSuspend == _TRUE) && (padapter->net_closed == _TRUE)) {
if ((pwrpriv->bInternalAutoSuspend == _TRUE) && (padapter->net_closed == _TRUE)) {
ret = _FAIL;
goto exit;
}
@ -1646,8 +1646,8 @@ int _rtw_pwr_wakeup(_adapter *padapter, u32 ips_deffer_ms, const char *caller)
if (check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE)
{
#if defined (CONFIG_BT_COEXIST)&& defined (CONFIG_AUTOSUSPEND)
if(_TRUE==pwrpriv->bInternalAutoSuspend){
if(0==pwrpriv->autopm_cnt){
if (_TRUE==pwrpriv->bInternalAutoSuspend){
if (0==pwrpriv->autopm_cnt){
#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,33))
if (usb_autopm_get_interface(adapter_to_dvobj(padapter)->pusbintf) < 0)
{
@ -1667,20 +1667,20 @@ int _rtw_pwr_wakeup(_adapter *padapter, u32 ips_deffer_ms, const char *caller)
}
#endif //#if defined (CONFIG_BT_COEXIST)&& defined (CONFIG_AUTOSUSPEND)
}
if(rf_off == pwrpriv->rf_pwrstate )
if (rf_off == pwrpriv->rf_pwrstate )
{
#ifdef CONFIG_USB_HCI
#ifdef CONFIG_AUTOSUSPEND
if(pwrpriv->brfoffbyhw==_TRUE)
if (pwrpriv->brfoffbyhw==_TRUE)
{
DBG_8192C("hw still in rf_off state ...........\n");
ret = _FAIL;
goto exit;
}
else if(padapter->registrypriv.usbss_enable)
else if (padapter->registrypriv.usbss_enable)
{
DBG_8192C("%s call autoresume_enter....\n",__FUNCTION__);
if(_FAIL == autoresume_enter(padapter))
if (_FAIL == autoresume_enter(padapter))
{
DBG_8192C("======> autoresume fail.............\n");
ret = _FAIL;
@ -1693,7 +1693,7 @@ int _rtw_pwr_wakeup(_adapter *padapter, u32 ips_deffer_ms, const char *caller)
{
#ifdef CONFIG_IPS
DBG_8192C("%s call ips_leave....\n",__FUNCTION__);
if(_FAIL == ips_leave(padapter))
if (_FAIL == ips_leave(padapter))
{
DBG_8192C("======> ips_leave fail.............\n");
ret = _FAIL;
@ -1704,7 +1704,7 @@ int _rtw_pwr_wakeup(_adapter *padapter, u32 ips_deffer_ms, const char *caller)
}
//TODO: the following checking need to be merged...
if(padapter->bDriverStopped
if (padapter->bDriverStopped
|| !padapter->bup
|| !padapter->hw_init_completed
){
@ -1731,9 +1731,9 @@ int rtw_pm_set_lps(_adapter *padapter, u8 mode)
if ( mode < PS_MODE_NUM )
{
if(pwrctrlpriv->power_mgnt !=mode)
if (pwrctrlpriv->power_mgnt !=mode)
{
if(PS_MODE_ACTIVE == mode)
if (PS_MODE_ACTIVE == mode)
{
LeaveAllPowerSaveMode(padapter);
}
@ -1757,15 +1757,15 @@ int rtw_pm_set_ips(_adapter *padapter, u8 mode)
{
struct pwrctrl_priv *pwrctrlpriv = &padapter->pwrctrlpriv;
if( mode == IPS_NORMAL || mode == IPS_LEVEL_2 ) {
if ( mode == IPS_NORMAL || mode == IPS_LEVEL_2 ) {
rtw_ips_mode_req(pwrctrlpriv, mode);
DBG_871X("%s %s\n", __FUNCTION__, mode == IPS_NORMAL?"IPS_NORMAL":"IPS_LEVEL_2");
return 0;
}
else if(mode ==IPS_NONE){
else if (mode ==IPS_NONE){
rtw_ips_mode_req(pwrctrlpriv, mode);
DBG_871X("%s %s\n", __FUNCTION__, "IPS_NONE");
if((padapter->bSurpriseRemoved ==0)&&(_FAIL == rtw_pwr_wakeup(padapter)) )
if ((padapter->bSurpriseRemoved ==0)&&(_FAIL == rtw_pwr_wakeup(padapter)) )
return -EFAULT;
}
else {