staging: r8188eu: remove spaces before ',' and ')'
PATCH 1/2 staging: r8188eu: remove spaces before ',' and ')'
Remove spaces to clear checkpatch errors.
ERROR: space prohibited before that ',' (ctx:WxW)
ERROR: space prohibited before that close parenthesis ')'
Signed-off-by Michael Straube <[email protected]>
--- drivers/staging/r8188eu/core/rtw_ap.c | 2 +- drivers/staging/r8188eu/core/rtw_efuse.c | 4 +- drivers/staging/r8188eu/core/rtw_ieee80211.c | 14 ++--- drivers/staging/r8188eu/core/rtw_io.c | 2 +- drivers/staging/r8188eu/core/rtw_ioctl_set.c | 2 +- drivers/staging/r8188eu/core/rtw_iol.c | 2 +- drivers/staging/r8188eu/core/rtw_mlme.c | 18 +++---- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 52 +++++++++---------- drivers/staging/r8188eu/core/rtw_mp.c | 2 +- drivers/staging/r8188eu/core/rtw_p2p.c | 12 ++--- drivers/staging/r8188eu/core/rtw_sta_mgt.c | 14 ++--- drivers/staging/r8188eu/core/rtw_xmit.c | 6 +-- .../r8188eu/hal/Hal8188ERateAdaptive.c | 4 +- drivers/staging/r8188eu/hal/HalPwrSeqCmd.c | 14 ++--- drivers/staging/r8188eu/hal/hal_com.c | 2 +- drivers/staging/r8188eu/hal/odm.c | 10 ++-- .../staging/r8188eu/hal/rtl8188e_hal_init.c | 12 ++--- drivers/staging/r8188eu/hal/rtl8188e_mp.c | 2 +- drivers/staging/r8188eu/hal/usb_halinit.c | 2 +- 19 files changed, 88 insertions(+), 88 deletions(-)
drivers/staging/r8188eu/core/rtw_ap.c +1 -1
@@ -492,7 +492,7 @@ void add_RATid(struct adapter *padapter, struct sta_info *psta, u8 rssi_level) tx_ra_bitmap |= ((raid<<28 )&0xf0000000 );DBG_88E ("%s => mac_id:%d , raid:%d , bitmap = 0x%x, arg = 0x%x\n" , - __func__ , psta->mac_id, raid , tx_ra_bitmap, arg); + __func__, psta->mac_id, raid, tx_ra_bitmap, arg);/* bitmap[0:27] = tx_rate_bitmap */ /* bitmap[28:31]= Rate Adaptive id */
drivers/staging/r8188eu/core/rtw_efuse.c +2 -2
@@ -245,7 +245,7 @@ u8 EFUSE_Read1Byte(struct adapter *Adapter, u16 Address)u32 k =0 ;u16 contentLen =0 ; -EFUSE_GetEfuseDefinition (Adapter,EFUSE_WIFI ,TYPE_EFUSE_REAL_CONTENT_LEN , (void *)&contentLen, false); +EFUSE_GetEfuseDefinition (Adapter,EFUSE_WIFI ,TYPE_EFUSE_REAL_CONTENT_LEN , (void *)&contentLen, false);if (Address < contentLen) {/* E-fuse 512Byte */ /* Write E-fuse Register address bit0~7 */
@@ -470,7 +470,7 @@ u8 rtw_efuse_access(struct adapter *padapter, u8 write, u16 start_addr, u16 cntsu16 efuse_GetMaxSize (struct adapter *padapter) {u16 max_size; -EFUSE_GetEfuseDefinition (padapter,EFUSE_WIFI ,TYPE_AVAILABLE_EFUSE_BYTES_TOTAL , (void *)&max_size, false); +EFUSE_GetEfuseDefinition (padapter,EFUSE_WIFI ,TYPE_AVAILABLE_EFUSE_BYTES_TOTAL , (void *)&max_size, false);return max_size; }/* */
drivers/staging/r8188eu/core/rtw_ieee80211.c +7 -7
@@ -772,7 +772,7 @@ u8 *rtw_get_wps_ie(u8 *in_ie, uint in_len, u8 *wps_ie, uint *wps_ielen)* * Returns: the address of the specific WPS attribute found, or NULL */ -u8 *rtw_get_wps_attr (u8 *wps_ie,uint wps_ielen,u16 target_attr_id ,u8 *buf_attr,u32 *len_attr) +u8 *rtw_get_wps_attr (u8 *wps_ie,uint wps_ielen,u16 target_attr_id,u8 *buf_attr,u32 *len_attr) {u8 *attr_ptr =NULL ;u8 *target_attr_ptr =NULL ;
@@ -782,7 +782,7 @@ u8 *rtw_get_wps_attr(u8 *wps_ie, uint wps_ielen, u16 target_attr_id , u8 *buf_at *len_attr =0 ;if ((wps_ie[0 ] != _VENDOR_SPECIFIC_IE_) || - (memcmp (wps_ie +2 , wps_oui ,4 ))) + (memcmp (wps_ie +2 , wps_oui,4 )))return attr_ptr;/* 6 = 1(Element ID) + 1(Length) + 4(WPS OUI) */
@@ -818,7 +818,7 @@ u8 *rtw_get_wps_attr(u8 *wps_ie, uint wps_ielen, u16 target_attr_id , u8 *buf_at* * Returns: the address of the specific WPS attribute content found, or NULL */ -u8 *rtw_get_wps_attr_content (u8 *wps_ie,uint wps_ielen,u16 target_attr_id ,u8 *buf_content,uint *len_content) +u8 *rtw_get_wps_attr_content (u8 *wps_ie,uint wps_ielen,u16 target_attr_id,u8 *buf_content,uint *len_content) {u8 *attr_ptr;u32 attr_len;
@@ -1217,7 +1217,7 @@ u8 *rtw_get_p2p_ie(u8 *in_ie, int in_len, u8 *p2p_ie, uint *p2p_ielen)* * Returns: the address of the specific WPS attribute found, or NULL */ -u8 *rtw_get_p2p_attr (u8 *p2p_ie,uint p2p_ielen,u8 target_attr_id ,u8 *buf_attr,u32 *len_attr) +u8 *rtw_get_p2p_attr (u8 *p2p_ie,uint p2p_ielen,u8 target_attr_id,u8 *buf_attr,u32 *len_attr) {u8 *attr_ptr =NULL ;u8 *target_attr_ptr =NULL ;
@@ -1227,7 +1227,7 @@ u8 *rtw_get_p2p_attr(u8 *p2p_ie, uint p2p_ielen, u8 target_attr_id , u8 *buf_att *len_attr =0 ;if (!p2p_ie || (p2p_ie[0 ] != _VENDOR_SPECIFIC_IE_) || -memcmp (p2p_ie +2 , p2p_oui ,4 )) +memcmp (p2p_ie +2 , p2p_oui,4 ))return attr_ptr;/* 6 = 1(Element ID) + 1(Length) + 3 (OUI) + 1(OUI Type) */
@@ -1264,7 +1264,7 @@ u8 *rtw_get_p2p_attr(u8 *p2p_ie, uint p2p_ielen, u8 target_attr_id , u8 *buf_att* * Returns: the address of the specific P2P attribute content found, or NULL */ -u8 *rtw_get_p2p_attr_content (u8 *p2p_ie,uint p2p_ielen,u8 target_attr_id ,u8 *buf_content,uint *len_content) +u8 *rtw_get_p2p_attr_content (u8 *p2p_ie,uint p2p_ielen,u8 target_attr_id,u8 *buf_content,uint *len_content) {u8 *attr_ptr;u32 attr_len;
@@ -1452,7 +1452,7 @@ void rtw_get_bcn_info(struct wlan_network *pnetwork) }else { pnetwork->BcnInfo.encryp_protocol =ENCRYP_PROTOCOL_OPENSYS ; } -rtw_get_sec_ie (pnetwork->network.IEs , pnetwork->network.IELength,NULL , &rsn_len,NULL , &wpa_len); +rtw_get_sec_ie (pnetwork->network.IEs, pnetwork->network.IELength,NULL , &rsn_len,NULL , &wpa_len);RT_TRACE (_module_rtl871x_mlme_c_, _drv_info_, ("rtw_get_bcn_info: ssid =%s\n" , pnetwork->network.Ssid.Ssid));RT_TRACE (_module_rtl871x_mlme_c_, _drv_info_, ("rtw_get_bcn_info: wpa_len =%d rsn_len =%d\n" , wpa_len, rsn_len));RT_TRACE (_module_rtl871x_mlme_c_, _drv_info_, ("rtw_get_bcn_info: ssid =%s\n" , pnetwork->network.Ssid.Ssid));
drivers/staging/r8188eu/core/rtw_io.c +1 -1
@@ -120,7 +120,7 @@ int _rtw_write32(struct adapter *adapter, u32 addr, u32 val)return RTW_STATUS_CODE (ret); } -int _rtw_writeN (struct adapter *adapter,u32 addr ,u32 length ,u8 *pdata) +int _rtw_writeN (struct adapter *adapter,u32 addr,u32 length,u8 *pdata) {struct io_priv *pio_priv = &adapter->iopriv;struct intf_hdl *pintfhdl = (struct intf_hdl *)(&(pio_priv->intf));
drivers/staging/r8188eu/core/rtw_ioctl_set.c +1 -1
@@ -1011,7 +1011,7 @@ u16 rtw_get_cur_max_rate(struct adapter *adapter)if (p && ht_ielen >0 ) { pht_capie = (struct ieee80211_ht_cap *)(p+2 ); -memcpy (&mcs_rate , pht_capie->mcs.rx_mask,2 ); +memcpy (&mcs_rate, pht_capie->mcs.rx_mask,2 );/* cur_bwmod is updated by beacon, pmlmeinfo is updated by association response */ bw_40MHz = (pmlmeext->cur_bwmode && (HT_INFO_HT_PARAM_REC_TRANS_CHNL_WIDTH & pmlmeinfo->HT_info.infos[0 ])) ?1 :0 ;
drivers/staging/r8188eu/core/rtw_iol.c +1 -1
@@ -51,7 +51,7 @@ int rtw_IOL_append_cmds(struct xmit_frame *xmit_frame, u8 *IOL_cmds, u32 cmd_len/* check if the io_buf can accommodate new cmds */ if (ori_len + cmd_len +8 >MAX_XMITBUF_SZ ) {DBG_88E ("%s %u is large than MAX_XMITBUF_SZ:%u, can't accommodate new cmds\n" , - __func__ , ori_len + cmd_len +8 ,MAX_XMITBUF_SZ ); + __func__, ori_len + cmd_len +8 ,MAX_XMITBUF_SZ );return _FAIL; }
drivers/staging/r8188eu/core/rtw_mlme.c +9 -9
@@ -190,7 +190,7 @@ struct wlan_network *_rtw_alloc_network(struct mlme_priv *pmlmepriv)/* _queue *f } plist = (&(free_queue->queue))->next; - pnetwork = container_of(plist , struct wlan_network, list); + pnetwork = container_of(plist, struct wlan_network, list);list_del_init (&pnetwork->list);
@@ -209,7 +209,7 @@ struct wlan_network *_rtw_alloc_network(struct mlme_priv *pmlmepriv)/* _queue *freturn pnetwork; } -void _rtw_free_network (struct mlme_priv *pmlmepriv ,struct wlan_network *pnetwork,u8 isfreeall) +void _rtw_free_network (struct mlme_priv *pmlmepriv,struct wlan_network *pnetwork,u8 isfreeall) {u32 curr_time, delta_time;u32 lifetime =SCANQUEUE_LIFETIME ;
@@ -268,7 +268,7 @@ struct wlan_network *_rtw_find_network(struct __queue *scanned_queue, u8 *addr) plist = phead->next;while (plist != phead) { - pnetwork = container_of(plist, struct wlan_network , list); + pnetwork = container_of(plist, struct wlan_network, list);if (!memcmp (addr, pnetwork->network.MacAddress,ETH_ALEN ))break ; plist = plist->next;
@@ -700,7 +700,7 @@ static int rtw_is_desired_network(struct adapter *adapter, struct wlan_network * }/* TODO: Perry: For Power Management */ -void rtw_atimdone_event_callback (struct adapter *adapter ,u8 *pbuf) +void rtw_atimdone_event_callback (struct adapter *adapter,u8 *pbuf) {RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, ("receive atimdone_evet\n" ));
@@ -734,7 +734,7 @@ void rtw_survey_event_callback(struct adapter *adapter, u8 *pbuf)spin_lock_bh (&pmlmepriv->scanned_queue.lock); ibss_wlan =rtw_find_network (&pmlmepriv->scanned_queue, pnetwork->MacAddress);if (ibss_wlan) { -memcpy (ibss_wlan->network.IEs , pnetwork->IEs,8 ); +memcpy (ibss_wlan->network.IEs, pnetwork->IEs,8 );spin_unlock_bh (&pmlmepriv->scanned_queue.lock); goto exit; }
@@ -859,11 +859,11 @@ void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf) } -void rtw_dummy_event_callback (struct adapter *adapter ,u8 *pbuf) +void rtw_dummy_event_callback (struct adapter *adapter,u8 *pbuf) { } -void rtw_fwdbg_event_callback (struct adapter *adapter ,u8 *pbuf) +void rtw_fwdbg_event_callback (struct adapter *adapter,u8 *pbuf) { }
@@ -1524,7 +1524,7 @@ void _rtw_join_timeout_handler (struct adapter *adapter)DBG_88E ("%s try another roaming\n" , __func__); do_join_r =rtw_do_join (adapter);if (_SUCCESS != do_join_r) { -DBG_88E ("%s roaming do_join return %d\n" , __func__ , do_join_r); +DBG_88E ("%s roaming do_join return %d\n" , __func__, do_join_r);continue ; }break ;
@@ -2169,7 +2169,7 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_ p =rtw_get_ie (in_ie+12 , _HT_ADD_INFO_IE_, &ielen, in_len-12 );if (p && (ielen ==sizeof (struct ieee80211_ht_addt_info ))) { out_len = *pout_len; -rtw_set_ie (out_ie+out_len, _HT_ADD_INFO_IE_, ielen, p+2 , pout_len); +rtw_set_ie (out_ie+out_len, _HT_ADD_INFO_IE_, ielen, p+2 , pout_len); } }return phtpriv->ht_option;
drivers/staging/r8188eu/core/rtw_mlme_ext.c +26 -26
178 lines not on this page · raw message
drivers/staging/r8188eu/core/rtw_mp.c +1 -1
@@ -488,7 +488,7 @@ void SetDataRate(struct adapter *pAdapter)Hal_SetDataRate (pAdapter); } -void MP_PHY_SetRFPathSwitch (struct adapter *pAdapter ,bool bMain) +void MP_PHY_SetRFPathSwitch (struct adapter *pAdapter,bool bMain) {PHY_SetRFPathSwitch (pAdapter, bMain); }
drivers/staging/r8188eu/core/rtw_p2p.c +6 -6
@@ -790,9 +790,9 @@ u32 process_probe_req_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pframe, uint l ssid_len &=0xff ;/* Just last 1 byte is valid for ssid len of the probe request */ if (rtw_p2p_chk_role (pwdinfo,P2P_ROLE_DEVICE ) ||rtw_p2p_chk_role (pwdinfo,P2P_ROLE_GO )) { - p2pie =rtw_get_p2p_ie (pframe +WLAN_HDR_A3_LEN + _PROBEREQ_IE_OFFSET_ , len -WLAN_HDR_A3_LEN - _PROBEREQ_IE_OFFSET_ ,NULL , &p2pielen); + p2pie =rtw_get_p2p_ie (pframe +WLAN_HDR_A3_LEN + _PROBEREQ_IE_OFFSET_, len -WLAN_HDR_A3_LEN - _PROBEREQ_IE_OFFSET_,NULL , &p2pielen);if (p2pie) { -if ((p !=NULL ) && !memcmp ((void *)(p+2 ), (void *)pwdinfo->p2p_wildcard_ssid ,7 )) { +if ((p !=NULL ) && !memcmp ((void *)(p+2 ), (void *)pwdinfo->p2p_wildcard_ssid,7 )) {/* todo: */ /* Check Requested Device Type attributes in WSC IE. */ /* Check Device ID attribute in P2P IE */
@@ -835,7 +835,7 @@ u32 process_assoc_req_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pframe, uint l ies = pframe +WLAN_HDR_A3_LEN + ie_offset; ies_len = len -WLAN_HDR_A3_LEN - ie_offset; - p2p_ie =rtw_get_p2p_ie (ies , ies_len ,NULL , &p2p_ielen); + p2p_ie =rtw_get_p2p_ie (ies, ies_len,NULL , &p2p_ielen);if (!p2p_ie) {DBG_88E ("[%s] P2P IE not Found!!\n" , __func__);
@@ -863,7 +863,7 @@ u32 process_assoc_req_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pframe, uint lu8 num_of_secdev_type;u16 dev_name_len; -rtw_get_p2p_attr_content (p2p_ie, p2p_ielen,P2P_ATTR_DEVICE_INFO , pattr_content, (uint *)&attr_contentlen); +rtw_get_p2p_attr_content (p2p_ie, p2p_ielen,P2P_ATTR_DEVICE_INFO , pattr_content, (uint *)&attr_contentlen);memcpy (psta->dev_addr, pattr_content,ETH_ALEN );/* P2P Device Address */
@@ -1129,7 +1129,7 @@ u8 process_p2p_group_negotation_req(struct wifidirect_info *pwdinfo, u8 *pframe,rtw_p2p_set_state (pwdinfo,P2P_STATE_GONEGO_ING ); -if (rtw_get_p2p_attr_content (p2p_ie, p2p_ielen,P2P_ATTR_GO_INTENT , &attr_content, &attr_contentlen)) { +if (rtw_get_p2p_attr_content (p2p_ie, p2p_ielen,P2P_ATTR_GO_INTENT , &attr_content, &attr_contentlen)) {DBG_88E ("[%s] GO Intent = %d, tie = %d\n" , __func__, attr_content >>1 , attr_content &0x01 ); pwdinfo->peer_intent = attr_content;/* include both intent and tie breaker values. */
@@ -1269,7 +1269,7 @@ u8 process_p2p_group_negotation_resp(struct wifidirect_info *pwdinfo, u8 *pframe/* Try to get the peer's intent and tie breaker value. */ attr_content =0x00 ; attr_contentlen =0 ; -if (rtw_get_p2p_attr_content (p2p_ie, p2p_ielen,P2P_ATTR_GO_INTENT , &attr_content, &attr_contentlen)) { +if (rtw_get_p2p_attr_content (p2p_ie, p2p_ielen,P2P_ATTR_GO_INTENT , &attr_content, &attr_contentlen)) {DBG_88E ("[%s] GO Intent = %d, tie = %d\n" , __func__, attr_content >>1 , attr_content &0x01 ); pwdinfo->peer_intent = attr_content;/* include both intent and tie breaker values. */
drivers/staging/r8188eu/core/rtw_sta_mgt.c +7 -7
@@ -174,7 +174,7 @@ void rtw_mfree_all_stainfo(struct sta_priv *pstapriv) plist = phead->next;while (phead != plist) { - psta = container_of(plist, struct sta_info , list); + psta = container_of(plist, struct sta_info, list); plist = plist->next; }
@@ -218,7 +218,7 @@ u32 _rtw_free_sta_priv(struct sta_priv *pstapriv)while (phead != plist) {int i; - psta = container_of(plist, struct sta_info , hash_list); + psta = container_of(plist, struct sta_info, hash_list); plist = plist->next;for (i =0 ; i <16 ; i++) {
@@ -289,7 +289,7 @@ struct sta_info *rtw_alloc_stainfo(struct sta_priv *pstapriv, u8 *hwaddr)RT_TRACE (_module_rtl871x_sta_mgt_c_, _drv_info_, ("alloc number_%d stainfo with hwaddr = %pM\n" , - pstapriv->asoc_sta_count , hwaddr)); + pstapriv->asoc_sta_count, hwaddr));init_addba_retry_timer (pstapriv->padapter, psta);
@@ -324,7 +324,7 @@ struct sta_info *rtw_alloc_stainfo(struct sta_priv *pstapriv, u8 *hwaddr) }/* using pstapriv->sta_hash_lock to protect */ -u32 rtw_free_stainfo (struct adapter *padapter ,struct sta_info *psta) +u32 rtw_free_stainfo (struct adapter *padapter,struct sta_info *psta) {int i;struct __queue *pfree_sta_queue;
@@ -364,7 +364,7 @@ u32 rtw_free_stainfo(struct adapter *padapter , struct sta_info *psta)spin_unlock_bh (&pxmitpriv->lock);list_del_init (&psta->hash_list); -RT_TRACE (_module_rtl871x_sta_mgt_c_, _drv_err_, ("\n free number_%d stainfo with hwaddr=0x%.2x 0x%.2x 0x%.2x 0x%.2x 0x%.2x 0x%.2x\n" , pstapriv->asoc_sta_count , psta->hwaddr[0 ], psta->hwaddr[1 ], psta->hwaddr[2 ], psta->hwaddr[3 ], psta->hwaddr[4 ], psta->hwaddr[5 ])); +RT_TRACE (_module_rtl871x_sta_mgt_c_, _drv_err_, ("\n free number_%d stainfo with hwaddr=0x%.2x 0x%.2x 0x%.2x 0x%.2x 0x%.2x 0x%.2x\n" , pstapriv->asoc_sta_count, psta->hwaddr[0 ], psta->hwaddr[1 ], psta->hwaddr[2 ], psta->hwaddr[3 ], psta->hwaddr[4 ], psta->hwaddr[5 ])); pstapriv->asoc_sta_count--;/* re-init sta_info; 20061114 */
@@ -468,12 +468,12 @@ void rtw_free_all_stainfo(struct adapter *padapter) plist = phead->next;while (phead != plist) { - psta = container_of(plist, struct sta_info , hash_list); + psta = container_of(plist, struct sta_info, hash_list); plist = plist->next;if (pbcmc_stainfo != psta) -rtw_free_stainfo (padapter , psta); +rtw_free_stainfo (padapter, psta); } }spin_unlock_bh (&pstapriv->sta_hash_lock);
drivers/staging/r8188eu/core/rtw_xmit.c +3 -3
@@ -650,7 +650,7 @@ static s32 xmitframe_addmic(struct adapter *padapter, struct xmit_frame *pxmitfrif (pattrib->psta) stainfo = pattrib->psta;else - stainfo =rtw_get_stainfo (&padapter->stapriv , &pattrib->ra[0 ]); + stainfo =rtw_get_stainfo (&padapter->stapriv, &pattrib->ra[0 ]); hw_hdr_offset =TXDESC_SIZE + (pxmitframe->pkt_offset *PACKET_OFFSET_SZ );;
@@ -778,7 +778,7 @@ static s32 xmitframe_swencrypt(struct adapter *padapter, struct xmit_frame *pxmireturn _SUCCESS; } -s32 rtw_make_wlanhdr (struct adapter *padapter ,u8 *hdr,struct pkt_attrib *pattrib) +s32 rtw_make_wlanhdr (struct adapter *padapter,u8 *hdr,struct pkt_attrib *pattrib) {u16 *qc;
@@ -1826,7 +1826,7 @@ static void do_queue_select(struct adapter *padapter, struct pkt_attrib *pattribu8 qsel; qsel = pattrib->priority; -RT_TRACE (_module_rtl871x_xmit_c_, _drv_info_, ("### do_queue_select priority=%d , qsel = %d\n" , pattrib->priority , qsel)); +RT_TRACE (_module_rtl871x_xmit_c_, _drv_info_, ("### do_queue_select priority=%d , qsel = %d\n" , pattrib->priority, qsel)); pattrib->qsel = qsel; }
drivers/staging/r8188eu/hal/Hal8188ERateAdaptive.c +2 -2
@@ -86,7 +86,7 @@ static u8 DROPING_NECESSARY[RATESIZE] = {static u8 PendingForRateUpFail[5 ] = {2 ,10 ,24 ,40 ,60 };static u16 DynamicTxRPTTiming[6 ] = { -0x186a ,0x30d4 ,0x493e ,0x61a8 ,0x7a12 ,0x927c };/* 200ms-1200ms */ +0x186a ,0x30d4 ,0x493e ,0x61a8 ,0x7a12 ,0x927c };/* 200ms-1200ms */ /* End Rate adaptive parameters */
@@ -712,7 +712,7 @@ void ODM_RA_TxRPT2Handle_8188E(struct odm_dm_struct *dm_odm, u8 *TxRPT_Buf, u16 pRAInfo->RTY[0 ], pRAInfo->RTY[1 ], pRAInfo->RTY[2 ], pRAInfo->RTY[3 ], pRAInfo->RTY[4 ], pRAInfo->DROP, - macid_entry0 , macid_entry1)); + macid_entry0, macid_entry1));if (pRAInfo->PTActive) {if (pRAInfo->RAstage <5 )odm_RateDecision_8188E (dm_odm, pRAInfo);
drivers/staging/r8188eu/hal/HalPwrSeqCmd.c +7 -7
@@ -39,7 +39,7 @@ u8 HalPwrSeqCmdParsing(struct adapter *padapter, u8 cut_vers, u8 fab_vers, do { pwrcfgcmd = pwrseqcmd[aryidx]; - RT_TRACE(_module_hal_init_c_ , _drv_info_, + RT_TRACE(_module_hal_init_c_, _drv_info_, ("HalPwrSeqCmdParsing: offset(%#x) cut_msk(%#x) fab_msk(%#x) interface_msk(%#x) base(%#x) cmd(%#x) msk(%#x) value(%#x)\n", GET_PWR_CFG_OFFSET(pwrcfgcmd), GET_PWR_CFG_CUT_MASK(pwrcfgcmd),
@@ -56,10 +56,10 @@ u8 HalPwrSeqCmdParsing(struct adapter *padapter, u8 cut_vers, u8 fab_vers, (GET_PWR_CFG_INTF_MASK(pwrcfgcmd) & ifacetype)) {switch (GET_PWR_CFG_CMD (pwrcfgcmd)) {case PWR_CMD_READ : -RT_TRACE (_module_hal_init_c_ , _drv_info_, ("HalPwrSeqCmdParsing: PWR_CMD_READ\n" )); +RT_TRACE (_module_hal_init_c_, _drv_info_, ("HalPwrSeqCmdParsing: PWR_CMD_READ\n" ));break ;case PWR_CMD_WRITE : -RT_TRACE (_module_hal_init_c_ , _drv_info_, ("HalPwrSeqCmdParsing: PWR_CMD_WRITE\n" )); +RT_TRACE (_module_hal_init_c_, _drv_info_, ("HalPwrSeqCmdParsing: PWR_CMD_WRITE\n" )); offset =GET_PWR_CFG_OFFSET (pwrcfgcmd);/* Read the value from system register */
@@ -72,7 +72,7 @@ u8 HalPwrSeqCmdParsing(struct adapter *padapter, u8 cut_vers, u8 fab_vers,rtw_write8 (padapter, offset, value);break ;case PWR_CMD_POLLING : -RT_TRACE (_module_hal_init_c_ , _drv_info_, ("HalPwrSeqCmdParsing: PWR_CMD_POLLING\n" )); +RT_TRACE (_module_hal_init_c_, _drv_info_, ("HalPwrSeqCmdParsing: PWR_CMD_POLLING\n" )); poll_bit = false; offset =GET_PWR_CFG_OFFSET (pwrcfgcmd);
@@ -92,7 +92,7 @@ u8 HalPwrSeqCmdParsing(struct adapter *padapter, u8 cut_vers, u8 fab_vers, }while (!poll_bit);break ;case PWR_CMD_DELAY : -RT_TRACE (_module_hal_init_c_ , _drv_info_, ("HalPwrSeqCmdParsing: PWR_CMD_DELAY\n" )); +RT_TRACE (_module_hal_init_c_, _drv_info_, ("HalPwrSeqCmdParsing: PWR_CMD_DELAY\n" ));if (GET_PWR_CFG_VALUE (pwrcfgcmd) ==PWRSEQ_DELAY_US )rtw_udelay_os (GET_PWR_CFG_OFFSET (pwrcfgcmd));else
@@ -100,11 +100,11 @@ u8 HalPwrSeqCmdParsing(struct adapter *padapter, u8 cut_vers, u8 fab_vers,break ;case PWR_CMD_END :/* When this command is parsed, end the process */ -RT_TRACE (_module_hal_init_c_ , _drv_info_, ("HalPwrSeqCmdParsing: PWR_CMD_END\n" )); +RT_TRACE (_module_hal_init_c_, _drv_info_, ("HalPwrSeqCmdParsing: PWR_CMD_END\n" ));return true;break ;default : -RT_TRACE (_module_hal_init_c_ , _drv_err_, ("HalPwrSeqCmdParsing: Unknown CMD!!\n" )); +RT_TRACE (_module_hal_init_c_, _drv_err_, ("HalPwrSeqCmdParsing: Unknown CMD!!\n" ));break ; } }
drivers/staging/r8188eu/hal/hal_com.c +1 -1
@@ -340,7 +340,7 @@ s32 c2h_evt_read(struct adapter *adapter, u8 *buf) *(buf+1 ) =rtw_read8 (adapter,REG_C2HEVT_MSG_NORMAL +1 );RT_PRINT_DATA (_module_hal_init_c_, _drv_info_,"c2h_evt_read(): " , - &c2h_evt ,sizeof (c2h_evt)); + &c2h_evt,sizeof (c2h_evt));/* Read the content */ for (i =0 ; i < c2h_evt->plen; i++)
drivers/staging/r8188eu/hal/odm.c +5 -5
@@ -1153,8 +1153,8 @@ void ODM_RF_Saving(struct odm_dm_struct *pDM_Odm, u8 bForceInNormal)/* <tynli_note> 8723 RSSI report will be wrong. Set 0x874[5]=1 when enter BB power saving mode. */ /* Suggested by SD3 Yu-Nan. 2011.01.20. */ if (pDM_Odm->SupportICType ==ODM_RTL8723A ) -ODM_SetBBReg (pDM_Odm,0x874 ,BIT5 ,0x1 );/* Reg874[5]=1b'1 */ -ODM_SetBBReg (pDM_Odm,0x874 ,0x1C0000 ,0x2 );/* Reg874[20:18]=3'b010 */ +ODM_SetBBReg (pDM_Odm,0x874 ,BIT5 ,0x1 );/* Reg874[5]=1b'1 */ +ODM_SetBBReg (pDM_Odm,0x874 ,0x1C0000 ,0x2 );/* Reg874[20:18]=3'b010 */ ODM_SetBBReg (pDM_Odm,0xc70 ,BIT3 ,0 );/* RegC70[3]=1'b0 */ ODM_SetBBReg (pDM_Odm,0x85c ,0xFF000000 ,0x63 );/* Reg85C[31:24]=0x63 */ ODM_SetBBReg (pDM_Odm,0x874 ,0xC000 ,0x2 );/* Reg874[15:14]=2'b10 */
@@ -1162,7 +1162,7 @@ void ODM_RF_Saving(struct odm_dm_struct *pDM_Odm, u8 bForceInNormal)ODM_SetBBReg (pDM_Odm,0x818 ,BIT28 ,0x0 );/* Reg818[28]=1'b0 */ ODM_SetBBReg (pDM_Odm,0x818 ,BIT28 ,0x1 );/* Reg818[28]=1'b1 */ }else { -ODM_SetBBReg (pDM_Odm,0x874 ,0x1CC000 , pDM_PSTable->Reg874); +ODM_SetBBReg (pDM_Odm,0x874 ,0x1CC000 , pDM_PSTable->Reg874);ODM_SetBBReg (pDM_Odm,0xc70 ,BIT3 , pDM_PSTable->RegC70);ODM_SetBBReg (pDM_Odm,0x85c ,0xFF000000 , pDM_PSTable->Reg85C);ODM_SetBBReg (pDM_Odm,0xa74 ,0xF000 , pDM_PSTable->RegA74);
@@ -1334,7 +1334,7 @@ void odm_RefreshRateAdaptiveMaskCE(struct odm_dm_struct *pDM_Odm)for (i =0 ; i <ODM_ASSOCIATE_ENTRY_NUM ; i++) {struct sta_info *pstat = pDM_Odm->pODM_StaInfo[i];if (IS_STA_VALID (pstat)) { -if (ODM_RAStateCheck (pDM_Odm, pstat->rssi_stat.UndecoratedSmoothedPWDB, false , &pstat->rssi_level)) { +if (ODM_RAStateCheck (pDM_Odm, pstat->rssi_stat.UndecoratedSmoothedPWDB, false, &pstat->rssi_level)) {ODM_RT_TRACE (pDM_Odm,ODM_COMP_RA_MASK ,ODM_DBG_LOUD , ("RSSI:%d, RSSI_LEVEL:%d\n" , pstat->rssi_stat.UndecoratedSmoothedPWDB, pstat->rssi_level));
@@ -1554,7 +1554,7 @@ void odm_RSSIMonitorCheckCE(struct odm_dm_struct *pDM_Odm) pdmpriv->EntryMinUndecoratedSmoothedPWDB =0 ;FindMinimumRSSI (Adapter); -ODM_CmnInfoUpdate (&pHalData->odmpriv ,ODM_CMNINFO_RSSI_MIN , pdmpriv->MinUndecoratedPWDBForDM); +ODM_CmnInfoUpdate (&pHalData->odmpriv,ODM_CMNINFO_RSSI_MIN , pdmpriv->MinUndecoratedPWDBForDM); }void odm_RSSIMonitorCheckAP (struct odm_dm_struct *pDM_Odm)
drivers/staging/r8188eu/hal/rtl8188e_hal_init.c +6 -6
@@ -431,7 +431,7 @@ static int _BlockWrite(struct adapter *padapter, void *buffer, u32 buffSize)if (blockCount_p2) {RT_TRACE (_module_hal_init_c_, _drv_notice_, ("_BlockWrite: [P2] buffSize_p2(%d) blockSize_p2(%d) blockCount_p2(%d) remainSize_p2(%d)\n" , - (buffSize-offset), blockSize_p2 , blockCount_p2, remainSize_p2)); + (buffSize-offset), blockSize_p2, blockCount_p2, remainSize_p2)); }for (i =0 ; i < blockCount_p2; i++) {
@@ -702,7 +702,7 @@ static void rtl8188e_free_hal_data(struct adapter *padapter)/* */ enum {VOLTAGE_V25 =0x03 , -LDOE25_SHIFT =28 , +LDOE25_SHIFT =28 , }; static bool
@@ -1112,7 +1112,7 @@ static u8 Hal_EfuseWordEnableDataWrite(struct adapter *pAdapter, u16 efuse_addr,efuse_OneByteWrite (pAdapter, start_addr++, data[2 ], bPseudoTest);efuse_OneByteWrite (pAdapter, start_addr++, data[3 ], bPseudoTest); -efuse_OneByteRead (pAdapter, tmpaddr , &tmpdata[2 ], bPseudoTest); +efuse_OneByteRead (pAdapter, tmpaddr, &tmpdata[2 ], bPseudoTest);efuse_OneByteRead (pAdapter, tmpaddr+1 , &tmpdata[3 ], bPseudoTest);if ((data[2 ] != tmpdata[2 ]) || (data[3 ] != tmpdata[3 ])) badworden &= (~BIT1 );
@@ -2152,7 +2152,7 @@ void Hal_ReadPowerSavingMode88E(struct adapter *padapter, u8 *hwinfo, bool AutoL padapter->pwrctrlpriv.bSupportRemoteWakeup = (hwinfo[EEPROM_USB_OPTIONAL_FUNCTION0 ] &BIT1 ) ? true : false;DBG_88E ("%s...bHWPwrPindetect(%x)-bHWPowerdown(%x) , bSupportRemoteWakeup(%x)\n" , __func__, - padapter->pwrctrlpriv.bHWPwrPindetect, padapter->pwrctrlpriv.bHWPowerdown , padapter->pwrctrlpriv.bSupportRemoteWakeup); + padapter->pwrctrlpriv.bHWPwrPindetect, padapter->pwrctrlpriv.bHWPowerdown, padapter->pwrctrlpriv.bSupportRemoteWakeup);DBG_88E ("### PS params => power_mgnt(%x), usbss_enable(%x) ###\n" , padapter->registrypriv.power_mgnt, padapter->registrypriv.usbss_enable); }
@@ -2182,8 +2182,8 @@ void Hal_ReadTxPowerInfo88E(struct adapter *padapter, u8 *PROMContent, bool Auto }if (bIn24G) {DBG_88E ("======= Path %d, Channel %d =======\n" , rfPath, ch); -DBG_88E ("Index24G_CCK_Base[%d][%d] = 0x%x\n" , rfPath, ch , pHalData->Index24G_CCK_Base[rfPath][ch]); -DBG_88E ("Index24G_BW40_Base[%d][%d] = 0x%x\n" , rfPath, ch , pHalData->Index24G_BW40_Base[rfPath][ch]); +DBG_88E ("Index24G_CCK_Base[%d][%d] = 0x%x\n" , rfPath, ch, pHalData->Index24G_CCK_Base[rfPath][ch]); +DBG_88E ("Index24G_BW40_Base[%d][%d] = 0x%x\n" , rfPath, ch, pHalData->Index24G_BW40_Base[rfPath][ch]); } }for (TxCount =0 ; TxCount <MAX_TX_COUNT ; TxCount++) {
drivers/staging/r8188eu/hal/rtl8188e_mp.c +1 -1
@@ -545,7 +545,7 @@ s32 Hal_SetThermalMeter(struct adapter *pAdapter, u8 target_ther)void Hal_TriggerRFThermalMeter (struct adapter *pAdapter) { -_write_rfreg (pAdapter,RF_PATH_A ,RF_T_METER_88E ,BIT17 |BIT16 ,0x03 ); +_write_rfreg (pAdapter,RF_PATH_A ,RF_T_METER_88E ,BIT17 |BIT16 ,0x03 ); }u8 Hal_ReadRFThermalMeter (struct adapter *pAdapter)
drivers/staging/r8188eu/hal/usb_halinit.c +1 -1
@@ -1886,7 +1886,7 @@ static void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8 *val) }break ;case HW_VAR_H2C_MEDIA_STATUS_RPT : -rtl8188e_set_FwMediaStatus_cmd (Adapter , (*(__le16 *)val)); +rtl8188e_set_FwMediaStatus_cmd (Adapter, (*(__le16 *)val));break ;case HW_VAR_BCN_VALID :/* BCN_VALID, BIT16 of REG_TDECTRL = BIT0 of REG_TDECTRL+2, write 1 to clear, Clear by sw */
Signature · 1 line
2.32.0
PATCH 2/2 staging: r8188eu: add missing spaces after ',' and before braces
Add missing spaces to clear checkpatch errors.
ERROR: space required before the open parenthesis '('
ERROR: space required before the open brace '{'
ERROR: space required after that ',' (ctx:ExV)
Signed-off-by Michael Straube <[email protected]>
--- drivers/staging/r8188eu/core/rtw_ap.c | 2 +- drivers/staging/r8188eu/core/rtw_mlme.c | 10 +++++----- drivers/staging/r8188eu/core/rtw_security.c | 4 ++-- drivers/staging/r8188eu/hal/HalHWImg8188E_BB.c | 2 +- drivers/staging/r8188eu/hal/hal_intf.c | 2 +- drivers/staging/r8188eu/hal/odm_RegConfig8188E.c | 2 +- drivers/staging/r8188eu/hal/rtl8188e_hal_init.c | 2 +- drivers/staging/r8188eu/os_dep/rtw_android.c | 4 ++-- 8 files changed, 14 insertions(+), 14 deletions(-)
drivers/staging/r8188eu/core/rtw_ap.c +1 -1
@@ -1028,7 +1028,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len)/* set Max Rx AMPDU size to 64K */ pht_cap->ampdu_params_info |= (IEEE80211_HT_CAP_AMPDU_FACTOR &0x03 ); -if (rf_type ==RF_1T1R ) { +if (rf_type ==RF_1T1R ) { pht_cap->mcs.rx_mask[0 ] =0xff ; pht_cap->mcs.rx_mask[1 ] =0x0 ; }
drivers/staging/r8188eu/core/rtw_mlme.c +5 -5
@@ -1317,7 +1317,7 @@ static u8 search_max_mac_id(struct adapter *padapter) }/* FOR AP , AD-HOC mode */ -void rtw_sta_media_status_rpt (struct adapter *adapter,struct sta_info *psta, +void rtw_sta_media_status_rpt (struct adapter *adapter,struct sta_info *psta,u32 mstatus) {u16 media_status_rpt;
@@ -1330,7 +1330,7 @@ void rtw_sta_media_status_rpt(struct adapter *adapter,struct sta_info *psta,rtw_hal_set_hwreg (adapter,HW_VAR_TX_RPT_MAX_MACID , (u8 *)&macid);/* MACID|OPMODE:1 connect */ media_status_rpt = (u16)((psta->mac_id<<8 ) | mstatus); -rtw_hal_set_hwreg (adapter,HW_VAR_H2C_MEDIA_STATUS_RPT , +rtw_hal_set_hwreg (adapter,HW_VAR_H2C_MEDIA_STATUS_RPT , (u8 *)&media_status_rpt); }
@@ -1428,7 +1428,7 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf)spin_lock_bh (&pmlmepriv->lock);if (check_fwstate (pmlmepriv,WIFI_STATION_STATE )) { -if (adapter->registrypriv.wifi_spec ==1 ) +if (adapter->registrypriv.wifi_spec ==1 )rtw_set_roaming (adapter,0 );/* don't roam */ else if (rtw_to_roaming (adapter) >0 ) pmlmepriv->to_roaming--;/* this stadel_event is caused by roaming, decrease to_roaming */
@@ -1651,7 +1651,7 @@ static int rtw_check_join_candidate(struct mlme_priv *pmlmeprivif (rtw_is_desired_network (adapter, competitor) == false) goto exit; -if (rtw_to_roaming (adapter) >0 ) { +if (rtw_to_roaming (adapter) >0 ) {if (rtw_get_passing_time_ms ((u32 )competitor->last_scanned) >=RTW_SCAN_RESULT_EXPIRE ||is_same_ess (&competitor->network, &pmlmepriv->cur_network.network) == false) goto exit;
@@ -1668,7 +1668,7 @@ static int rtw_check_join_candidate(struct mlme_priv *pmlmepriv (*candidate)->network.Ssid.Ssid, (*candidate)->network.MacAddress, (int)(*candidate)->network.Rssi); -DBG_88E ("[to_roaming:%u]\n" ,rtw_to_roaming (adapter)); +DBG_88E ("[to_roaming:%u]\n" ,rtw_to_roaming (adapter)); } exit:
drivers/staging/r8188eu/core/rtw_security.c +2 -2
@@ -1229,7 +1229,7 @@ u32 rtw_aes_encrypt(struct adapter *padapter, u8 *pxmitframe) length = pattrib->last_txcmdsz-pattrib->hdrlen-pattrib->iv_len-pattrib->icv_len;aes_cipher (prwskey, pattrib->hdrlen, pframe, length); - }else { + }else { length = pxmitpriv->frag_len-pattrib->hdrlen-pattrib->iv_len-pattrib->icv_len ;aes_cipher (prwskey, pattrib->hdrlen, pframe, length);
@@ -1237,7 +1237,7 @@ u32 rtw_aes_encrypt(struct adapter *padapter, u8 *pxmitframe) pframe = (u8 *)RND4 ((size_t )(pframe)); } } - }else { + }else {RT_TRACE (_module_rtl871x_security_c_, _drv_err_, ("rtw_aes_encrypt: stainfo==NULL!!!\n" )); res = _FAIL; }
drivers/staging/r8188eu/hal/HalHWImg8188E_BB.c +1 -1
@@ -539,7 +539,7 @@ enum HAL_STATUS ODM_ReadAndConfig_PHY_REG_1T_8188E(struct odm_dm_struct *dm_odm)rtw_IOL_append_DELAY_US_cmd (pxmit_frame,5 ); }else if (v1 ==0xf9 ) {rtw_IOL_append_DELAY_US_cmd (pxmit_frame,1 ); - }else { + }else {if (v1 ==0xa24 ) dm_odm->RFCalibrateInfo.RegA24 = v2;
drivers/staging/r8188eu/hal/hal_intf.c +1 -1
@@ -201,7 +201,7 @@ u8 rtw_hal_intf_ps_func(struct adapter *adapt,s32 rtw_hal_xmitframe_enqueue (struct adapter *padapter,struct xmit_frame *pxmitframe) { -if (padapter->HalFunc.hal_xmitframe_enqueue) +if (padapter->HalFunc.hal_xmitframe_enqueue)return padapter->HalFunc.hal_xmitframe_enqueue (padapter, pxmitframe);return false; }
drivers/staging/r8188eu/hal/odm_RegConfig8188E.c +1 -1
@@ -77,7 +77,7 @@ void odm_ConfigBB_PHY_REG_PG_8188E(struct odm_dm_struct *pDM_Odm, u32 Addr,ODM_delay_us (5 ); }else if (Addr ==0xf9 ) {ODM_delay_us (1 ); - }else { + }else {ODM_RT_TRACE (pDM_Odm,ODM_COMP_INIT ,ODM_DBG_LOUD , ("===> @@@@@@@ ODM_ConfigBBWithHeaderFile: [PHY_REG] %08X %08X %08X\n" , Addr, Bitmask, Data));
drivers/staging/r8188eu/hal/rtl8188e_hal_init.c +1 -1
@@ -1741,7 +1741,7 @@ static struct HAL_VERSION ReadChipVersion8188E(struct adapter *padapter) }else if (IS_2T2R (ChipVersion)) { pHalData->rf_type =RF_2T2R ; pHalData->NumTotalRFPath =2 ; - }else { + }else { pHalData->rf_type =RF_1T1R ; pHalData->NumTotalRFPath =1 ; }
drivers/staging/r8188eu/os_dep/rtw_android.c +2 -2
@@ -62,12 +62,12 @@ static int g_wifi_on = true;int rtw_android_cmdstr_to_num (char *cmdstr) {int cmd_num; - for(cmd_num=0; cmd_num < ANDROID_WIFI_CMD_MAX; cmd_num++) + for (cmd_num=0; cmd_num < ANDROID_WIFI_CMD_MAX; cmd_num++)#if (LINUX_VERSION_CODE >=KERNEL_VERSION (4 ,0 ,0 ))if (!strncasecmp (cmdstr, android_wifi_cmd_str[cmd_num],strlen (android_wifi_cmd_str[cmd_num]))) #else -if (0 ==strnicmp (cmdstr, android_wifi_cmd_str[cmd_num], +if (0 ==strnicmp (cmdstr, android_wifi_cmd_str[cmd_num], strlen(android_wifi_cmd_str[cmd_num])))#endif break ;
Signature · 1 line
2.32.0