]> www.infradead.org Git - users/hch/misc.git/commitdiff
staging: rtl8723bs: fix checkpatch spaces preferred around that
authorJannik Rehkemper <jannik@jrehkemper.de>
Thu, 7 Aug 2025 18:54:37 +0000 (20:54 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 11 Aug 2025 05:21:22 +0000 (07:21 +0200)
Added spaces where prefered or required by the checkpatch.pl script to
adhere codestyle.

Signed-off-by: Jannik Rehkemper <jannik@jrehkemper.de>
Link: https://lore.kernel.org/r/20250807185436.853318-2-jannik@jrehkemper.de
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8723bs/core/rtw_wlan_util.c

index 0c6072d08661a6d483b9c63e6492e3d74237f317..1def9758852cd6c31ebb3be1dc6cbe341e4e6ced 100644 (file)
@@ -170,10 +170,10 @@ void get_rate_set(struct adapter *padapter, unsigned char *pbssrate, int *bssrat
 
 void set_mcs_rate_by_mask(u8 *mcs_set, u32 mask)
 {
-       u8 mcs_rate_1r = (u8)(mask&0xff);
-       u8 mcs_rate_2r = (u8)((mask>>8)&0xff);
-       u8 mcs_rate_3r = (u8)((mask>>16)&0xff);
-       u8 mcs_rate_4r = (u8)((mask>>24)&0xff);
+       u8 mcs_rate_1r = (u8)(mask & 0xff);
+       u8 mcs_rate_2r = (u8)((mask >> 8) & 0xff);
+       u8 mcs_rate_3r = (u8)((mask >> 16) & 0xff);
+       u8 mcs_rate_4r = (u8)((mask >> 24) & 0xff);
 
        mcs_set[0] &= mcs_rate_1r;
        mcs_set[1] &= mcs_rate_2r;
@@ -267,21 +267,21 @@ inline void rtw_set_oper_ch(struct adapter *adapter, u8 ch)
                dvobj->on_oper_ch_time = jiffies;
 
 #ifdef DBG_CH_SWITCH
-               cnt += scnprintf(msg+cnt, len-cnt, "switch to ch %3u", ch);
+               cnt += scnprintf(msg + cnt, len - cnt, "switch to ch %3u", ch);
 
                for (i = 0; i < dvobj->iface_nums; i++) {
                        struct adapter *iface = dvobj->padapters[i];
 
-                       cnt += scnprintf(msg+cnt, len-cnt, " [%s:", ADPT_ARG(iface));
+                       cnt += scnprintf(msg + cnt, len - cnt, " [%s:", ADPT_ARG(iface));
                        if (iface->mlmeextpriv.cur_channel == ch)
-                               cnt += scnprintf(msg+cnt, len-cnt, "C");
+                               cnt += scnprintf(msg + cnt, len - cnt, "C");
                        else
-                               cnt += scnprintf(msg+cnt, len-cnt, "_");
+                               cnt += scnprintf(msg + cnt, len - cnt, "_");
                        if (iface->wdinfo.listen_channel == ch && !rtw_p2p_chk_state(&iface->wdinfo, P2P_STATE_NONE))
-                               cnt += scnprintf(msg+cnt, len-cnt, "L");
+                               cnt += scnprintf(msg + cnt, len - cnt, "L");
                        else
-                               cnt += scnprintf(msg+cnt, len-cnt, "_");
-                       cnt += scnprintf(msg+cnt, len-cnt, "]");
+                               cnt += scnprintf(msg + cnt, len - cnt, "_");
+                       cnt += scnprintf(msg + cnt, len - cnt, "]");
                }
 
 #endif /* DBG_CH_SWITCH */
@@ -381,7 +381,7 @@ int is_client_associated_to_ap(struct adapter *padapter)
        pmlmeext = &padapter->mlmeextpriv;
        pmlmeinfo = &(pmlmeext->mlmext_info);
 
-       if ((pmlmeinfo->state & WIFI_FW_ASSOC_SUCCESS) && ((pmlmeinfo->state&0x03) == WIFI_FW_STATION_STATE))
+       if ((pmlmeinfo->state & WIFI_FW_ASSOC_SUCCESS) && ((pmlmeinfo->state & 0x03) == WIFI_FW_STATION_STATE))
                return true;
        else
                return _FAIL;
@@ -392,7 +392,7 @@ int is_client_associated_to_ibss(struct adapter *padapter)
        struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
        struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
 
-       if ((pmlmeinfo->state & WIFI_FW_ASSOC_SUCCESS) && ((pmlmeinfo->state&0x03) == WIFI_FW_ADHOC_STATE))
+       if ((pmlmeinfo->state & WIFI_FW_ASSOC_SUCCESS) && ((pmlmeinfo->state & 0x03) == WIFI_FW_ADHOC_STATE))
                return true;
        else
                return _FAIL;
@@ -431,7 +431,7 @@ void invalidate_cam_all(struct adapter *padapter)
 
        spin_lock_bh(&cam_ctl->lock);
        cam_ctl->bitmap = 0;
-       memset(dvobj->cam_cache, 0, sizeof(struct cam_entry_cache)*TOTAL_CAM_ENTRY);
+       memset(dvobj->cam_cache, 0, sizeof(struct cam_entry_cache) * TOTAL_CAM_ENTRY);
        spin_unlock_bh(&cam_ctl->lock);
 }
 
@@ -453,7 +453,7 @@ void _write_cam(struct adapter *padapter, u8 entry, u16 ctrl, u8 *mac, u8 *key)
                        break;
                default:
                        i = (j - 2) << 2;
-                       val = (key[i] | (key[i+1] << 8) | (key[i+2] << 16) | (key[i+3] << 24));
+                       val = (key[i] | (key[i + 1] << 8) | (key[i + 2] << 16) | (key[i + 3] << 24));
                        break;
                }
 
@@ -522,7 +522,7 @@ static bool _rtw_camid_is_gk(struct adapter *adapter, u8 cam_id)
        if (!(cam_ctl->bitmap & BIT(cam_id)))
                goto exit;
 
-       ret = (dvobj->cam_cache[cam_id].ctrl&BIT6)?true:false;
+       ret = (dvobj->cam_cache[cam_id].ctrl & BIT6) ? true : false;
 
 exit:
        return ret;
@@ -537,7 +537,7 @@ static s16 _rtw_camid_search(struct adapter *adapter, u8 *addr, s16 kid)
        for (i = 0; i < TOTAL_CAM_ENTRY; i++) {
                if (addr && memcmp(dvobj->cam_cache[i].mac, addr, ETH_ALEN))
                        continue;
-               if (kid >= 0 && kid != (dvobj->cam_cache[i].ctrl&0x03))
+               if (kid >= 0 && kid != (dvobj->cam_cache[i].ctrl & 0x03))
                        continue;
 
                cam_id = i;
@@ -571,7 +571,7 @@ s16 rtw_camid_alloc(struct adapter *adapter, struct sta_info *sta, u8 kid)
 
        mlmeinfo = &adapter->mlmeextpriv.mlmext_info;
 
-       if ((((mlmeinfo->state&0x03) == WIFI_FW_AP_STATE) || ((mlmeinfo->state&0x03) == WIFI_FW_ADHOC_STATE))
+       if ((((mlmeinfo->state & 0x03) == WIFI_FW_AP_STATE) || ((mlmeinfo->state & 0x03) == WIFI_FW_ADHOC_STATE))
                && !sta) {
                /* AP/Ad-hoc mode group key: static alloction to default key by key ID */
                if (kid > 3) {
@@ -585,7 +585,7 @@ s16 rtw_camid_alloc(struct adapter *adapter, struct sta_info *sta, u8 kid)
                cam_id = kid;
        } else {
                int i;
-               u8 *addr = sta?sta->hwaddr:NULL;
+               u8 *addr = sta ? sta->hwaddr : NULL;
 
                if (!sta) {
                        if (!(mlmeinfo->state & WIFI_FW_ASSOC_SUCCESS)) {
@@ -792,7 +792,7 @@ void WMMOnAssocRsp(struct adapter *padapter)
                        switch (ACI) {
                        case 0x0:
                                rtw_hal_set_hwreg(padapter, HW_VAR_AC_PARAM_BE, (u8 *)(&acParm));
-                               acm_mask |= (ACM ? BIT(1):0);
+                               acm_mask |= (ACM ? BIT(1) : 0);
                                edca[XMIT_BE_QUEUE] = acParm;
                                break;
 
@@ -804,13 +804,13 @@ void WMMOnAssocRsp(struct adapter *padapter)
 
                        case 0x2:
                                rtw_hal_set_hwreg(padapter, HW_VAR_AC_PARAM_VI, (u8 *)(&acParm));
-                               acm_mask |= (ACM ? BIT(2):0);
+                               acm_mask |= (ACM ? BIT(2) : 0);
                                edca[XMIT_VI_QUEUE] = acParm;
                                break;
 
                        case 0x3:
                                rtw_hal_set_hwreg(padapter, HW_VAR_AC_PARAM_VO, (u8 *)(&acParm));
-                               acm_mask |= (ACM ? BIT(3):0);
+                               acm_mask |= (ACM ? BIT(3) : 0);
                                edca[XMIT_VO_QUEUE] = acParm;
                                break;
                        }
@@ -1170,7 +1170,7 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len)
                ht_info_infos_0 = 0;
        }
        if (ht_cap_info != cur_network->bcn_info.ht_cap_info ||
-           ((ht_info_infos_0&0x03) != (cur_network->bcn_info.ht_info_infos_0&0x03))) {
+           ((ht_info_infos_0 & 0x03) != (cur_network->bcn_info.ht_info_infos_0 & 0x03))) {
                {
                        /* bcn_info_update */
                        cur_network->bcn_info.ht_cap_info = ht_cap_info;
@@ -1238,12 +1238,12 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len)
                goto _mismatch;
 
        if (encryp_protocol == ENCRYP_PROTOCOL_WPA || encryp_protocol == ENCRYP_PROTOCOL_WPA2) {
-               pbuf = rtw_get_wpa_ie(&bssid->ies[12], &wpa_ielen, bssid->ie_length-12);
+               pbuf = rtw_get_wpa_ie(&bssid->ies[12], &wpa_ielen, bssid->ie_length - 12);
                if (pbuf && (wpa_ielen > 0)) {
                        rtw_parse_wpa_ie(pbuf, wpa_ielen + 2, &group_cipher,
                                         &pairwise_cipher, &is_8021x);
                } else {
-                       pbuf = rtw_get_wpa2_ie(&bssid->ies[12], &wpa_ielen, bssid->ie_length-12);
+                       pbuf = rtw_get_wpa2_ie(&bssid->ies[12], &wpa_ielen, bssid->ie_length - 12);
 
                        if (pbuf && (wpa_ielen > 0))
                                rtw_parse_wpa2_ie(pbuf, wpa_ielen + 2, &group_cipher,
@@ -1630,7 +1630,7 @@ void process_addba_req(struct adapter *padapter, u8 *paddba_req, u8 *addr)
 
        if (psta) {
                param = le16_to_cpu(preq->BA_para_set);
-               tid = (param>>2)&0x0f;
+               tid = (param >> 2) & 0x0f;
 
                preorder_ctrl = &psta->recvreorder_ctrl[tid];
 
@@ -1648,7 +1648,7 @@ void update_TSF(struct mlme_ext_priv *pmlmeext, u8 *pframe, uint len)
        pIE = pframe + sizeof(struct ieee80211_hdr_3addr);
        pbuf = (__le32 *)pIE;
 
-       pmlmeext->TSFValue = le32_to_cpu(*(pbuf+1));
+       pmlmeext->TSFValue = le32_to_cpu(*(pbuf + 1));
 
        pmlmeext->TSFValue = pmlmeext->TSFValue << 32;
 
@@ -1674,14 +1674,14 @@ void adaptive_early_32k(struct mlme_ext_priv *pmlmeext, u8 *pframe, uint len)
        pIE = pframe + sizeof(struct ieee80211_hdr_3addr);
        pbuf = (__le32 *)pIE;
 
-       tsf = le32_to_cpu(*(pbuf+1));
+       tsf = le32_to_cpu(*(pbuf + 1));
        tsf = tsf << 32;
        tsf |= le32_to_cpu(*pbuf);
 
        /* delay = (timestamp mod 1024*100)/1000 (unit: ms) */
        /* delay_ms = do_div(tsf, (pmlmeinfo->bcn_interval*1024))/1000; */
-       delay_ms = do_div(tsf, (pmlmeinfo->bcn_interval*1024));
-       delay_ms = delay_ms/1000;
+       delay_ms = do_div(tsf, (pmlmeinfo->bcn_interval * 1024));
+       delay_ms = delay_ms / 1000;
 
        if (delay_ms >= 8)
                pmlmeext->bcn_delay_cnt[8]++;