staging: rtl8723bs: clean up driver code in rtw_ioctl_set
cover staging: rtl8723bs: clean up driver code in rtw_ioctl_set
Created patchset to fix all checkpatch warnings in rtw_ioctl_set
Emily Peri (3):
staging: rtl8723bs: fix white space warnings
staging: rtl8723bs: align block comment stars
staging: rtl8723bs: remove unnecessary parenthesis
drivers/staging/rtl8723bs/core/rtw_ioctl_set.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-)
Signature · 1 line
2.34.1
PATCH 1/3 staging: rtl8723bs: fix white space warnings
Fix the following checkpatch warnings in rtw_ioctl_set:
1) Add missing blankline after declaration
2) Replace spaces used for indent with tab
3) Remove space before tab
--- drivers/staging/rtl8723bs/core/rtw_ioctl_set.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/staging/rtl8723bs/core/rtw_ioctl_set.c +3 -2
@@ -78,6 +78,7 @@ u8 rtw_do_join(struct adapter *padapter) goto exit; }else {int select_ret; +spin_unlock_bh (&(pmlmepriv->scanned_queue.lock)); select_ret =rtw_select_and_join_from_scanned_queue (pmlmepriv);if (select_ret == _SUCCESS) {
@@ -311,7 +312,7 @@ u8 rtw_set_802_11_infrastructure_mode(struct adapter *padapter,if ((*pold_state == Ndis802_11Infrastructure) || (*pold_state == Ndis802_11IBSS)) {if (check_fwstate (pmlmepriv, _FW_LINKED) == true)rtw_indicate_disconnect (padapter);/* will clr Linked_state; before this function, we must have checked whether issue dis-assoc_cmd or not */ - } + } *pold_state = networktype;
@@ -367,7 +368,7 @@ u8 rtw_set_802_11_disassociate(struct adapter *padapter)u8 rtw_set_802_11_bssid_list_scan (struct adapter *padapter,struct ndis_802_11_ssid *pssid,int ssid_max_num) { -struct mlme_priv *pmlmepriv = &padapter->mlmepriv; +struct mlme_priv *pmlmepriv = &padapter->mlmepriv;u8 res = true;if (!padapter) {
Signature · 1 line
2.34.1
PATCH 2/3 staging: rtl8723bs: align block comment stars
In reply to Emily PeriAlign '*' on each line of block comment in rtw_ioctl_set. Issue found by checkpatch.
--- drivers/staging/rtl8723bs/core/rtw_ioctl_set.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/staging/rtl8723bs/core/rtw_ioctl_set.c +5 -5
@@ -463,11 +463,11 @@ u8 rtw_set_802_11_add_wep(struct adapter *padapter, struct ndis_802_11_wep *wep) }/* -* rtw_get_cur_max_rate - -* @adapter: pointer to struct adapter structure -* -* Return 0 or 100Kbps -*/ +* rtw_get_cur_max_rate - +* @adapter: pointer to struct adapter structure +* +* Return 0 or 100Kbps +*/ u16 rtw_get_cur_max_rate (struct adapter *adapter) {int i =0 ;
Signature · 1 line
2.34.1
PATCH 3/3 staging: rtl8723bs: remove unnecessary parenthesis
In reply to Emily PeriRemove extra parenthesis in conditional statement in rtw_ioctl_set. Issue found by checkpatch.
--- drivers/staging/rtl8723bs/core/rtw_ioctl_set.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/rtl8723bs/core/rtw_ioctl_set.c +1 -1
@@ -160,7 +160,7 @@ u8 rtw_set_802_11_ssid(struct adapter *padapter, struct ndis_802_11_ssid *ssid)if (check_fwstate (pmlmepriv, _FW_LINKED|WIFI_ADHOC_MASTER_STATE ) == true) {if ((pmlmepriv->assoc_ssid.ssid_length == ssid->ssid_length) && (!memcmp (&pmlmepriv->assoc_ssid.ssid, ssid->ssid, ssid->ssid_length))) { -if ((check_fwstate (pmlmepriv,WIFI_STATION_STATE ) == false)) { +if (check_fwstate (pmlmepriv,WIFI_STATION_STATE ) == false) {if (rtw_is_same_ibss (padapter, pnetwork) == false) {/* if in WIFI_ADHOC_MASTER_STATE | WIFI_ADHOC_STATE, create bss or rejoin again */ rtw_disassoc_cmd (padapter,0 , true);
Signature · 1 line
2.34.1
Re: [PATCH 1/3] staging: rtl8723bs: fix white space warnings
In reply to Emily PeriQuoted 23 lines · Emily Peri
Fix the following checkpatch warnings in
rtw_ioctl_set:
1) Add missing blankline after declaration
2) Replace spaces used for indent with tab
3) Remove space before tabSigned-off-by Emily Peri <[email protected]>--- drivers/staging/rtl8723bs/core/rtw_ioctl_set.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)drivers/staging/rtl8723bs/core/rtw_ioctl_set.c +1
-0@@ -78,6 +78,7 @@ u8 rtw_do_join(struct adapter *padapter) goto exit; }else {int select_ret; +spin_unlock_bh (&(pmlmepriv->scanned_queue.lock)); select_ret =rtw_select_and_join_from_scanned_queue (pmlmepriv);if (select_ret == _SUCCESS) {
drivers/staging/rtl8723bs/core/rtw_ioctl_set.c u8 rtw_set_802_11_infrastructure_mode(struct adapter *padapter, · line 315
Quoted 5 lines
drivers/staging/rtl8723bs/core/rtw_ioctl_set.c +1
-1@@ -311,7 +312,7 @@ u8 rtw_set_802_11_infrastructure_mode(struct adapter *padapter,if ((*pold_state == Ndis802_11Infrastructure) || (*pold_state == Ndis802_11IBSS)) {if (check_fwstate (pmlmepriv, _FW_LINKED) == true)rtw_indicate_disconnect (padapter);/* will clr Linked_state; before this function, we must have checked whether issue dis-assoc_cmd or not */ - } + }
I think indentation is wrong here, it should be only 1 tab instead of 2 tabs ?
drivers/staging/rtl8723bs/core/rtw_ioctl_set.c u8 rtw_set_802_11_disassociate(struct adapter *padapter) · line 374
Quoted 12 lines
drivers/staging/rtl8723bs/core/rtw_ioctl_set.c +1
-1*pold_state = networktype;@@ -367,7 +368,7 @@ u8 rtw_set_802_11_disassociate(struct adapter *padapter)u8 rtw_set_802_11_bssid_list_scan (struct adapter *padapter,struct ndis_802_11_ssid *pssid,int ssid_max_num) { -struct mlme_priv *pmlmepriv = &padapter->mlmepriv; +struct mlme_priv *pmlmepriv = &padapter->mlmepriv;u8 res = true;if (!padapter) {
Regards,
~Praveen.
Greg KH
maintainerRe: [PATCH 1/3] staging: rtl8723bs: fix white space warnings
In reply to Emily PeriQuoted 4 lines · Emily Peri
Fix the following checkpatch warnings in
rtw_ioctl_set:
1) Add missing blankline after declaration
2) Replace spaces used for indent with tab
3) Remove space before tab
When you have to list the different things you do, you should really break that up into individual patches. This should be 3.
thanks,
greg k-h
Re: [PATCH 1/3] staging: rtl8723bs: fix white space warnings
In reply to Praveen KumarQuoted 23 lines · Praveen Kumar
Quoted 22 lines · Emily Peri
Fix the following checkpatch warnings in
rtw_ioctl_set:
1) Add missing blankline after declaration
2) Replace spaces used for indent with tab
3) Remove space before tabSigned-off-by Emily Peri <[email protected]>--- drivers/staging/rtl8723bs/core/rtw_ioctl_set.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)drivers/staging/rtl8723bs/core/rtw_ioctl_set.c +1
-0@@ -78,6 +78,7 @@ u8 rtw_do_join(struct adapter *padapter) goto exit; }else {int select_ret; +spin_unlock_bh (&(pmlmepriv->scanned_queue.lock)); select_ret =rtw_select_and_join_from_scanned_queue (pmlmepriv);if (select_ret == _SUCCESS) {
Quoted 8 lines
drivers/staging/rtl8723bs/core/rtw_ioctl_set.c u8 rtw_set_802_11_infrastructure_mode(struct adapter *padapter, · line 315
Quoted 6 lines
drivers/staging/rtl8723bs/core/rtw_ioctl_set.c +1
-1@@ -311,7 +312,7 @@ u8 rtw_set_802_11_infrastructure_mode(struct adapter *padapter,if ((*pold_state == Ndis802_11Infrastructure) || (*pold_state == Ndis802_11IBSS)) {if (check_fwstate (pmlmepriv, _FW_LINKED) == true)rtw_indicate_disconnect (padapter);/* will clr Linked_state; before this function, we must have checked whether issue dis-assoc_cmd or not */ - } + }I think indentation is wrong here, it should be only 1 tab instead of 2 tabs ?
Thanks Praveen for the feedback! But I think this if-statement is nested inside another one beginning at line 295. Can you confirm?
Quoted 11 lines
Quoted 11 lines
drivers/staging/rtl8723bs/core/rtw_ioctl_set.c +1
-1*pold_state = networktype;@@ -367,7 +368,7 @@ u8 rtw_set_802_11_disassociate(struct adapter *padapter)u8 rtw_set_802_11_bssid_list_scan (struct adapter *padapter,struct ndis_802_11_ssid *pssid,int ssid_max_num) { -struct mlme_priv *pmlmepriv = &padapter->mlmepriv; +struct mlme_priv *pmlmepriv = &padapter->mlmepriv;u8 res = true;
Quoted 5 lines
drivers/staging/rtl8723bs/core/rtw_ioctl_set.c u8 rtw_set_802_11_disassociate(struct adapter *padapter) · line 374
Quoted 1 line
drivers/staging/rtl8723bs/core/rtw_ioctl_set.c +0
-0if (!padapter) {Regards,
~Praveen.
Now that I think about-- in this last edit I removed a space to appease checkpatch, but maybe I actually should have removed the tab?
Thanks!
Emily
Re: [PATCH 1/3] staging: rtl8723bs: fix white space warnings
In reply to Greg KHQuoted 6 lines · Greg KH
Quoted 4 lines · Emily Peri
Fix the following checkpatch warnings in
rtw_ioctl_set:
1) Add missing blankline after declaration
2) Replace spaces used for indent with tab
3) Remove space before tab
Quoted 6 lines
When you have to list the different things you do, you should really break that up into individual patches. This should be 3.
thanks,
greg k-h
Thanks greg for the feedback! I got the idea to put them all in the same patch from the PatchPhilosophy guide, which suggested combining a bunch of white space corrections into one commit. But, it sounds like I misinterpreted what the guide was saying. Maybe if there are identical warnings, such as "trailing white space" in the driver code, could those corrections go together in a single patch?
Re: [PATCH 1/3] staging: rtl8723bs: fix white space warnings
In reply to Emily PeriQuoted 11 lines · Emily Peri
Quoted 11 lines
Quoted 11 lines
*pold_state = networktype;drivers/staging/rtl8723bs/core/rtw_ioctl_set.c +1
-1@@ -367,7 +368,7 @@ u8 rtw_set_802_11_disassociate(struct adapter *padapter)u8 rtw_set_802_11_bssid_list_scan (struct adapter *padapter,struct ndis_802_11_ssid *pssid,int ssid_max_num) { -struct mlme_priv *pmlmepriv = &padapter->mlmepriv; +struct mlme_priv *pmlmepriv = &padapter->mlmepriv;u8 res = true;
Quoted 8 lines
Quoted 5 lines
drivers/staging/rtl8723bs/core/rtw_ioctl_set.c u8 rtw_set_802_11_disassociate(struct adapter *padapter) · line 374
Quoted 1 line
drivers/staging/rtl8723bs/core/rtw_ioctl_set.c +0
-0if (!padapter) {Regards,
~Praveen.
Now that I think about-- in this last edit I removed a space to appease checkpatch, but maybe I actually should have removed the tab?
Hi Emily,
you are right, just use spaces.
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
thanks,
Michael
Greg KH
maintainerRe: [PATCH 1/3] staging: rtl8723bs: fix white space warnings
In reply to Emily PeriQuoted 12 lines · Emily Peri
Quoted 11 lines · Greg KH
Quoted 4 lines · Emily Peri
Fix the following checkpatch warnings in
rtw_ioctl_set:
1) Add missing blankline after declaration
2) Replace spaces used for indent with tab
3) Remove space before tabWhen you have to list the different things you do, you should really break that up into individual patches. This should be 3.
thanks,
Quoted 9 lines
Quoted 1 line
greg k-h
Thanks greg for the feedback! I got the idea to put them all in the same patch from the PatchPhilosophy guide, which suggested combining a bunch of white space corrections into one commit. But, it sounds like I misinterpreted what the guide was saying. Maybe if there are identical warnings, such as "trailing white space" in the driver code, could those corrections go together in a single patch?
Yes, you are correct, you could do a "fix all trailing whitespace in this file" in one patch.
thanks,
greg k-h