staging: rtl8188eu: refactor rtw_hal_antdiv_before_linked()
PATCH 2/5 staging: rtl8188eu: convert rtw_hal_antdiv_before_linked() to bool
In reply to Michael StraubeFunction rtw_hal_antdiv_before_linked() returns boolean values, so change the return type from u8 to bool.
--- drivers/staging/rtl8188eu/hal/rtl8188e_dm.c | 2 +- drivers/staging/rtl8188eu/include/hal_intf.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/staging/rtl8188eu/hal/rtl8188e_dm.c +1 -1
@@ -184,7 +184,7 @@ void rtw_hal_antdiv_rssi_compared(struct adapter *Adapter, struct wlan_bssid_ex }/* Add new function to reset the state of antenna diversity before link. */ -u8 rtw_hal_antdiv_before_linked (struct adapter *Adapter) +bool rtw_hal_antdiv_before_linked (struct adapter *Adapter) {struct odm_dm_struct *dm_odm = &Adapter->HalData->odmpriv;struct sw_ant_switch *dm_swat_tbl = &dm_odm->DM_SWAT_Table;
drivers/staging/rtl8188eu/include/hal_intf.h +1 -1
@@ -209,7 +209,7 @@ void rtw_hal_set_bwmode(struct adapter *padapter,void rtw_hal_set_chan (struct adapter *padapter,u8 channel);void rtw_hal_dm_watchdog (struct adapter *padapter); -u8 rtw_hal_antdiv_before_linked (struct adapter *padapter); +bool rtw_hal_antdiv_before_linked (struct adapter *padapter);void rtw_hal_antdiv_rssi_compared (struct adapter *padapter,struct wlan_bssid_ex *dst,struct wlan_bssid_ex *src);
Signature · 1 line
2.24.1
PATCH 1/5 staging: rtl8188eu: refactor rtw_hal_antdiv_before_linked()
Refactor rtw_hal_antdiv_before_linked() to clear checkpatch warnings.
WARNING: line over 80 characters
WARNING: else is not generally useful after a break or return
--- drivers/staging/rtl8188eu/hal/rtl8188e_dm.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-)
drivers/staging/rtl8188eu/hal/rtl8188e_dm.c +9 -8
@@ -197,15 +197,16 @@ u8 rtw_hal_antdiv_before_linked(struct adapter *Adapter)if (check_fwstate (pmlmepriv, _FW_LINKED))return false; -if (dm_swat_tbl->SWAS_NoLink_State ==0 ) { -/* switch channel */ - dm_swat_tbl->SWAS_NoLink_State =1 ; - dm_swat_tbl->CurAntenna = (dm_swat_tbl->CurAntenna == Antenna_A) ? Antenna_B : Antenna_A; - -rtw_antenna_select_cmd (Adapter, dm_swat_tbl->CurAntenna, false); -return true; - }else { +if (dm_swat_tbl->SWAS_NoLink_State !=0 ) { dm_swat_tbl->SWAS_NoLink_State =0 ;return false; } + +/* switch channel */ + dm_swat_tbl->SWAS_NoLink_State =1 ; + dm_swat_tbl->CurAntenna = (dm_swat_tbl->CurAntenna == Antenna_A) ? + Antenna_B : Antenna_A; + +rtw_antenna_select_cmd (Adapter, dm_swat_tbl->CurAntenna, false); +return true; }
Signature · 1 line
2.24.1
PATCH 5/5 staging: rtl8188eu: cleanup whitespace in rtl8188e_dm.c
Replace tabs with spaces and/or remove spaces to use typical kernel horizontal whitespace.
--- drivers/staging/rtl8188eu/hal/rtl8188e_dm.c | 44 ++++++++++----------- 1 file changed, 22 insertions(+), 22 deletions(-)
drivers/staging/rtl8188eu/hal/rtl8188e_dm.c +22 -22
@@ -21,7 +21,7 @@/* Initialize GPIO setting registers */ static void dm_InitGPIOSetting (struct adapter *Adapter) { -u8 tmp1byte; +u8 tmp1byte; tmp1byte =usb_read8 (Adapter,REG_GPIO_MUXCFG ); tmp1byte &= (GPIOSEL_GPIO | ~GPIOSEL_ENBT );
@@ -35,7 +35,7 @@ static void dm_InitGPIOSetting(struct adapter *Adapter)static void Init_ODM_ComInfo_88E (struct adapter *Adapter) {struct hal_data_8188e *hal_data = Adapter->HalData; -struct dm_priv *pdmpriv = &hal_data->dmpriv; +struct dm_priv *pdmpriv = &hal_data->dmpriv;struct odm_dm_struct *dm_odm = &hal_data->odmpriv;/* Init Value */
@@ -59,38 +59,38 @@ static void Init_ODM_ComInfo_88E(struct adapter *Adapter) dm_odm->BbSwingIdxOfdmCurrent =12 ; dm_odm->BbSwingFlagOfdm = false; - pdmpriv->InitODMFlag =ODM_RF_CALIBRATION | -ODM_RF_TX_PWR_TRACK ; + pdmpriv->InitODMFlag =ODM_RF_CALIBRATION | +ODM_RF_TX_PWR_TRACK ; dm_odm->SupportAbility = pdmpriv->InitODMFlag; }static void Update_ODM_ComInfo_88E (struct adapter *Adapter) { -struct mlme_ext_priv *pmlmeext = &Adapter->mlmeextpriv; -struct mlme_priv *pmlmepriv = &Adapter->mlmepriv; +struct mlme_ext_priv *pmlmeext = &Adapter->mlmeextpriv; +struct mlme_priv *pmlmepriv = &Adapter->mlmepriv;struct pwrctrl_priv *pwrctrlpriv = &Adapter->pwrctrlpriv;struct hal_data_8188e *hal_data = Adapter->HalData;struct odm_dm_struct *dm_odm = &hal_data->odmpriv; -struct dm_priv *pdmpriv = &hal_data->dmpriv; +struct dm_priv *pdmpriv = &hal_data->dmpriv;int i; - pdmpriv->InitODMFlag =ODM_BB_DIG | -ODM_BB_RA_MASK | -ODM_BB_DYNAMIC_TXPWR | -ODM_BB_FA_CNT | -ODM_BB_RSSI_MONITOR | -ODM_BB_CCK_PD | -ODM_BB_PWR_SAVE | -ODM_MAC_EDCA_TURBO | -ODM_RF_CALIBRATION | -ODM_RF_TX_PWR_TRACK ; + pdmpriv->InitODMFlag =ODM_BB_DIG | +ODM_BB_RA_MASK | +ODM_BB_DYNAMIC_TXPWR | +ODM_BB_FA_CNT | +ODM_BB_RSSI_MONITOR | +ODM_BB_CCK_PD | +ODM_BB_PWR_SAVE | +ODM_MAC_EDCA_TURBO | +ODM_RF_CALIBRATION | +ODM_RF_TX_PWR_TRACK ;if (hal_data->AntDivCfg) pdmpriv->InitODMFlag |=ODM_BB_ANT_DIV ;if (Adapter->registrypriv.mp_mode ==1 ) { - pdmpriv->InitODMFlag =ODM_RF_CALIBRATION | -ODM_RF_TX_PWR_TRACK ; + pdmpriv->InitODMFlag =ODM_RF_CALIBRATION | +ODM_RF_TX_PWR_TRACK ; } dm_odm->SupportAbility = pdmpriv->InitODMFlag;
@@ -123,7 +123,7 @@ static void Update_ODM_ComInfo_88E(struct adapter *Adapter)void rtl8188e_InitHalDm (struct adapter *Adapter) { -struct dm_priv *pdmpriv = &Adapter->HalData->dmpriv; +struct dm_priv *pdmpriv = &Adapter->HalData->dmpriv;struct odm_dm_struct *dm_odm = &Adapter->HalData->odmpriv;dm_InitGPIOSetting (Adapter);
@@ -167,7 +167,7 @@ void rtw_hal_dm_watchdog(struct adapter *Adapter)void rtw_hal_dm_init (struct adapter *Adapter) { -struct dm_priv *pdmpriv = &Adapter->HalData->dmpriv; +struct dm_priv *pdmpriv = &Adapter->HalData->dmpriv;struct odm_dm_struct *podmpriv = &Adapter->HalData->odmpriv;memset (pdmpriv,0 ,sizeof (struct dm_priv ));
@@ -185,7 +185,7 @@ void rtw_hal_antdiv_rssi_compared(struct adapter *Adapter,/* select optimum_antenna for before linked => For antenna * diversity */ -if (dst->Rssi >= src->Rssi) {/* keep org parameter */ +if (dst->Rssi >= src->Rssi) {/* keep org parameter */ src->Rssi = dst->Rssi; src->PhyInfo.Optimum_antenna = dst->PhyInfo.Optimum_antenna;
Signature · 1 line
2.24.1
PATCH 3/5 staging: rtl8188eu: cleanup long lines in rtl8188e_dm.c
In reply to Michael StraubeCleanup lines over 80 characters in rtl8188e_dm.c by adding appropriate line breaks.
--- drivers/staging/rtl8188eu/hal/rtl8188e_dm.c | 26 ++++++++++++++------- 1 file changed, 18 insertions(+), 8 deletions(-)
drivers/staging/rtl8188eu/hal/rtl8188e_dm.c +18 -8
@@ -51,8 +51,10 @@ static void Init_ODM_ComInfo_88E(struct adapter *Adapter) dm_odm->AntDivType = hal_data->TRxAntDivType; -/* Tx power tracking BB swing table. */ -/* The base index = 12. +((12-n)/2)dB 13~?? = decrease tx pwr by -((n-12)/2)dB */ +/* Tx power tracking BB swing table. +* The base index = +* 12. +((12-n)/2)dB 13~?? = decrease tx pwr by -((n-12)/2)dB +*/ dm_odm->BbSwingIdxOfdm =12 ;/* Set defalut value as index 12. */ dm_odm->BbSwingIdxOfdmCurrent =12 ; dm_odm->BbSwingFlagOfdm = false;
@@ -106,14 +108,17 @@ static void Update_ODM_ComInfo_88E(struct adapter *Adapter) dm_odm->pbPowerSaving = (bool *)&pwrctrlpriv->bpower_saving; dm_odm->AntDivType = hal_data->TRxAntDivType; -/* Tx power tracking BB swing table. */ -/* The base index = 12. +((12-n)/2)dB 13~?? = decrease tx pwr by -((n-12)/2)dB */ +/* Tx power tracking BB swing table. +* The base index = +* 12. +((12-n)/2)dB 13~?? = decrease tx pwr by -((n-12)/2)dB +*/ dm_odm->BbSwingIdxOfdm =12 ;/* Set defalut value as index 12. */ dm_odm->BbSwingIdxOfdmCurrent =12 ; dm_odm->BbSwingFlagOfdm = false;for (i =0 ; i <NUM_STA ; i++) -ODM_CmnInfoPtrArrayHook (dm_odm,ODM_CMNINFO_STA_STATUS , i,NULL ); +ODM_CmnInfoPtrArrayHook (dm_odm,ODM_CMNINFO_STA_STATUS , i, +NULL ); }void rtl8188e_InitHalDm (struct adapter *Adapter)
@@ -172,13 +177,18 @@ void rtw_hal_dm_init(struct adapter *Adapter)/* Add new function to reset the state of antenna diversity before link. */ /* Compare RSSI for deciding antenna */ -void rtw_hal_antdiv_rssi_compared (struct adapter *Adapter,struct wlan_bssid_ex *dst,struct wlan_bssid_ex *src) +void rtw_hal_antdiv_rssi_compared (struct adapter *Adapter, +struct wlan_bssid_ex *dst, +struct wlan_bssid_ex *src) {if (Adapter->HalData->AntDivCfg !=0 ) { -/* select optimum_antenna for before linked =>For antenna diversity */ +/* select optimum_antenna for before linked => For antenna +* diversity +*/ if (dst->Rssi >= src->Rssi) {/* keep org parameter */ src->Rssi = dst->Rssi; - src->PhyInfo.Optimum_antenna = dst->PhyInfo.Optimum_antenna; + src->PhyInfo.Optimum_antenna = + dst->PhyInfo.Optimum_antenna; } } }
Signature · 1 line
2.24.1
PATCH 4/5 staging: rtl8188eu: remove unnecessary parentheses in rtl8188e_dm.c
In reply to Michael StraubeRemove unnecessary parentheses reported by checkpatch.
--- drivers/staging/rtl8188eu/hal/rtl8188e_dm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/staging/rtl8188eu/hal/rtl8188e_dm.c +4 -4
@@ -36,7 +36,7 @@ static void Init_ODM_ComInfo_88E(struct adapter *Adapter) {struct hal_data_8188e *hal_data = Adapter->HalData;struct dm_priv *pdmpriv = &hal_data->dmpriv; -struct odm_dm_struct *dm_odm = &(hal_data->odmpriv); +struct odm_dm_struct *dm_odm = &hal_data->odmpriv;/* Init Value */ memset (dm_odm,0 ,sizeof (*dm_odm));
@@ -71,7 +71,7 @@ static void Update_ODM_ComInfo_88E(struct adapter *Adapter)struct mlme_priv *pmlmepriv = &Adapter->mlmepriv;struct pwrctrl_priv *pwrctrlpriv = &Adapter->pwrctrlpriv;struct hal_data_8188e *hal_data = Adapter->HalData; -struct odm_dm_struct *dm_odm = &(hal_data->odmpriv); +struct odm_dm_struct *dm_odm = &hal_data->odmpriv;struct dm_priv *pdmpriv = &hal_data->dmpriv;int i;
@@ -124,7 +124,7 @@ static void Update_ODM_ComInfo_88E(struct adapter *Adapter)void rtl8188e_InitHalDm (struct adapter *Adapter) {struct dm_priv *pdmpriv = &Adapter->HalData->dmpriv; -struct odm_dm_struct *dm_odm = &(Adapter->HalData->odmpriv); +struct odm_dm_struct *dm_odm = &Adapter->HalData->odmpriv;dm_InitGPIOSetting (Adapter); pdmpriv->DM_Type = DM_Type_ByDriver;
@@ -198,7 +198,7 @@ bool rtw_hal_antdiv_before_linked(struct adapter *Adapter) {struct odm_dm_struct *dm_odm = &Adapter->HalData->odmpriv;struct sw_ant_switch *dm_swat_tbl = &dm_odm->DM_SWAT_Table; -struct mlme_priv *pmlmepriv = &(Adapter->mlmepriv); +struct mlme_priv *pmlmepriv = &Adapter->mlmepriv;/* Condition that does not need to use antenna diversity. */ if (Adapter->HalData->AntDivCfg ==0 )
Signature · 1 line
2.24.1