net: rtl88xx: Fix build warnings with gcc-12

The gcc-12 has -Wmisleading-indentation and -Waddress warnings.
Fix those build warnings.

Change-Id: I7a647b612f131061a429e6c7756ae104e855f507
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>

diff --git a/drivers/net/wireless/rtl8188eu/core/rtw_mlme.c b/drivers/net/wireless/rtl8188eu/core/rtw_mlme.c
index a30c2bd..5eeab4e 100644 (file)
--- a/drivers/net/wireless/rtl8188eu/core/rtw_mlme.c
+++ b/drivers/net/wireless/rtl8188eu/core/rtw_mlme.c
@@ -1654,7 +1654,7 @@ static int rtw_check_join_candidate(struct mlme_priv *pmlmepriv
        }
 
        /* check ssid, if needed */
-       if (pmlmepriv->assoc_ssid.Ssid && pmlmepriv->assoc_ssid.SsidLength) {
+       if (pmlmepriv->assoc_ssid.Ssid[0] && pmlmepriv->assoc_ssid.SsidLength) {
                if (competitor->network.Ssid.SsidLength != pmlmepriv->assoc_ssid.SsidLength ||
                    memcmp(competitor->network.Ssid.Ssid, pmlmepriv->assoc_ssid.Ssid, pmlmepriv->assoc_ssid.SsidLength))
                        goto exit;

diff --git a/drivers/net/wireless/rtl8188eu/core/rtw_sta_mgt.c b/drivers/net/wireless/rtl8188eu/core/rtw_sta_mgt.c
index 30a1dd3..e3c65c8 100644 (file)
--- a/drivers/net/wireless/rtl8188eu/core/rtw_sta_mgt.c
+++ b/drivers/net/wireless/rtl8188eu/core/rtw_sta_mgt.c
@@ -169,8 +169,7 @@ void rtw_mfree_stainfo(struct sta_info *psta);
 void rtw_mfree_stainfo(struct sta_info *psta)
 {
 
-       if (&psta->lock != NULL)
-                _rtw_spinlock_free(&psta->lock);
+        _rtw_spinlock_free(&psta->lock);
 
        _rtw_free_sta_xmit_priv_lock(&psta->sta_xmitpriv);
        _rtw_free_sta_recv_priv_lock(&psta->sta_recvpriv);

diff --git a/drivers/net/wireless/rtl8192cu/core/rtw_sta_mgt.c b/drivers/net/wireless/rtl8192cu/core/rtw_sta_mgt.c
index f818a0c..d78796e 100644 (file)
--- a/drivers/net/wireless/rtl8192cu/core/rtw_sta_mgt.c
+++ b/drivers/net/wireless/rtl8192cu/core/rtw_sta_mgt.c
@@ -212,8 +212,7 @@ void rtw_mfree_stainfo(struct sta_info *psta)
 {
 _func_enter_;
 
-       if(&psta->lock != NULL)
-                _rtw_spinlock_free(&psta->lock);
+        _rtw_spinlock_free(&psta->lock);
 
        _rtw_free_sta_xmit_priv_lock(&psta->sta_xmitpriv);
        _rtw_free_sta_recv_priv_lock(&psta->sta_recvpriv);

diff --git a/drivers/net/wireless/rtl8812au/core/efuse/rtw_efuse.c b/drivers/net/wireless/rtl8812au/core/efuse/rtw_efuse.c
index 44d8ac4..49ed2e4 100644 (file)
--- a/drivers/net/wireless/rtl8812au/core/efuse/rtw_efuse.c
+++ b/drivers/net/wireless/rtl8812au/core/efuse/rtw_efuse.c
@@ -780,11 +780,11 @@ void rtw_efuse_analyze(PADAPTER   padapter, u8 Type, u8 Fake)
        for (i = 0; i < mapLen; i++) {
                if (i % 16 == 0)
                        RTW_PRINT_SEL(RTW_DBGDUMP, "0x%03x: ", i);
-                       _RTW_PRINT_SEL(RTW_DBGDUMP, "%02X%s"
-                               , pEfuseHal->fakeEfuseInitMap[i]
-                               , ((i + 1) % 16 == 0) ? "\n" : (((i + 1) % 8 == 0) ? "    " : " ")
+               _RTW_PRINT_SEL(RTW_DBGDUMP, "%02X%s"
+                       , pEfuseHal->fakeEfuseInitMap[i]
+                       , ((i + 1) % 16 == 0) ? "\n" : (((i + 1) % 8 == 0) ? "    " : " ")
                        );
-               }
+       }
        _RTW_PRINT_SEL(RTW_DBGDUMP, "\n");
 
 out_free_buffer:

diff --git a/drivers/net/wireless/rtl8812au/core/rtw_ap.c b/drivers/net/wireless/rtl8812au/core/rtw_ap.c
index bc78e9c..859bac1 100644 (file)
--- a/drivers/net/wireless/rtl8812au/core/rtw_ap.c
+++ b/drivers/net/wireless/rtl8812au/core/rtw_ap.c
@@ -4442,7 +4442,7 @@ static u8 rtw_ap_update_chbw_by_ifbmp(struct dvobj_priv *dvobj, u8 ifbmp
        int i;
 
        for (i = 0; i < dvobj->iface_nums; i++) {
-               if (!(ifbmp & BIT(i)) || !dvobj->padapters)
+               if (!(ifbmp & BIT(i)) || !dvobj->padapters[i])
                        continue;
 
                iface = dvobj->padapters[i];
@@ -4462,7 +4462,7 @@ static u8 rtw_ap_update_chbw_by_ifbmp(struct dvobj_priv *dvobj, u8 ifbmp
        }
 
        for (i = 0; i < dvobj->iface_nums; i++) {
-               if (!(ifbmp & BIT(i)) || !dvobj->padapters)
+               if (!(ifbmp & BIT(i)) || !dvobj->padapters[i])
                        continue;
 
                iface = dvobj->padapters[i];
@@ -4630,7 +4630,7 @@ u8 rtw_ap_chbw_decision(_adapter *adapter, u8 ifbmp, u8 excl_ifbmp
 
 #ifdef CONFIG_RTW_MESH
        for (i = 0; i < dvobj->iface_nums; i++)
-               if ((ifbmp & BIT(i)) && dvobj->padapters)
+               if ((ifbmp & BIT(i)) && dvobj->padapters[i])
                        if (!MLME_IS_MESH(dvobj->padapters[i]))
                                break;
        ifbmp_all_mesh = i >= dvobj->iface_nums ? 1 : 0;

diff --git a/drivers/net/wireless/rtl8812au/core/rtw_mlme.c b/drivers/net/wireless/rtl8812au/core/rtw_mlme.c
index 8cc28c6..161dbfd 100644 (file)
--- a/drivers/net/wireless/rtl8812au/core/rtw_mlme.c
+++ b/drivers/net/wireless/rtl8812au/core/rtw_mlme.c
@@ -3191,12 +3191,14 @@ void rtw_drv_scan_by_self(_adapter *padapter, u8 reason)
        ssc_chk = rtw_sitesurvey_condition_check(padapter, _FALSE);
        if( ssc_chk == SS_DENY_BUSY_TRAFFIC) {
                #ifdef CONFIG_LAYER2_ROAMING
-               if (rtw_chk_roam_flags(padapter, RTW_ROAM_ACTIVE) && pmlmepriv->need_to_roam == _TRUE)
+               if (rtw_chk_roam_flags(padapter, RTW_ROAM_ACTIVE) && pmlmepriv->need_to_roam == _TRUE) {
                        RTW_INFO(FUNC_ADPT_FMT" need to roam, don't care BusyTraffic\n", FUNC_ADPT_ARG(padapter));
-               else
+               } else
                #endif
+               {
                        RTW_INFO(FUNC_ADPT_FMT" exit BusyTraffic\n", FUNC_ADPT_ARG(padapter));
                        goto exit;
+               }
        }
        else if (ssc_chk != SS_ALLOW)
                goto exit;

diff --git a/drivers/net/wireless/rtl8812au/core/rtw_mlme_ext.c b/drivers/net/wireless/rtl8812au/core/rtw_mlme_ext.c
index 01136fb..e8f6f00 100644 (file)
--- a/drivers/net/wireless/rtl8812au/core/rtw_mlme_ext.c
+++ b/drivers/net/wireless/rtl8812au/core/rtw_mlme_ext.c
@@ -8971,7 +8971,7 @@ static u32 rtw_append_assoc_req_owe_ie(_adapter *adapter, u8 *pbuf)
        if (sec == NULL)
                goto exit;
 
-       if (sec->owe_ie && sec->owe_ie_len > 0) {
+       if (sec->owe_ie_len > 0) {
                len = sec->owe_ie_len;
                _rtw_memcpy(pbuf, sec->owe_ie, len);
        }

diff --git a/drivers/net/wireless/rtl8812au/core/rtw_rf.c b/drivers/net/wireless/rtl8812au/core/rtw_rf.c
index ab4c318..f655cdf 100644 (file)
--- a/drivers/net/wireless/rtl8812au/core/rtw_rf.c
+++ b/drivers/net/wireless/rtl8812au/core/rtw_rf.c
@@ -762,9 +762,10 @@ void dump_txpwr_lmt(void *sel, _adapter *adapter)
 
        RTW_PRINT_SEL(sel, "txpwr_lmt_2g_cck_ofdm_state:0x%02x\n", rfctl->txpwr_lmt_2g_cck_ofdm_state);
        #ifdef CONFIG_IEEE80211_BAND_5GHZ
-       if (IS_HARDWARE_TYPE_JAGUAR_AND_JAGUAR2(adapter))
+       if (IS_HARDWARE_TYPE_JAGUAR_AND_JAGUAR2(adapter)) {
                RTW_PRINT_SEL(sel, "txpwr_lmt_5g_cck_ofdm_state:0x%02x\n", rfctl->txpwr_lmt_5g_cck_ofdm_state);
                RTW_PRINT_SEL(sel, "txpwr_lmt_5g_20_40_ref:0x%02x\n", rfctl->txpwr_lmt_5g_20_40_ref);
+       }
        #endif
        RTW_PRINT_SEL(sel, "\n");
 

diff --git a/drivers/net/wireless/rtl8812au/core/rtw_sta_mgt.c b/drivers/net/wireless/rtl8812au/core/rtw_sta_mgt.c
index f8c390d..a6f2cd0 100644 (file)
--- a/drivers/net/wireless/rtl8812au/core/rtw_sta_mgt.c
+++ b/drivers/net/wireless/rtl8812au/core/rtw_sta_mgt.c
@@ -369,8 +369,7 @@ void rtw_mfree_stainfo(struct sta_info *psta);
 void rtw_mfree_stainfo(struct sta_info *psta)
 {
 
-       if (&psta->lock != NULL)
-               _rtw_spinlock_free(&psta->lock);
+       _rtw_spinlock_free(&psta->lock);
 
        _rtw_free_sta_xmit_priv_lock(&psta->sta_xmitpriv);
        _rtw_free_sta_recv_priv_lock(&psta->sta_recvpriv);

diff --git a/drivers/net/wireless/rtl8812au/core/rtw_wlan_util.c b/drivers/net/wireless/rtl8812au/core/rtw_wlan_util.c
index b4cecd1..a90f8c0 100644 (file)
--- a/drivers/net/wireless/rtl8812au/core/rtw_wlan_util.c
+++ b/drivers/net/wireless/rtl8812au/core/rtw_wlan_util.c
@@ -3226,7 +3226,7 @@ void rtw_parse_sta_vendor_ie_8812(_adapter *adapter, struct sta_info *sta, u8 *t
                if(*(p+1) > 6 ) {
                        for(i=0; i<9;i++)
                                RTW_INFO("p[%d]=0x%x",i,*(p+i) );
-                               RTW_INFO("\n");
+                       RTW_INFO("\n");
                        if(*(p+6) != 2)
                                goto exit;
                        

diff --git a/drivers/net/wireless/rtl8812au/hal/phydm/halrf/halrf.c b/drivers/net/wireless/rtl8812au/hal/phydm/halrf/halrf.c
index 32fd1f3..77d20f0 100644 (file)
--- a/drivers/net/wireless/rtl8812au/hal/phydm/halrf/halrf.c
+++ b/drivers/net/wireless/rtl8812au/hal/phydm/halrf/halrf.c
@@ -926,8 +926,7 @@ void halrf_support_ability_debug(void *dm_void, char input[][16], u32 *_used,
        u8 i;
 
        for (i = 0; i < 5; i++)
-               if (input[i + 1])
-                       PHYDM_SSCANF(input[i + 2], DCMD_DECIMAL, &dm_value[i]);
+               PHYDM_SSCANF(input[i + 2], DCMD_DECIMAL, &dm_value[i]);
 
        if (dm_value[0] == 100) {
                PDM_SNPF(out_len, used, output + used, out_len - used,
@@ -987,8 +986,7 @@ void halrf_support_band_shift_debug(void *dm_void, char input[][16], u32 *_used,
 
 #if (RTL8192F_SUPPORT == 1)
        for (i = 0; i < 7; i++)
-               if (input[i + 1])
-                       PHYDM_SSCANF(input[i + 2], DCMD_DECIMAL, &dm_value[i]);
+               PHYDM_SSCANF(input[i + 2], DCMD_DECIMAL, &dm_value[i]);
 
        if (!(rf->rf_supportability & HAL_2GBAND_SHIFT)) {
                PDM_SNPF(out_len, used, output + used, out_len - used,

diff --git a/drivers/net/wireless/rtl8812au/hal/phydm/halrf/halrf_debug.c b/drivers/net/wireless/rtl8812au/hal/phydm/halrf/halrf_debug.c
index 85a7cb2..e83e8f2 100644 (file)
--- a/drivers/net/wireless/rtl8812au/hal/phydm/halrf/halrf_debug.c
+++ b/drivers/net/wireless/rtl8812au/hal/phydm/halrf/halrf_debug.c
@@ -77,8 +77,7 @@ void halrf_debug_trace(void *dm_void, char input[][16], u32 *_used,
        u8 i;
 
        for (i = 0; i < 5; i++)
-               if (input[i + 1])
-                       PHYDM_SSCANF(input[i + 2], DCMD_DECIMAL, &rf_var[i]);
+               PHYDM_SSCANF(input[i + 2], DCMD_DECIMAL, &rf_var[i]);
 
        if (rf_var[0] == 100) {
                PDM_SNPF(out_len, used, output + used, out_len - used,
@@ -220,11 +219,9 @@ void halrf_cmd_parser(void *dm_void, char input[][16], u32 *_used, char *output,
        case HALRF_IQK_DEBUG:
 
                for (i = 0; i < 5; i++) {
-                       if (input[i + 1]) {
-                               PHYDM_SSCANF(input[i + 2], DCMD_HEX,
-                                            &rf_var[i]);
-                               input_idx++;
-                       }
+                       PHYDM_SSCANF(input[i + 2], DCMD_HEX,
+                                    &rf_var[i]);
+                       input_idx++;
                }
 
                if (input_idx >= 1) {

diff --git a/drivers/net/wireless/rtl8812au/hal/phydm/phydm.c b/drivers/net/wireless/rtl8812au/hal/phydm/phydm.c
index 1e98063..56e48a7 100644 (file)
--- a/drivers/net/wireless/rtl8812au/hal/phydm/phydm.c
+++ b/drivers/net/wireless/rtl8812au/hal/phydm/phydm.c
@@ -1545,10 +1545,8 @@ void phydm_supportability_en(void *dm_void, char input[][16], u32 *_used,
        u32 out_len = *_out_len;
        u8 i;
 
-       for (i = 0; i < 5; i++) {
-               if (input[i + 1])
-                       PHYDM_SSCANF(input[i + 1], DCMD_DECIMAL, &dm_value[i]);
-       }
+       for (i = 0; i < 5; i++)
+               PHYDM_SSCANF(input[i + 1], DCMD_DECIMAL, &dm_value[i]);
 
        pre_support_ability = dm->support_ability;
        comp = dm->support_ability;
@@ -1913,10 +1911,8 @@ void phydm_pause_func_console(void *dm_void, char input[][16], u32 *_used,
                goto out;
        }
 
-       for (i = 0; i < 10; i++) {
-               if (input[i + 1])
+       for (i = 0; i < 10; i++)
                        PHYDM_SSCANF(input[i + 1], DCMD_HEX, &var1[i]);
-       }
 
        func = (enum phydm_func_idx)var1[0];
        type = (enum phydm_pause_type)var1[1];

diff --git a/drivers/net/wireless/rtl8812au/hal/phydm/phydm_adaptivity.c b/drivers/net/wireless/rtl8812au/hal/phydm/phydm_adaptivity.c
index 0869036..1e0368e 100644 (file)
--- a/drivers/net/wireless/rtl8812au/hal/phydm/phydm_adaptivity.c
+++ b/drivers/net/wireless/rtl8812au/hal/phydm/phydm_adaptivity.c
@@ -362,10 +362,8 @@ void phydm_adaptivity_debug(void *dm_void, char input[][16], u32 *_used,
        s8 h2l_diff = 0;
 
        for (i = 0; i < 5; i++) {
-               if (input[i + 1]) {
-                       PHYDM_SSCANF(input[i + 1], DCMD_HEX, &dm_value[i]);
-                       input_idx++;
-               }
+               PHYDM_SSCANF(input[i + 1], DCMD_HEX, &dm_value[i]);
+               input_idx++;
        }
        if (strcmp(input[1], help) == 0) {
                PDM_SNPF(out_len, used, output + used, out_len - used,

diff --git a/drivers/net/wireless/rtl8812au/hal/phydm/phydm_antdiv.c b/drivers/net/wireless/rtl8812au/hal/phydm/phydm_antdiv.c
index 702406e..0f992b0 100644 (file)
--- a/drivers/net/wireless/rtl8812au/hal/phydm/phydm_antdiv.c
+++ b/drivers/net/wireless/rtl8812au/hal/phydm/phydm_antdiv.c
@@ -5709,10 +5709,8 @@ void phydm_antdiv_debug(void *dm_void, char input[][16], u32 *_used,
        u8 i, input_idx = 0;
 
        for (i = 0; i < 5; i++) {
-               if (input[i + 1]) {
-                       PHYDM_SSCANF(input[i + 1], DCMD_HEX, &dm_value[i]);
-                       input_idx++;
-               }
+               PHYDM_SSCANF(input[i + 1], DCMD_HEX, &dm_value[i]);
+               input_idx++;
        }
 
        if (input_idx == 0)

diff --git a/drivers/net/wireless/rtl8812au/hal/phydm/phydm_api.c b/drivers/net/wireless/rtl8812au/hal/phydm/phydm_api.c
index f84279c..40ea49d 100644 (file)
--- a/drivers/net/wireless/rtl8812au/hal/phydm/phydm_api.c
+++ b/drivers/net/wireless/rtl8812au/hal/phydm/phydm_api.c
@@ -509,10 +509,8 @@ void phydm_config_trx_path_v2(void *dm_void, char input[][16], u32 *_used,
                return;
 
        for (i = 0; i < 5; i++) {
-               if (input[i + 1]) {
-                       PHYDM_SSCANF(input[i + 1], DCMD_HEX, &val[i]);
-                       input_idx++;
-               }
+               PHYDM_SSCANF(input[i + 1], DCMD_HEX, &val[i]);
+               input_idx++;
        }
 
        if (input_idx == 0)
@@ -557,10 +555,8 @@ void phydm_config_trx_path_v1(void *dm_void, char input[][16], u32 *_used,
                return;
 
        for (i = 0; i < 5; i++) {
-               if (input[i + 1]) {
-                       PHYDM_SSCANF(input[i + 1], DCMD_HEX, &val[i]);
-                       input_idx++;
-               }
+               PHYDM_SSCANF(input[i + 1], DCMD_HEX, &val[i]);
+               input_idx++;
        }
 
        if (input_idx == 0)
@@ -1850,10 +1846,8 @@ void phydm_nbi_debug(void *dm_void, char input[][16], u32 *_used, char *output,
        else
                idx_lmt = 5;
        for (i = 0; i < idx_lmt; i++) {
-               if (input[i + 1]) {
-                       PHYDM_SSCANF(input[i + 1], DCMD_DECIMAL, &val[i]);
-                       input_idx++;
-               }
+               PHYDM_SSCANF(input[i + 1], DCMD_DECIMAL, &val[i]);
+               input_idx++;
        }
 
        if (input_idx == 0)
@@ -1942,10 +1936,8 @@ void phydm_csi_debug(void *dm_void, char input[][16], u32 *_used, char *output,
                idx_lmt = 5;
 
        for (i = 0; i < idx_lmt; i++) {
-               if (input[i + 1]) {
-                       PHYDM_SSCANF(input[i + 1], DCMD_DECIMAL, &val[i]);
-                       input_idx++;
-               }
+               PHYDM_SSCANF(input[i + 1], DCMD_DECIMAL, &val[i]);
+               input_idx++;
        }
 
        if (input_idx == 0)

diff --git a/drivers/net/wireless/rtl8812au/hal/phydm/phydm_ccx.c b/drivers/net/wireless/rtl8812au/hal/phydm/phydm_ccx.c
index f9ea9bb..030a242 100644 (file)
--- a/drivers/net/wireless/rtl8812au/hal/phydm/phydm_ccx.c
+++ b/drivers/net/wireless/rtl8812au/hal/phydm/phydm_ccx.c
@@ -291,10 +291,8 @@ void phydm_fahm_dbg(void *dm_void, char input[][16], u32 *_used, char *output,
        u32 out_len = *_out_len;
        u32 i;
 
-       for (i = 0; i < 2; i++) {
-               if (input[i + 1])
-                       PHYDM_SSCANF(input[i + 1], DCMD_DECIMAL, &var1[i]);
-       }
+       for (i = 0; i < 2; i++)
+               PHYDM_SSCANF(input[i + 1], DCMD_DECIMAL, &var1[i]);
 
        if ((strcmp(input[1], help) == 0)) {
                PDM_SNPF(out_len, used, output + used, out_len - used,
@@ -1011,12 +1009,8 @@ void phydm_nhm_dbg(void *dm_void, char input[][16], u32 *_used, char *output,
 
                ccx->nhm_manual_ctrl = 1;
 
-               for (i = 1; i < 7; i++) {
-                       if (input[i + 1]) {
-                               PHYDM_SSCANF(input[i + 1], DCMD_DECIMAL,
-                                            &var1[i]);
-                       }
-               }
+               for (i = 1; i < 7; i++)
+                       PHYDM_SSCANF(input[i + 1], DCMD_DECIMAL, &var1[i]);
 
                if (var1[0] == 1) {
                        nhm_para.incld_txon = NHM_EXCLUDE_TXON;
@@ -1467,10 +1461,8 @@ void phydm_clm_dbg(void *dm_void, char input[][16], u32 *_used, char *output,
        struct clm_para_info clm_para = {0};
        u32 i;
 
-       for (i = 0; i < 4; i++) {
-               if (input[i + 1])
-                       PHYDM_SSCANF(input[i + 1], DCMD_DECIMAL, &var1[i]);
-       }
+       for (i = 0; i < 4; i++)
+               PHYDM_SSCANF(input[i + 1], DCMD_DECIMAL, &var1[i]);
 
        if ((strcmp(input[1], help) == 0)) {
                PDM_SNPF(out_len, used, output + used, out_len - used,

diff --git a/drivers/net/wireless/rtl8812au/hal/phydm/phydm_debug.c b/drivers/net/wireless/rtl8812au/hal/phydm/phydm_debug.c
index 57d24e0..af491d4 100644 (file)
--- a/drivers/net/wireless/rtl8812au/hal/phydm/phydm_debug.c
+++ b/drivers/net/wireless/rtl8812au/hal/phydm/phydm_debug.c
@@ -2861,10 +2861,8 @@ void phydm_set_txagc_dbg(void *dm_void, char input[][16], u32 *_used,
        u8 i = 0, input_idx = 0;
 
        for (i = 0; i < 5; i++) {
-               if (input[i + 1]) {
-                       PHYDM_SSCANF(input[i + 1], DCMD_HEX, &var1[i]);
-                       input_idx++;
-               }
+               PHYDM_SSCANF(input[i + 1], DCMD_HEX, &var1[i]);
+               input_idx++;
        }
 
        if ((strcmp(input[1], help) == 0)) {
@@ -2902,10 +2900,8 @@ void phydm_debug_trace(void *dm_void, char input[][16], u32 *_used,
        u32 val[10] = {0};
        u8 i;
 
-       for (i = 0; i < 5; i++) {
-               if (input[i + 1])
-                       PHYDM_SSCANF(input[i + 1], DCMD_DECIMAL, &val[i]);
-       }
+       for (i = 0; i < 5; i++)
+               PHYDM_SSCANF(input[i + 1], DCMD_DECIMAL, &val[i]);
        comp = dm->debug_components;
        pre_debug_components = dm->debug_components;
 
@@ -3060,10 +3056,8 @@ void phydm_fw_debug_trace(void *dm_void, char input[][16], u32 *_used,
        u32 comp = 0;
 
        for (i = 0; i < 5; i++) {
-               if (input[i + 1]) {
-                       PHYDM_SSCANF(input[i + 1], DCMD_DECIMAL, &val[i]);
-                       input_idx++;
-               }
+               PHYDM_SSCANF(input[i + 1], DCMD_DECIMAL, &val[i]);
+               input_idx++;
        }
 
        if (input_idx == 0)
@@ -3376,8 +3370,7 @@ void phydm_dump_reg(void *dm_void, char input[][16], u32 *_used, char *output,
        u32 out_len = *_out_len;
        u32 addr = 0;
 
-       if (input[1])
-               PHYDM_SSCANF(input[1], DCMD_DECIMAL, &var1[0]);
+       PHYDM_SSCANF(input[1], DCMD_DECIMAL, &var1[0]);
 
        if ((strcmp(input[1], help) == 0)) {
                #ifdef PHYDM_IC_JGR3_SERIES_SUPPORT
@@ -3430,10 +3423,8 @@ void phydm_enable_big_jump(void *dm_void, char input[][16], u32 *_used,
                return;
 
        for (i = 0; i < 5; i++) {
-               if (input[i + 1]) {
-                       PHYDM_SSCANF(input[i + 1], DCMD_HEX, &dm_value[i]);
-                       input_idx++;
-               }
+               PHYDM_SSCANF(input[i + 1], DCMD_HEX, &dm_value[i]);
+               input_idx++;
        }
 
        if (input_idx == 0)
@@ -3467,10 +3458,8 @@ void phydm_show_rx_rate(void *dm_void, char input[][16], u32 *_used,
        u8 i, input_idx = 0;
 
        for (i = 0; i < 5; i++) {
-               if (input[i + 1]) {
-                       PHYDM_SSCANF(input[i + 1], DCMD_HEX, &var1[i]);
-                       input_idx++;
-               }
+               PHYDM_SSCANF(input[i + 1], DCMD_HEX, &var1[i]);
+               input_idx++;
        }
 
        if (input_idx == 0)
@@ -3559,10 +3548,8 @@ void phydm_per_tone_evm(void *dm_void, char input[][16], u32 *_used,
                return;
        }
 
-       for (i = 0; i < 4; i++) {
-               if (input[i + 1])
-                       PHYDM_SSCANF(input[i + 1], DCMD_DECIMAL, &var1[i]);
-       }
+       for (i = 0; i < 4; i++)
+               PHYDM_SSCANF(input[i + 1], DCMD_DECIMAL, &var1[i]);
 
        avg_num = var1[0];
        round = var1[1];
@@ -3781,10 +3768,8 @@ void phydm_bw_ch_adjust(void *dm_void, char input[][16],
                goto out;
        }
 
-       for (i = 0; i < 4; i++) {
-               if (input[i + 1])
-                       PHYDM_SSCANF(input[i + 1], DCMD_DECIMAL, &var1[i]);
-       }
+       for (i = 0; i < 4; i++)
+               PHYDM_SSCANF(input[i + 1], DCMD_DECIMAL, &var1[i]);
 
        is_enable_dbg_mode = (boolean)var1[0];
        central_ch = (u8)var1[1];
@@ -3814,10 +3799,8 @@ void phydm_ext_rf_element_ctrl(void *dm_void, char input[][16], u32 *_used,
        u8 i = 0, input_idx = 0;
 
        for (i = 0; i < 5; i++) {
-               if (input[i + 1]) {
-                       PHYDM_SSCANF(input[i + 1], DCMD_DECIMAL, &val[i]);
-                       input_idx++;
-               }
+               PHYDM_SSCANF(input[i + 1], DCMD_DECIMAL, &val[i]);
+               input_idx++;
        }
 
        if (input_idx == 0)
@@ -4240,8 +4223,7 @@ void phydm_cmd_parser(struct dm_struct *dm, char input[][MAX_ARGV],
                break;
 
        case PHYDM_DIS_HTSTF_CONTROL: {
-               if (input[1])
-                       PHYDM_SSCANF(input[1], DCMD_DECIMAL, &var1[0]);
+               PHYDM_SSCANF(input[1], DCMD_DECIMAL, &var1[0]);
 
                if (var1[0] == 1) {
                        /* setting being false is for debug */

diff --git a/drivers/net/wireless/rtl8812au/hal/phydm/phydm_dfs.c b/drivers/net/wireless/rtl8812au/hal/phydm/phydm_dfs.c
index 39c3879..4a787f1 100644 (file)
--- a/drivers/net/wireless/rtl8812au/hal/phydm/phydm_dfs.c
+++ b/drivers/net/wireless/rtl8812au/hal/phydm/phydm_dfs.c
@@ -2048,7 +2048,7 @@ void phydm_dfs_hist_dbg(void *dm_void, char input[][16], u32 *_used,
        } else {
                PHYDM_SSCANF(input[1], DCMD_DECIMAL, &argv[0]);
 
-               for (i = 1; i < 30; i++) {
+               for (i = 1; i < 5; i++) {
                        if (input[i + 1])
                                PHYDM_SSCANF(input[i + 1], DCMD_DECIMAL,
                                             &argv[i]);
@@ -2210,10 +2210,8 @@ void phydm_dfs_debug(void *dm_void, char input[][16], u32 *_used,
        u8 i, input_idx = 0;
 
        for (i = 0; i < 7; i++) {
-               if (input[i + 1]) {
-                       PHYDM_SSCANF(input[i + 1], DCMD_HEX, &argv[i]);
-                       input_idx++;
-               }
+               PHYDM_SSCANF(input[i + 1], DCMD_HEX, &argv[i]);
+               input_idx++;
        }
 
        if (input_idx == 0)

diff --git a/drivers/net/wireless/rtl8812au/hal/phydm/phydm_dynamictxpower.c b/drivers/net/wireless/rtl8812au/hal/phydm/phydm_dynamictxpower.c
index ceed35f..090bec3 100644 (file)
--- a/drivers/net/wireless/rtl8812au/hal/phydm/phydm_dynamictxpower.c
+++ b/drivers/net/wireless/rtl8812au/hal/phydm/phydm_dynamictxpower.c
@@ -407,10 +407,8 @@ void phydm_dtp_debug(void *dm_void, char input[][16], u32 *_used, char *output,
                PDM_SNPF(out_len, used, output + used, out_len - used,
                         "Set DTP threhosld: {1} {TH[0]} {TH[1]} {TH[2]}\n");
        } else {
-               for (i = 0; i < 3; i++) {
-                       if (input[i + 1])
-                               PHYDM_SSCANF(input[i + 1], DCMD_HEX, &var1[i]);
-               }
+               for (i = 0; i < 3; i++)
+                       PHYDM_SSCANF(input[i + 1], DCMD_HEX, &var1[i]);
                if (var1[0] == 1) {
                        for (i = 0; i < 3; i++)
                                if (var1[i] == 0 || var1[i] > 100)

diff --git a/drivers/net/wireless/rtl8812au/hal/phydm/phydm_lna_sat.c b/drivers/net/wireless/rtl8812au/hal/phydm/phydm_lna_sat.c
index 5320468..4807417 100644 (file)
--- a/drivers/net/wireless/rtl8812au/hal/phydm/phydm_lna_sat.c
+++ b/drivers/net/wireless/rtl8812au/hal/phydm/phydm_lna_sat.c
@@ -1219,11 +1219,8 @@ void phydm_lna_sat_debug(
        } else {
                PHYDM_SSCANF(input[1], DCMD_DECIMAL, &var1[0]);
 
-               for (i = 1; i < 10; i++) {
-                       if (input[i + 1])
-                               PHYDM_SSCANF(input[i + 1], DCMD_DECIMAL,
-                                            &var1[i]);
-               }
+               for (i = 1; i < 10; i++)
+                       PHYDM_SSCANF(input[i + 1], DCMD_DECIMAL, &var1[i]);
                #ifdef PHYDM_LNA_SAT_CHK_TYPE1
                if (var1[0] == 0) {
                        if (var1[1] == 1)

diff --git a/drivers/net/wireless/rtl8812au/hal/phydm/phydm_pathdiv.c b/drivers/net/wireless/rtl8812au/hal/phydm/phydm_pathdiv.c
index b3c46d2..7c320c5 100644 (file)
--- a/drivers/net/wireless/rtl8812au/hal/phydm/phydm_pathdiv.c
+++ b/drivers/net/wireless/rtl8812au/hal/phydm/phydm_pathdiv.c
@@ -519,10 +519,8 @@ void phydm_pathdiv_debug_8814a(void *dm_void, char input[][16], u32 *_used,
        u8 i, input_idx = 0;
 
        for (i = 0; i < 5; i++) {
-               if (input[i + 1]) {
-                       PHYDM_SSCANF(input[i + 1], DCMD_HEX, &dm_value[i]);
-                       input_idx++;
-               }
+               PHYDM_SSCANF(input[i + 1], DCMD_HEX, &dm_value[i]);
+               input_idx++;
        }
 
        if (input_idx == 0)

diff --git a/drivers/net/wireless/rtl8812au/hal/phydm/phydm_pow_train.c b/drivers/net/wireless/rtl8812au/hal/phydm/phydm_pow_train.c
index 56bc241..377c905 100644 (file)
--- a/drivers/net/wireless/rtl8812au/hal/phydm/phydm_pow_train.c
+++ b/drivers/net/wireless/rtl8812au/hal/phydm/phydm_pow_train.c
@@ -148,10 +148,8 @@ void phydm_pow_train_debug(
                PDM_SNPF(out_len, used, output + used, out_len - used,
                         "{0: Auto PT, 1:enable, 2: disable}\n");
        } else {
-               for (i = 0; i < 10; i++) {
-                       if (input[i + 1])
-                               PHYDM_SSCANF(input[i + 1], DCMD_HEX, &var1[i]);
-               }
+               for (i = 0; i < 10; i++)
+                       PHYDM_SSCANF(input[i + 1], DCMD_HEX, &var1[i]);
 
                if (var1[0] == 0)
                        pt_t->pt_state = DYNAMIC_POW_TRAIN;

diff --git a/drivers/net/wireless/rtl8812au/hal/phydm/phydm_psd.c b/drivers/net/wireless/rtl8812au/hal/phydm/phydm_psd.c
index 458677b..a3b0426 100644 (file)
--- a/drivers/net/wireless/rtl8812au/hal/phydm/phydm_psd.c
+++ b/drivers/net/wireless/rtl8812au/hal/phydm/phydm_psd.c
@@ -410,11 +410,8 @@ void phydm_psd_debug(void *dm_void, char input[][16], u32 *_used,
        PHYDM_SSCANF(input[1], DCMD_DECIMAL, &var1[0]);
 
        if (var1[0] == 0) {
-               for (i = 1; i < 10; i++) {
-                       if (input[i + 1])
-                               PHYDM_SSCANF(input[i + 1], DCMD_DECIMAL,
-                                            &var1[i]);
-               }
+               for (i = 1; i < 10; i++)
+                       PHYDM_SSCANF(input[i + 1], DCMD_DECIMAL, &var1[i]);
                PDM_SNPF(out_len, used, output + used, out_len - used,
                         "sw_avg_time=((%d)), hw_avg_time=((%d)), IQ=((%d)), fft=((%d)), path=((%d)), input =((%d)) ch=((%d)), noise_k=((%d))\n",
                         var1[1], var1[2], var1[3], var1[4], var1[5],

diff --git a/drivers/net/wireless/rtl8812au/hal/phydm/phydm_rainfo.c b/drivers/net/wireless/rtl8812au/hal/phydm/phydm_rainfo.c
index 077585d..f1acaf3 100644 (file)
--- a/drivers/net/wireless/rtl8812au/hal/phydm/phydm_rainfo.c
+++ b/drivers/net/wireless/rtl8812au/hal/phydm/phydm_rainfo.c
@@ -125,10 +125,8 @@ void phydm_h2C_debug(void *dm_void, char input[][16], u32 *_used,
        u8 phydm_h2c_id = 0;
 
        for (i = 0; i < 8; i++) {
-               if (input[i + 1]) {
-                       PHYDM_SSCANF(input[i + 1], DCMD_HEX, &dm_value[i]);
-                       input_idx++;
-               }
+               PHYDM_SSCANF(input[i + 1], DCMD_HEX, &dm_value[i]);
+               input_idx++;
        }
 
        if (input_idx == 0)
@@ -192,10 +190,8 @@ void phydm_ra_debug(void *dm_void, char input[][16], u32 *_used, char *output,
        u8 macid = 0, bw = 0, rate = 0;
        u8 i = 0;
 
-       for (i = 0; i < 5; i++) {
-               if (input[i + 1])
-                       PHYDM_SSCANF(input[i + 1], DCMD_DECIMAL, &var[i]);
-       }
+       for (i = 0; i < 5; i++)
+               PHYDM_SSCANF(input[i + 1], DCMD_DECIMAL, &var[i]);
 
        if ((strcmp(input[1], help) == 0)) {
                PDM_SNPF(out_len, used, output + used, out_len - used,

diff --git a/drivers/net/wireless/rtl8812au/hal/phydm/phydm_smt_ant.c b/drivers/net/wireless/rtl8812au/hal/phydm/phydm_smt_ant.c
index 8e805b3..87a6069 100644 (file)
--- a/drivers/net/wireless/rtl8812au/hal/phydm/phydm_smt_ant.c
+++ b/drivers/net/wireless/rtl8812au/hal/phydm/phydm_smt_ant.c
@@ -318,10 +318,8 @@ void phydm_cumitek_smt_ant_debug(
 
        } else if (dm_value[0] == 2) { /*@fix tx pattern*/
 
-               for (i = 1; i < 4; i++) {
-                       if (input[i + 1])
-                               PHYDM_SSCANF(input[i + 1], DCMD_DECIMAL, &dm_value[i]);
-               }
+               for (i = 1; i < 4; i++)
+                       PHYDM_SSCANF(input[i + 1], DCMD_DECIMAL, &dm_value[i]);
 
                PDM_SNPF(out_len, used, output + used, out_len - used,
                         "STA[%d] TX Ant{A, B}={%d, %d}\n", dm_value[3],
@@ -332,10 +330,8 @@ void phydm_cumitek_smt_ant_debug(
                u8 table_path_a[8] = {0};
                u8 table_path_b[8] = {0};
 
-               for (i = 1; i < 4; i++) {
-                       if (input[i + 1])
-                               PHYDM_SSCANF(input[i + 1], DCMD_HEX, &dm_value[i]);
-               }
+               for (i = 1; i < 4; i++)
+                       PHYDM_SSCANF(input[i + 1], DCMD_HEX, &dm_value[i]);
 
                PDM_SNPF(out_len, used, output + used, out_len - used,
                         "Set Path-AB mapping table={%d, %d}\n", dm_value[1],

diff --git a/drivers/net/wireless/rtl8812au/hal/phydm/phydm_soml.c b/drivers/net/wireless/rtl8812au/hal/phydm/phydm_soml.c
index 35507e3..80bd09f 100644 (file)
--- a/drivers/net/wireless/rtl8812au/hal/phydm/phydm_soml.c
+++ b/drivers/net/wireless/rtl8812au/hal/phydm/phydm_soml.c
@@ -301,10 +301,8 @@ void phydm_soml_debug(void *dm_void, char input[][16], u32 *_used,
        u8 i = 0, input_idx = 0;
 
        for (i = 0; i < 5; i++) {
-               if (input[i + 1]) {
-                       PHYDM_SSCANF(input[i + 1], DCMD_DECIMAL, &dm_value[i]);
-                       input_idx++;
-               }
+               PHYDM_SSCANF(input[i + 1], DCMD_DECIMAL, &dm_value[i]);
+               input_idx++;
        }
 
        if (input_idx == 0)

diff --git a/drivers/net/wireless/rtl8812au/os_dep/linux/ioctl_cfg80211.c b/drivers/net/wireless/rtl8812au/os_dep/linux/ioctl_cfg80211.c
index feb651e..29e3446 100644 (file)
--- a/drivers/net/wireless/rtl8812au/os_dep/linux/ioctl_cfg80211.c
+++ b/drivers/net/wireless/rtl8812au/os_dep/linux/ioctl_cfg80211.c
@@ -3006,7 +3006,7 @@ static int cfg80211_rtw_scan(struct wiphy *wiphy
 #endif
 #ifdef CONFIG_P2P
        if (pwdinfo->driver_interface == DRIVER_CFG80211) {
-               if (ssids->ssid != NULL
+               if (ssids->ssid[0]
                        && _rtw_memcmp(ssids->ssid, "DIRECT-", 7)
                        && rtw_get_p2p_ie((u8 *)request->ie, request->ie_len, NULL, NULL)
                ) {
@@ -3111,7 +3111,7 @@ bypass_p2p_chk:
 
 #ifdef CONFIG_P2P
        if (pwdinfo->driver_interface == DRIVER_CFG80211) {
-               if (ssids->ssid != NULL
+               if (ssids->ssid[0]
                        && _rtw_memcmp(ssids->ssid, "DIRECT-", 7)
                        && rtw_get_p2p_ie((u8 *)request->ie, request->ie_len, NULL, NULL)
                ) {
@@ -9941,10 +9941,8 @@ void rtw_cfg80211_external_auth_status(struct wiphy *wiphy, struct net_device *d
                psta->state |= WIFI_FW_AUTH_SUCCESS;
                psta->expire_to = padapter->stapriv.assoc_to;
 
-               if (params->pmkid != NULL) {
-                       /* RTW_INFO_DUMP("PMKID:", params->pmkid, PMKID_LEN); */
-                       _rtw_set_pmksa(dev, params->bssid, params->pmkid);
-               }
+               /* RTW_INFO_DUMP("PMKID:", params->pmkid, PMKID_LEN); */
+               _rtw_set_pmksa(dev, params->bssid, params->pmkid);
 
                _enter_critical_bh(&psta->lock, &irqL);
                if ((psta->auth_len != 0) && (psta->pauth_frame != NULL)) {