* [PATCH] staging: rtl8188eu: style fixes
@ 2017-06-02 14:36 Galo
2017-06-02 17:41 ` Nicholas Mc Guire
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Galo @ 2017-06-02 14:36 UTC (permalink / raw)
To: linux-next; +Cc: Greg Kroah-Hartman, Larry Finger
Fix several "CHECK: spaces preferred around that .." checks.
Signed-off-by: Galo Navarro <anglor@varoa.net>
---
drivers/staging/rtl8188eu/core/rtw_mlme.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme.c b/drivers/staging/rtl8188eu/core/rtw_mlme.c
index de9ab59..92f7297 100644
--- a/drivers/staging/rtl8188eu/core/rtw_mlme.c
+++ b/drivers/staging/rtl8188eu/core/rtw_mlme.c
@@ -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);
--
2.1.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] staging: rtl8188eu: style fixes
2017-06-02 14:36 [PATCH] staging: rtl8188eu: style fixes Galo
@ 2017-06-02 17:41 ` Nicholas Mc Guire
2017-06-03 8:18 ` Greg Kroah-Hartman
2017-06-13 19:05 ` [PATCH v2] " Galo Navarro
2 siblings, 0 replies; 6+ messages in thread
From: Nicholas Mc Guire @ 2017-06-02 17:41 UTC (permalink / raw)
To: Galo; +Cc: linux-next, Greg Kroah-Hartman, Larry Finger
On Fri, Jun 02, 2017 at 04:36:44PM +0200, Galo wrote:
> Fix several "CHECK: spaces preferred around that .." checks.
>
> Signed-off-by: Galo Navarro <anglor@varoa.net>
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
>
> ---
> drivers/staging/rtl8188eu/core/rtw_mlme.c | 14 +++++++-------
> 1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme.c b/drivers/staging/rtl8188eu/core/rtw_mlme.c
> index de9ab59..92f7297 100644
> --- a/drivers/staging/rtl8188eu/core/rtw_mlme.c
> +++ b/drivers/staging/rtl8188eu/core/rtw_mlme.c
> @@ -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);
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);
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);
> --
> 2.1.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-next" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
thx!
hofrat
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] staging: rtl8188eu: style fixes
2017-06-02 14:36 [PATCH] staging: rtl8188eu: style fixes Galo
2017-06-02 17:41 ` Nicholas Mc Guire
@ 2017-06-03 8:18 ` Greg Kroah-Hartman
2017-06-13 19:05 ` [PATCH v2] " Galo Navarro
2 siblings, 0 replies; 6+ messages in thread
From: Greg Kroah-Hartman @ 2017-06-03 8:18 UTC (permalink / raw)
To: Galo; +Cc: linux-next, Larry Finger
On Fri, Jun 02, 2017 at 04:36:44PM +0200, Galo wrote:
> Fix several "CHECK: spaces preferred around that .." checks.
>
> Signed-off-by: Galo Navarro <anglor@varoa.net>
This name doesn't match the name in your "From:" line in your email :(
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2] staging: rtl8188eu: style fixes
2017-06-02 14:36 [PATCH] staging: rtl8188eu: style fixes Galo
2017-06-02 17:41 ` Nicholas Mc Guire
2017-06-03 8:18 ` Greg Kroah-Hartman
@ 2017-06-13 19:05 ` Galo Navarro
2017-06-14 10:26 ` Greg Kroah-Hartman
2 siblings, 1 reply; 6+ messages in thread
From: Galo Navarro @ 2017-06-13 19:05 UTC (permalink / raw)
To: linux-next; +Cc: Greg Kroah-Hartman, Larry Finger
Fix multiple style issues (CHECK spaces preferred around that $thing).
Signed-off-by: Galo Navarro <anglor@varoa.net>
---
drivers/staging/rtl8188eu/core/rtw_mlme.c | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme.c b/drivers/staging/rtl8188eu/core/rtw_mlme.c
index de9ab59..25b0452 100644
--- a/drivers/staging/rtl8188eu/core/rtw_mlme.c
+++ b/drivers/staging/rtl8188eu/core/rtw_mlme.c
@@ -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);
--
2.1.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v2] staging: rtl8188eu: style fixes
2017-06-13 19:05 ` [PATCH v2] " Galo Navarro
@ 2017-06-14 10:26 ` Greg Kroah-Hartman
2017-06-24 18:32 ` [PATCH v3] " Galo Navarro
0 siblings, 1 reply; 6+ messages in thread
From: Greg Kroah-Hartman @ 2017-06-14 10:26 UTC (permalink / raw)
To: Galo Navarro; +Cc: linux-next, Larry Finger
On Tue, Jun 13, 2017 at 09:05:19PM +0200, Galo Navarro wrote:
> 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
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v3] staging: rtl8188eu: style fixes
2017-06-14 10:26 ` Greg Kroah-Hartman
@ 2017-06-24 18:32 ` Galo Navarro
0 siblings, 0 replies; 6+ messages in thread
From: Galo Navarro @ 2017-06-24 18:32 UTC (permalink / raw)
To: Greg Kroah-Hartman; +Cc: linux-next, Larry Finger
Fix multiple style issues (CHECK spaces preferred around that $operator).
Signed-off-by: Galo Navarro <anglor@varoa.net>
---
drivers/staging/rtl8188eu/core/rtw_mlme.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme.c b/drivers/staging/rtl8188eu/core/rtw_mlme.c
index de9ab59..fde3060 100644
--- a/drivers/staging/rtl8188eu/core/rtw_mlme.c
+++ b/drivers/staging/rtl8188eu/core/rtw_mlme.c
@@ -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);
--
2.1.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-06-24 18:33 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-06-02 14:36 [PATCH] staging: rtl8188eu: style fixes Galo
2017-06-02 17:41 ` Nicholas Mc Guire
2017-06-03 8:18 ` Greg Kroah-Hartman
2017-06-13 19:05 ` [PATCH v2] " Galo Navarro
2017-06-14 10:26 ` Greg Kroah-Hartman
2017-06-24 18:32 ` [PATCH v3] " Galo Navarro
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).