staging: rtl8188eu: style fixes
Subsystems (2)
PATCH 1/1 staging: rtl8188eu: style fixes
Fix several "CHECK: spaces preferred around that .." checks.
Signed-off-by Galo Navarro <[email protected]>
--- drivers/staging/rtl8188eu/core/rtw_mlme.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/staging/rtl8188eu/core/rtw_mlme.c +7 -7
@@ -370,14 +370,14 @@ void update_network(struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src, sq_final = padapter->recvpriv.signal_qual;/* the rssi value here is undecorated, and will be used for antenna diversity */ if (sq_smp !=101 )/* from the right channel */ - rssi_final = (src->Rssi+dst->Rssi*4 )/5 ; + rssi_final = (src->Rssi + dst->Rssi *4 ) /5 ;else rssi_final = rssi_ori; }else {if (sq_smp !=101 ) {/* from the right channel */ ss_final = ((u32)(src->PhyInfo.SignalStrength)+(u32)(dst->PhyInfo.SignalStrength)*4 )/5 ; sq_final = ((u32)(src->PhyInfo.SignalQuality)+(u32)(dst->PhyInfo.SignalQuality)*4 )/5 ; - rssi_final = (src->Rssi+dst->Rssi*4 )/5 ; + rssi_final = (src->Rssi + dst->Rssi *4 ) /5 ; }else {/* bss info not receiving from the right channel, use the original RX signal infos */ ss_final = dst->PhyInfo.SignalStrength;
@@ -1926,7 +1926,7 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_if (pqospriv->qos_option ==0 ) { out_len = *pout_len; -rtw_set_ie (out_ie+out_len, _VENDOR_SPECIFIC_IE_, +rtw_set_ie (out_ie + out_len, _VENDOR_SPECIFIC_IE_, _WMM_IE_Length_,WMM_IE , pout_len); pqospriv->qos_option =1 ;
@@ -1964,10 +1964,10 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_ phtpriv->ht_option = true; - p =rtw_get_ie (in_ie+12 , _HT_ADD_INFO_IE_, &ielen, in_len-12 ); + 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;
@@ -2058,8 +2058,8 @@ void rtw_issue_addbareq_cmd(struct adapter *padapter, struct xmit_frame *pxmitfr phtpriv = &psta->htpriv;if ((phtpriv->ht_option) && (phtpriv->ampdu_enable)) { - issued = (phtpriv->agg_enable_bitmap>>priority)&0x1 ; - issued |= (phtpriv->candidate_tid_bitmap>>priority)&0x1 ; + issued = (phtpriv->agg_enable_bitmap >> priority) &0x1 ; + issued |= (phtpriv->candidate_tid_bitmap >> priority) &0x1 ;if (issued ==0 ) {DBG_88E ("rtw_issue_addbareq_cmd, p=%d\n" , priority);
Signature · 1 line
2.1.4
Quoted 3 lines · Galo
Fix several "CHECK: spaces preferred around that .." checks.
Signed-off-by Galo Navarro <[email protected]>
cleanup patches are ok - but if you do cleanups you should also run checkpatch.pl on your patch. This would have shown you that two of the lines you fixed are over 80 char and should be broken
Also I do not see much sense in picking out individual lines for space fixing and leaving other adjacent lines out e.g.:
ss_final = ((u32)(src->PhyInfo.SignalStrength)+(u32)(dst->PhyInfo.SignalStrength)*4)/5;
sq_final = ((u32)(src->PhyInfo.SignalQuality)+(u32)(dst->PhyInfo.SignalQuality)*4)/5;
rssi_final = (src->Rssi+dst->Rssi*4)/5;All three lines have the same spacing issue - but your patch addresses the last line only. While it is ok not to fix all spacing issues in a file at once I think that at least within a basic block one should keep it consistent. style cleanup intends to make code more readable but if styles are mixed on a line-by-line basis this goal is hardly achieved
I would prefere you redo this patch and ensure at least local consistency
Quoted 36 lines
--- drivers/staging/rtl8188eu/core/rtw_mlme.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)drivers/staging/rtl8188eu/core/rtw_mlme.c +3
-3@@ -370,14 +370,14 @@ void update_network(struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src, sq_final = padapter->recvpriv.signal_qual;/* the rssi value here is undecorated, and will be used for antenna diversity */ if (sq_smp !=101 )/* from the right channel */ - rssi_final = (src->Rssi+dst->Rssi*4 )/5 ; + rssi_final = (src->Rssi + dst->Rssi *4 ) /5 ;else rssi_final = rssi_ori; }else {if (sq_smp !=101 ) {/* from the right channel */ ss_final = ((u32)(src->PhyInfo.SignalStrength)+(u32)(dst->PhyInfo.SignalStrength)*4 )/5 ; sq_final = ((u32)(src->PhyInfo.SignalQuality)+(u32)(dst->PhyInfo.SignalQuality)*4 )/5 ; - rssi_final = (src->Rssi+dst->Rssi*4 )/5 ; + rssi_final = (src->Rssi + dst->Rssi *4 ) /5 ; }else {/* bss info not receiving from the right channel, use the original RX signal infos */ ss_final = dst->PhyInfo.SignalStrength;@@ -1926,7 +1926,7 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_if (pqospriv->qos_option ==0 ) { out_len = *pout_len; -rtw_set_ie (out_ie+out_len, _VENDOR_SPECIFIC_IE_, +rtw_set_ie (out_ie + out_len, _VENDOR_SPECIFIC_IE_, _WMM_IE_Length_,WMM_IE , pout_len); pqospriv->qos_option =1 ;
drivers/staging/rtl8188eu/core/rtw_mlme.c unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_ · line 1967
Quoted 5 lines
drivers/staging/rtl8188eu/core/rtw_mlme.c +1
-1@@ -1964,10 +1964,10 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_ phtpriv->ht_option = true; - p =rtw_get_ie (in_ie+12 , _HT_ADD_INFO_IE_, &ielen, in_len-12 ); + p =rtw_get_ie (in_ie +12 , _HT_ADD_INFO_IE_, &ielen, in_len -12 );
p = rtw_get_ie(in_ie + 12, _HT_ADD_INFO_IE_, &ielen, in_len - 12);
drivers/staging/rtl8188eu/core/rtw_mlme.c unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_ · line 1970
Quoted 4 lines
drivers/staging/rtl8188eu/core/rtw_mlme.c +1
-1if (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);
rtw_set_ie(out_ie + out_len, _HT_ADD_INFO_IE_, ielen,
p + 2, pout_len);
Quoted 21 lines
drivers/staging/rtl8188eu/core/rtw_mlme.c +2
-2} }return phtpriv->ht_option;@@ -2058,8 +2058,8 @@ void rtw_issue_addbareq_cmd(struct adapter *padapter, struct xmit_frame *pxmitfr phtpriv = &psta->htpriv;if ((phtpriv->ht_option) && (phtpriv->ampdu_enable)) { - issued = (phtpriv->agg_enable_bitmap>>priority)&0x1 ; - issued |= (phtpriv->candidate_tid_bitmap>>priority)&0x1 ; + issued = (phtpriv->agg_enable_bitmap >> priority) &0x1 ; + issued |= (phtpriv->candidate_tid_bitmap >> priority) &0x1 ;if (issued ==0 ) {DBG_88E ("rtw_issue_addbareq_cmd, p=%d\n" , priority);Signature · 6 lines
2.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
thx!
hofrat
Greg Kroah-Hartman
maintainerQuoted 3 lines · Galo
Fix several "CHECK: spaces preferred around that .." checks.
Signed-off-by Galo Navarro <[email protected]>
This name doesn't match the name in your "From:" line in your email :(
PATCH v2 1/1 staging: rtl8188eu: style fixes
In reply to GaloFix multiple style issues (CHECK spaces preferred around that $thing).
Signed-off-by Galo Navarro <[email protected]>
--- drivers/staging/rtl8188eu/core/rtw_mlme.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-)
drivers/staging/rtl8188eu/core/rtw_mlme.c +11 -9
@@ -370,14 +370,16 @@ void update_network(struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src, sq_final = padapter->recvpriv.signal_qual;/* the rssi value here is undecorated, and will be used for antenna diversity */ if (sq_smp !=101 )/* from the right channel */ - rssi_final = (src->Rssi+dst->Rssi*4 )/5 ; + rssi_final = (src->Rssi + dst->Rssi *4 ) /5 ;else rssi_final = rssi_ori; }else {if (sq_smp !=101 ) {/* from the right channel */ - ss_final = ((u32)(src->PhyInfo.SignalStrength)+(u32)(dst->PhyInfo.SignalStrength)*4 )/5 ; - sq_final = ((u32)(src->PhyInfo.SignalQuality)+(u32)(dst->PhyInfo.SignalQuality)*4 )/5 ; - rssi_final = (src->Rssi+dst->Rssi*4 )/5 ; + ss_final = ((u32)(src->PhyInfo.SignalStrength) + + (u32)(dst->PhyInfo.SignalStrength) *4 ) /5 ; + sq_final = ((u32)(src->PhyInfo.SignalQuality) + + (u32)(dst->PhyInfo.SignalQuality) *4 ) /5 ; + rssi_final = (src->Rssi + dst->Rssi *4 ) /5 ; }else {/* bss info not receiving from the right channel, use the original RX signal infos */ ss_final = dst->PhyInfo.SignalStrength;
@@ -1926,7 +1928,7 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_if (pqospriv->qos_option ==0 ) { out_len = *pout_len; -rtw_set_ie (out_ie+out_len, _VENDOR_SPECIFIC_IE_, +rtw_set_ie (out_ie + out_len, _VENDOR_SPECIFIC_IE_, _WMM_IE_Length_,WMM_IE , pout_len); pqospriv->qos_option =1 ;
@@ -1964,10 +1966,10 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_ phtpriv->ht_option = true; - p =rtw_get_ie (in_ie+12 , _HT_ADD_INFO_IE_, &ielen, in_len-12 ); + 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;
@@ -2058,8 +2060,8 @@ void rtw_issue_addbareq_cmd(struct adapter *padapter, struct xmit_frame *pxmitfr phtpriv = &psta->htpriv;if ((phtpriv->ht_option) && (phtpriv->ampdu_enable)) { - issued = (phtpriv->agg_enable_bitmap>>priority)&0x1 ; - issued |= (phtpriv->candidate_tid_bitmap>>priority)&0x1 ; + issued = (phtpriv->agg_enable_bitmap >> priority) &0x1 ; + issued |= (phtpriv->candidate_tid_bitmap >> priority) &0x1 ;if (issued ==0 ) {DBG_88E ("rtw_issue_addbareq_cmd, p=%d\n" , priority);
Signature · 1 line
2.1.4
Greg Kroah-Hartman
maintainerQuoted 1 line · Galo Navarro
Fix multiple style issues (CHECK spaces preferred around that $thing).
That's not the only thing you did here. Please only do one type of fix per patch. Break this up into multiple patches please.
thanks,
greg k-h
PATCH v3 1/1 staging: rtl8188eu: style fixes
Fix multiple style issues (CHECK spaces preferred around that $operator).
Signed-off-by Galo Navarro <[email protected]>
--- drivers/staging/rtl8188eu/core/rtw_mlme.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/staging/rtl8188eu/core/rtw_mlme.c +4 -4
@@ -370,7 +370,7 @@ void update_network(struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src, sq_final = padapter->recvpriv.signal_qual;/* the rssi value here is undecorated, and will be used for antenna diversity */ if (sq_smp !=101 )/* from the right channel */ - rssi_final = (src->Rssi+dst->Rssi*4 )/5 ; + rssi_final = (src->Rssi + dst->Rssi *4 ) /5 ;else rssi_final = rssi_ori; }else {
@@ -1926,7 +1926,7 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_if (pqospriv->qos_option ==0 ) { out_len = *pout_len; -rtw_set_ie (out_ie+out_len, _VENDOR_SPECIFIC_IE_, +rtw_set_ie (out_ie + out_len, _VENDOR_SPECIFIC_IE_, _WMM_IE_Length_,WMM_IE , pout_len); pqospriv->qos_option =1 ;
@@ -2058,8 +2058,8 @@ void rtw_issue_addbareq_cmd(struct adapter *padapter, struct xmit_frame *pxmitfr phtpriv = &psta->htpriv;if ((phtpriv->ht_option) && (phtpriv->ampdu_enable)) { - issued = (phtpriv->agg_enable_bitmap>>priority)&0x1 ; - issued |= (phtpriv->candidate_tid_bitmap>>priority)&0x1 ; + issued = (phtpriv->agg_enable_bitmap >> priority) &0x1 ; + issued |= (phtpriv->candidate_tid_bitmap >> priority) &0x1 ;if (issued ==0 ) {DBG_88E ("rtw_issue_addbareq_cmd, p=%d\n" , priority);
Signature · 1 line
2.1.4