mirror of https://gitee.com/openkylin/linux.git
Staging: rtl8723bs: os_de: if-else coding style issue
Coding style issues: This patch clears the checkpatch.pl "braces {} are not necessary for single statement blocks" and "else_should_follow_close_brace" warnings. Signed-off-by: John Oldman <john.oldman@polehill.co.uk> Link: https://lore.kernel.org/r/20200515165646.12867-1-john.oldman@polehill.co.uk Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
cef077e6aa
commit
addf21ea64
|
@ -1057,9 +1057,9 @@ static int pm_netdev_open(struct net_device *pnetdev, u8 bnormal)
|
|||
status = _netdev_open(pnetdev);
|
||||
mutex_unlock(&(adapter_to_dvobj(padapter)->hw_init_mutex));
|
||||
}
|
||||
}
|
||||
else
|
||||
} else {
|
||||
status = (_SUCCESS == ips_netdrv_open(padapter)) ? (0) : (-1);
|
||||
}
|
||||
|
||||
return status;
|
||||
}
|
||||
|
@ -1192,8 +1192,7 @@ void rtw_dev_unload(struct adapter *padapter)
|
|||
padapter->bup = false;
|
||||
|
||||
DBG_871X("<=== %s\n", __func__);
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
RT_TRACE(_module_hci_intfs_c_, _drv_notice_, ("%s: bup ==false\n", __func__));
|
||||
DBG_871X("%s: bup ==false\n", __func__);
|
||||
}
|
||||
|
@ -1223,8 +1222,7 @@ static int rtw_suspend_free_assoc_resource(struct adapter *padapter)
|
|||
rtw_disassoc_cmd(padapter, 0, false);
|
||||
/* s2-2. indicate disconnect to os */
|
||||
rtw_indicate_disconnect(padapter);
|
||||
}
|
||||
else if (check_fwstate(pmlmepriv, WIFI_AP_STATE)) {
|
||||
} else if (check_fwstate(pmlmepriv, WIFI_AP_STATE)) {
|
||||
rtw_sta_flush(padapter);
|
||||
}
|
||||
|
||||
|
@ -1270,9 +1268,8 @@ void rtw_suspend_wow(struct adapter *padapter)
|
|||
padapter->bDriverStopped = false; /* for 32k command */
|
||||
|
||||
/* 2. disable interrupt */
|
||||
if (padapter->intf_stop) {
|
||||
if (padapter->intf_stop)
|
||||
padapter->intf_stop(padapter);
|
||||
}
|
||||
|
||||
/* 2.1 clean interrupt */
|
||||
if (padapter->HalFunc.clear_interrupt)
|
||||
|
@ -1448,14 +1445,13 @@ int rtw_suspend_common(struct adapter *padapter)
|
|||
|
||||
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE) == true) {
|
||||
#ifdef CONFIG_WOWLAN
|
||||
if (check_fwstate(pmlmepriv, _FW_LINKED)) {
|
||||
if (check_fwstate(pmlmepriv, _FW_LINKED))
|
||||
pwrpriv->wowlan_mode = true;
|
||||
} else if (pwrpriv->wowlan_pno_enable == true) {
|
||||
else if (pwrpriv->wowlan_pno_enable == true)
|
||||
pwrpriv->wowlan_mode |= pwrpriv->wowlan_pno_enable;
|
||||
}
|
||||
|
||||
if (pwrpriv->wowlan_mode == true)
|
||||
rtw_suspend_wow(padapter);
|
||||
rtw_suspend_wow(padapter);
|
||||
else
|
||||
rtw_suspend_normal(padapter);
|
||||
|
||||
|
@ -1522,9 +1518,8 @@ int rtw_resume_process_wow(struct adapter *padapter)
|
|||
|
||||
pwrpriv->bFwCurrentInPSMode = false;
|
||||
|
||||
if (padapter->intf_stop) {
|
||||
if (padapter->intf_stop)
|
||||
padapter->intf_stop(padapter);
|
||||
}
|
||||
|
||||
if (padapter->HalFunc.clear_interrupt)
|
||||
padapter->HalFunc.clear_interrupt(padapter);
|
||||
|
@ -1541,18 +1536,15 @@ int rtw_resume_process_wow(struct adapter *padapter)
|
|||
padapter->HalFunc.SetHwRegHandler(padapter, HW_VAR_WOWLAN, (u8 *)&poidparam);
|
||||
|
||||
psta = rtw_get_stainfo(&padapter->stapriv, get_bssid(&padapter->mlmepriv));
|
||||
if (psta) {
|
||||
if (psta)
|
||||
set_sta_rate(padapter, psta);
|
||||
}
|
||||
|
||||
|
||||
padapter->bDriverStopped = false;
|
||||
DBG_871X("%s: wowmode resuming, DriverStopped:%d\n", __func__, padapter->bDriverStopped);
|
||||
rtw_start_drv_threads(padapter);
|
||||
|
||||
if (padapter->intf_start) {
|
||||
if (padapter->intf_start)
|
||||
padapter->intf_start(padapter);
|
||||
}
|
||||
|
||||
/* start netif queue */
|
||||
if (pnetdev) {
|
||||
|
@ -1656,9 +1648,8 @@ int rtw_resume_process_ap_wow(struct adapter *padapter)
|
|||
DBG_871X("%s: wowmode resuming, DriverStopped:%d\n", __func__, padapter->bDriverStopped);
|
||||
rtw_start_drv_threads(padapter);
|
||||
|
||||
if (padapter->intf_start) {
|
||||
if (padapter->intf_start)
|
||||
padapter->intf_start(padapter);
|
||||
}
|
||||
|
||||
/* start netif queue */
|
||||
if (pnetdev) {
|
||||
|
|
Loading…
Reference in New Issue