staging: rtl8723bs: Initialize variables at declaration in rtl8723b_hal_init.c

Make the code more concise and readable by integrating the initialization
directly into the variable declaration in cases where the initialization
is simple and doesn't depend on other variables or complex expressions.

Signed-off-by: Erick Karanja <karanja99erick@gmail.com>
Link: https://lore.kernel.org/r/4d52a207eadd99ad998214aa8eb059f725c94802.1744268316.git.karanja99erick@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
index e15ec6452fd0619b5e13a7f32f077436f1667003..893cab0532ed0b3ac25bea94fc7159abac8f1dfa 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
@@ -501,8 +501,7 @@ void Hal_GetEfuseDefinition(
        switch (type) {
        case TYPE_EFUSE_MAX_SECTION:
                {
-                       u8 *pMax_section;
-                       pMax_section = pOut;
+                       u8 *pMax_section = pOut;
 
                        if (efuseType == EFUSE_WIFI)
                                *pMax_section = EFUSE_MAX_SECTION_8723B;
@@ -513,8 +512,7 @@ void Hal_GetEfuseDefinition(
 
        case TYPE_EFUSE_REAL_CONTENT_LEN:
                {
-                       u16 *pu2Tmp;
-                       pu2Tmp = pOut;
+                       u16 *pu2Tmp = pOut;
 
                        if (efuseType == EFUSE_WIFI)
                                *pu2Tmp = EFUSE_REAL_CONTENT_LEN_8723B;
@@ -525,8 +523,7 @@ void Hal_GetEfuseDefinition(
 
        case TYPE_AVAILABLE_EFUSE_BYTES_BANK:
                {
-                       u16 *pu2Tmp;
-                       pu2Tmp = pOut;
+                       u16 *pu2Tmp = pOut;
 
                        if (efuseType == EFUSE_WIFI)
                                *pu2Tmp = (EFUSE_REAL_CONTENT_LEN_8723B-EFUSE_OOB_PROTECT_BYTES);
@@ -537,8 +534,7 @@ void Hal_GetEfuseDefinition(
 
        case TYPE_AVAILABLE_EFUSE_BYTES_TOTAL:
                {
-                       u16 *pu2Tmp;
-                       pu2Tmp = pOut;
+                       u16 *pu2Tmp = pOut;
 
                        if (efuseType == EFUSE_WIFI)
                                *pu2Tmp = (EFUSE_REAL_CONTENT_LEN_8723B-EFUSE_OOB_PROTECT_BYTES);
@@ -549,8 +545,7 @@ void Hal_GetEfuseDefinition(
 
        case TYPE_EFUSE_MAP_LEN:
                {
-                       u16 *pu2Tmp;
-                       pu2Tmp = pOut;
+                       u16 *pu2Tmp = pOut;
 
                        if (efuseType == EFUSE_WIFI)
                                *pu2Tmp = EFUSE_MAX_MAP_LEN;
@@ -561,8 +556,7 @@ void Hal_GetEfuseDefinition(
 
        case TYPE_EFUSE_PROTECT_BYTES_BANK:
                {
-                       u8 *pu1Tmp;
-                       pu1Tmp = pOut;
+                       u8 *pu1Tmp = pOut;
 
                        if (efuseType == EFUSE_WIFI)
                                *pu1Tmp = EFUSE_OOB_PROTECT_BYTES;
@@ -573,8 +567,7 @@ void Hal_GetEfuseDefinition(
 
        case TYPE_EFUSE_CONTENT_LEN_BANK:
                {
-                       u16 *pu2Tmp;
-                       pu2Tmp = pOut;
+                       u16 *pu2Tmp = pOut;
 
                        if (efuseType == EFUSE_WIFI)
                                *pu2Tmp = EFUSE_REAL_CONTENT_LEN_8723B;
@@ -585,8 +578,7 @@ void Hal_GetEfuseDefinition(
 
        default:
                {
-                       u8 *pu1Tmp;
-                       pu1Tmp = pOut;
+                       u8 *pu1Tmp = pOut;
                        *pu1Tmp = 0;
                }
                break;
@@ -835,9 +827,8 @@ static void hal_ReadEFuse_BT(
                        }
 
                        if (offset < EFUSE_BT_MAX_SECTION) {
-                               u16 addr;
+                               u16 addr = offset * PGPKT_DATA_SIZE;
 
-                               addr = offset * PGPKT_DATA_SIZE;
                                for (i = 0; i < EFUSE_MAX_WORD_UNIT; i++) {
                                        /*  Check word enable condition in the section */
                                        if (!(wden & (0x01<<i))) {
@@ -1196,10 +1187,9 @@ void rtl8723b_InitBeaconParameters(struct adapter *padapter)
 {
        struct hal_com_data *pHalData = GET_HAL_DATA(padapter);
        u16 val16;
-       u8 val8;
+       u8 val8 = DIS_TSF_UDT;
 
 
-       val8 = DIS_TSF_UDT;
        val16 = val8 | (val8 << 8); /*  port0 and port1 */
 
        /*  Enable prot0 beacon function for PSTDMA */
@@ -1496,10 +1486,7 @@ s32 rtl8723b_InitLLTTable(struct adapter *padapter)
 {
        unsigned long start, passing_time;
        u32 val32;
-       s32 ret;
-
-
-       ret = _FAIL;
+       s32 ret = _FAIL;
 
        val32 = rtw_read32(padapter, REG_AUTO_LLT);
        val32 |= BIT_AUTO_INIT_LLT;
@@ -2273,9 +2260,8 @@ void rtl8723b_fill_fake_txdesc(
        /*  Encrypt the data frame if under security mode excepct null data. Suggested by CCW. */
        /*  */
        if (bDataFrame) {
-               u32 EncAlg;
+               u32 EncAlg = padapter->securitypriv.dot11PrivacyAlgrthm;
 
-               EncAlg = padapter->securitypriv.dot11PrivacyAlgrthm;
                switch (EncAlg) {
                case _NO_PRIVACY_:
                        SET_TX_DESC_SEC_TYPE_8723B(pDesc, 0x0);
@@ -2378,9 +2364,7 @@ static void hw_var_set_opmode(struct adapter *padapter, u8 variable, u8 *val)
 static void hw_var_set_macaddr(struct adapter *padapter, u8 variable, u8 *val)
 {
        u8 idx = 0;
-       u32 reg_macid;
-
-       reg_macid = REG_MACID;
+       u32 reg_macid = REG_MACID;
 
        for (idx = 0 ; idx < 6; idx++)
                rtw_write8(GET_PRIMARY_ADAPTER(padapter), (reg_macid+idx), val[idx]);
@@ -2389,9 +2373,7 @@ static void hw_var_set_macaddr(struct adapter *padapter, u8 variable, u8 *val)
 static void hw_var_set_bssid(struct adapter *padapter, u8 variable, u8 *val)
 {
        u8 idx = 0;
-       u32 reg_bssid;
-
-       reg_bssid = REG_BSSID;
+       u32 reg_bssid = REG_BSSID;
 
        for (idx = 0 ; idx < 6; idx++)
                rtw_write8(padapter, (reg_bssid+idx), val[idx]);
@@ -2399,9 +2381,7 @@ static void hw_var_set_bssid(struct adapter *padapter, u8 variable, u8 *val)
 
 static void hw_var_set_bcn_func(struct adapter *padapter, u8 variable, u8 *val)
 {
-       u32 bcn_ctrl_reg;
-
-       bcn_ctrl_reg = REG_BCN_CTRL;
+       u32 bcn_ctrl_reg = REG_BCN_CTRL;
 
        if (*(u8 *)val)
                rtw_write8(padapter, bcn_ctrl_reg, (EN_BCN_FUNCTION | EN_TXBCN_RPT));
@@ -2422,12 +2402,8 @@ static void hw_var_set_correct_tsf(struct adapter *padapter, u8 variable, u8 *va
 {
        u8 val8;
        u64 tsf;
-       struct mlme_ext_priv *pmlmeext;
-       struct mlme_ext_info *pmlmeinfo;
-
-
-       pmlmeext = &padapter->mlmeextpriv;
-       pmlmeinfo = &pmlmeext->mlmext_info;
+       struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
+       struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;
 
        tsf = pmlmeext->TSFValue-do_div(pmlmeext->TSFValue, (pmlmeinfo->bcn_interval*1024))-1024; /* us */
 
@@ -2543,15 +2519,12 @@ static void hw_var_set_mlme_join(struct adapter *padapter, u8 variable, u8 *val)
        u8 val8;
        u16 val16;
        u32 val32;
-       u8 RetryLimit;
-       u8 type;
-       struct mlme_priv *pmlmepriv;
+       u8 RetryLimit = 0x30;
+       u8 type = *(u8 *)val;
+       struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
        struct eeprom_priv *pEEPROM;
 
 
-       RetryLimit = 0x30;
-       type = *(u8 *)val;
-       pmlmepriv = &padapter->mlmepriv;
        pEEPROM = GET_EEPROM_EFUSE_PRIV(padapter);
 
        if (type == 0) { /*  prepare to join */
@@ -2850,12 +2823,11 @@ void SetHwReg8723B(struct adapter *padapter, u8 variable, u8 *val)
 
        case HW_VAR_ACK_PREAMBLE:
                {
-                       u8 regTmp;
+                       u8 regTmp = 0;
                        u8 bShortPreamble = *val;
 
                        /*  Joseph marked out for Netgear 3500 TKIP channel 7 issue.(Temporarily) */
                        /* regTmp = (pHalData->nCur40MhzPrimeSC)<<5; */
-                       regTmp = 0;
                        if (bShortPreamble)
                                regTmp |= 0x80;
                        rtw_write8(padapter, REG_RRSR+2, regTmp);
@@ -3226,9 +3198,7 @@ void GetHwReg8723B(struct adapter *padapter, u8 variable, u8 *val)
  */
 u8 SetHalDefVar8723B(struct adapter *padapter, enum hal_def_variable variable, void *pval)
 {
-       u8 bResult;
-
-       bResult = _SUCCESS;
+       u8 bResult = _SUCCESS;
 
        switch (variable) {
        default:
@@ -3244,9 +3214,7 @@ u8 SetHalDefVar8723B(struct adapter *padapter, enum hal_def_variable variable, v
  */
 u8 GetHalDefVar8723B(struct adapter *padapter, enum hal_def_variable variable, void *pval)
 {
-       u8 bResult;
-
-       bResult = _SUCCESS;
+       u8 bResult = _SUCCESS;
 
        switch (variable) {
        case HAL_DEF_MAX_RECVBUF_SZ:
@@ -3281,9 +3249,8 @@ u8 GetHalDefVar8723B(struct adapter *padapter, enum hal_def_variable variable, v
        case HW_DEF_RA_INFO_DUMP:
                {
                        u8 mac_id = *(u8 *)pval;
-                       u32 cmd;
+                       u32 cmd = 0x40000100 | mac_id;
 
-                       cmd = 0x40000100 | mac_id;
                        rtw_write32(padapter, REG_HMEBOX_DBG_2_8723B, cmd);
                        msleep(10);
                        rtw_read32(padapter, 0x2F0);    // info 1