Replace functions return types to 'bool'
cover Replace functions return types to 'bool'
This patchset modernize the return types of some functions in core/rtw_mlme.c file for greater code clarity.
Nikolay Kulikov (4):
staging: rtl8723bs: replace rtw_if_up() return type to bool
staging: rtl8723bs: replace rtw_is_same_ibss() return type to bool
staging: rtl8723bs: replace rtw_is_desired_network() return type to
bool
staging: rtl8723bs: replace rtw_linked_check() return type to bool
drivers/staging/rtl8723bs/core/rtw_mlme.c | 19 +++++++------------ drivers/staging/rtl8723bs/include/rtw_mlme.h | 6 +++--- 2 files changed, 10 insertions(+), 15 deletions(-)
P.S: Or should I have sent it all as one commit?
Thanks,
Nikolay
Signature · 1 line
2.53.0
PATCH 1/4 staging: rtl8723bs: replace rtw_if_up() return type to bool
Function rtw_if_up() actually return 'bool' value, but it's type is 'signed int'. Replace 'signed int' with 'bool' to make it more accurate.
--- drivers/staging/rtl8723bs/core/rtw_mlme.c | 6 ++---- drivers/staging/rtl8723bs/include/rtw_mlme.h | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme.c +2 -4
@@ -262,15 +262,13 @@ void rtw_free_network_queue(struct adapter *padapter, u8 isfreeall)spin_unlock_bh (&scanned_queue->lock); } -signed int rtw_if_up (struct adapter *padapter) +bool rtw_if_up (struct adapter *padapter) { -signed int res; +bool res = true;if (padapter->bDriverStopped || padapter->bSurpriseRemoved || !check_fwstate (&padapter->mlmepriv, _FW_LINKED)) res = false; -else - res = true;return res; }
drivers/staging/rtl8723bs/include/rtw_mlme.h +1 -1
@@ -362,7 +362,7 @@ extern void _rtw_free_network_nolock(struct mlme_priv *pmlmepriv, struct wlan_neextern struct wlan_network *_rtw_find_network (struct __queue *scanned_queue,u8 *addr); -extern signed int rtw_if_up (struct adapter *padapter); +bool rtw_if_up (struct adapter *padapter);signed int rtw_linked_check (struct adapter *padapter);
Signature · 1 line
2.53.0
Greg KH
maintainerRe: [PATCH 1/4] staging: rtl8723bs: replace rtw_if_up() return type to bool
Quoted 20 lines · Nikolay Kulikov
Function
rtw_if_up()actually return 'bool' value, but it's type is 'signed int'. Replace 'signed int' with 'bool' to make it more accurate.Signed-off-by Nikolay Kulikov <[email protected]>--- drivers/staging/rtl8723bs/core/rtw_mlme.c | 6 ++---- drivers/staging/rtl8723bs/include/rtw_mlme.h | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-)drivers/staging/rtl8723bs/core/rtw_mlme.c +1
-1@@ -262,15 +262,13 @@ void rtw_free_network_queue(struct adapter *padapter, u8 isfreeall)spin_unlock_bh (&scanned_queue->lock); } -signed int rtw_if_up (struct adapter *padapter) +bool rtw_if_up (struct adapter *padapter) {
drivers/staging/rtl8723bs/core/rtw_mlme.c void rtw_free_network_queue(struct adapter *padapter, u8 isfreeall) · line 273
Quoted 10 lines
drivers/staging/rtl8723bs/core/rtw_mlme.c +1
-3-signed int res; +bool res = true;if (padapter->bDriverStopped || padapter->bSurpriseRemoved || !check_fwstate (&padapter->mlmepriv, _FW_LINKED)) res = false; -else - res = true;return res;
No need for res at all, just return true/false instead?
thanks,
greg k-h
PATCH 2/4 staging: rtl8723bs: replace rtw_is_same_ibss() return type to bool
In reply to Nikolay KulikovFunction rtw_is_same_ibss() returns a 'bool' value, but has an 'int type. Replace 'int' -> 'bool' types to make it more accrurate.
--- drivers/staging/rtl8723bs/core/rtw_mlme.c | 6 ++---- drivers/staging/rtl8723bs/include/rtw_mlme.h | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme.c +2 -4
@@ -328,9 +328,9 @@ struct wlan_network *rtw_find_network(struct __queue *scanned_queue, u8 *addr)return pnetwork; } -int rtw_is_same_ibss (struct adapter *adapter,struct wlan_network *pnetwork) +bool rtw_is_same_ibss (struct adapter *adapter,struct wlan_network *pnetwork) { -int ret = true; +bool ret = true;struct security_priv *psecuritypriv = &adapter->securitypriv; if ((psecuritypriv->dot11PrivacyAlgrthm != _NO_PRIVACY_) &&
@@ -339,8 +339,6 @@ int rtw_is_same_ibss(struct adapter *adapter, struct wlan_network *pnetwork)else if ((psecuritypriv->dot11PrivacyAlgrthm == _NO_PRIVACY_) && (pnetwork->network.privacy ==1 )) ret = false; -else - ret = true;return ret; }
drivers/staging/rtl8723bs/include/rtw_mlme.h +1 -1
@@ -379,7 +379,7 @@ void rtw_update_ht_cap(struct adapter *padapter, u8 *pie, uint ie_len, u8 channevoid rtw_issue_addbareq_cmd (struct adapter *padapter,struct xmit_frame *pxmitframe);void rtw_append_exented_cap (struct adapter *padapter,u8 *out_ie,uint *pout_len); -int rtw_is_same_ibss (struct adapter *adapter,struct wlan_network *pnetwork); +bool rtw_is_same_ibss (struct adapter *adapter,struct wlan_network *pnetwork);int is_same_network (struct wlan_bssid_ex *src,struct wlan_bssid_ex *dst,u8 feature);#define rtw_roam_flags (adapter) ((adapter)->mlmepriv.roam_flags)
Signature · 1 line
2.53.0
PATCH 3/4 staging: rtl8723bs: replace rtw_is_desired_network() return type to bool
In reply to Nikolay KulikovFunction rtw_is_desired_network() used only in rtw_mlme.c file and always return 'true' or 'false', so it's type can be replaced with 'static bool'.
--- drivers/staging/rtl8723bs/core/rtw_mlme.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme.c +2 -3
@@ -591,15 +591,14 @@ void rtw_add_network(struct adapter *adapter, struct wlan_bssid_ex *pnetwork)* (4) HT * (5) others */ -int rtw_is_desired_network (struct adapter *adapter,struct wlan_network *pnetwork); -int rtw_is_desired_network (struct adapter *adapter,struct wlan_network *pnetwork) +static bool rtw_is_desired_network (struct adapter *adapter,struct wlan_network *pnetwork) {struct security_priv *psecuritypriv = &adapter->securitypriv;struct mlme_priv *pmlmepriv = &adapter->mlmepriv;u32 desired_encmode;u32 privacy;uint wps_ielen; -int bselected = true; +bool bselected = true; desired_encmode = psecuritypriv->ndisencryptstatus; privacy = pnetwork->network.privacy;
Signature · 1 line
2.53.0
PATCH 4/4 staging: rtl8723bs: replace rtw_linked_check() return type to bool
In reply to Nikolay KulikovFunction rtw_linked_check() always return 'bool' value, but it's type 'int'. Replace 'int' with 'bool' to make it more accurate.
--- drivers/staging/rtl8723bs/core/rtw_mlme.c | 2 +- drivers/staging/rtl8723bs/include/rtw_mlme.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme.c +1 -1
@@ -2589,7 +2589,7 @@ void _rtw_roaming(struct adapter *padapter, struct wlan_network *tgt_network) } } -signed int rtw_linked_check (struct adapter *padapter) +bool rtw_linked_check (struct adapter *padapter) {if (check_fwstate (&padapter->mlmepriv,WIFI_AP_STATE ) ||check_fwstate (&padapter->mlmepriv,WIFI_ADHOC_STATE |WIFI_ADHOC_MASTER_STATE )) {
drivers/staging/rtl8723bs/include/rtw_mlme.h +1 -1
@@ -364,7 +364,7 @@ extern struct wlan_network *_rtw_find_network(struct __queue *scanned_queue, u8bool rtw_if_up (struct adapter *padapter); -signed int rtw_linked_check (struct adapter *padapter); +bool rtw_linked_check (struct adapter *padapter);u8 *rtw_get_capability_from_ie (u8 *ie);u8 *rtw_get_beacon_interval_from_ie (u8 *ie);
Signature · 1 line
2.53.0
v2 cover Replace functions return types to 'bool'
In reply to Nikolay KulikovThis patchset modernize the return types of some functions in core/rtw_mlme.c file for greater code clarity.
Nikolay Kulikov (4):
staging: rtl8723bs: replace rtw_if_up() return type to bool
staging: rtl8723bs: replace rtw_is_same_ibss() return type to bool
staging: rtl8723bs: replace rtw_is_desired_network() return type to
bool
staging: rtl8723bs: replace rtw_linked_check() return type to bool
drivers/staging/rtl8723bs/core/rtw_mlme.c | 28 +++++++------------- drivers/staging/rtl8723bs/include/rtw_mlme.h | 6 ++--- 2 files changed, 13 insertions(+), 21 deletions(-)
Changes in v2:
- Remove unnecessary local variables for return values
- Rebase patchset to actual staging-testing branch (without conflicts)
Thanks,
Nikolay
Signature · 1 line
2.53.0
PATCH v2 1/4 staging: rtl8723bs: replace rtw_if_up() return type to bool
Function rtw_if_up() actually return 'bool' value, but it's type is 'signed int'. Replace 'signed int' with 'bool' to make it more accurate.
--- drivers/staging/rtl8723bs/core/rtw_mlme.c | 10 +++------- drivers/staging/rtl8723bs/include/rtw_mlme.h | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme.c +3 -7
@@ -262,17 +262,13 @@ void rtw_free_network_queue(struct adapter *padapter, u8 isfreeall)spin_unlock_bh (&scanned_queue->lock); } -signed int rtw_if_up (struct adapter *padapter) +bool rtw_if_up (struct adapter *padapter) { -signed int res; -if (padapter->bDriverStopped || padapter->bSurpriseRemoved || !check_fwstate (&padapter->mlmepriv, _FW_LINKED)) - res = false; -else - res = true; +return false; -return res; +return true; }void rtw_generate_random_ibss (u8 *pibss)
drivers/staging/rtl8723bs/include/rtw_mlme.h +1 -1
@@ -362,7 +362,7 @@ extern void _rtw_free_network_nolock(struct mlme_priv *pmlmepriv, struct wlan_neextern struct wlan_network *_rtw_find_network (struct __queue *scanned_queue,u8 *addr); -extern signed int rtw_if_up (struct adapter *padapter); +bool rtw_if_up (struct adapter *padapter);signed int rtw_linked_check (struct adapter *padapter);
Signature · 1 line
2.53.0
PATCH v2 2/4 staging: rtl8723bs: replace rtw_is_same_ibss() return type to bool
In reply to Nikolay KulikovFunction rtw_is_same_ibss() returns a 'bool' value, but has an 'int type. Replace 'int' -> 'bool' types to make it more accrurate.
--- drivers/staging/rtl8723bs/core/rtw_mlme.c | 11 ++++------- drivers/staging/rtl8723bs/include/rtw_mlme.h | 2 +- 2 files changed, 5 insertions(+), 8 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme.c +4 -7
@@ -326,21 +326,18 @@ struct wlan_network *rtw_find_network(struct __queue *scanned_queue, u8 *addr)return pnetwork; } -int rtw_is_same_ibss (struct adapter *adapter,struct wlan_network *pnetwork) +bool rtw_is_same_ibss (struct adapter *adapter,struct wlan_network *pnetwork) { -int ret = true;struct security_priv *psecuritypriv = &adapter->securitypriv;if ((psecuritypriv->dot11PrivacyAlgrthm != _NO_PRIVACY_) && (pnetwork->network.privacy ==0 )) - ret = false; +return false;else if ((psecuritypriv->dot11PrivacyAlgrthm == _NO_PRIVACY_) && (pnetwork->network.privacy ==1 )) - ret = false; -else - ret = true; +return false; -return ret; +return true; }inline int is_same_ess (struct wlan_bssid_ex *a,struct wlan_bssid_ex *b)
drivers/staging/rtl8723bs/include/rtw_mlme.h +1 -1
@@ -379,7 +379,7 @@ void rtw_update_ht_cap(struct adapter *padapter, u8 *pie, uint ie_len, u8 channevoid rtw_issue_addbareq_cmd (struct adapter *padapter,struct xmit_frame *pxmitframe);void rtw_append_exented_cap (struct adapter *padapter,u8 *out_ie,uint *pout_len); -int rtw_is_same_ibss (struct adapter *adapter,struct wlan_network *pnetwork); +bool rtw_is_same_ibss (struct adapter *adapter,struct wlan_network *pnetwork);int is_same_network (struct wlan_bssid_ex *src,struct wlan_bssid_ex *dst,u8 feature);#define rtw_roam_flags (adapter) ((adapter)->mlmepriv.roam_flags)
Signature · 1 line
2.53.0
PATCH v2 3/4 staging: rtl8723bs: replace rtw_is_desired_network() return type to bool
In reply to Nikolay KulikovFunction rtw_is_desired_network() used only in rtw_mlme.c file and always return 'true' or 'false', so it's type can be replaced with 'static bool'.
--- drivers/staging/rtl8723bs/core/rtw_mlme.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme.c +2 -3
@@ -588,15 +588,14 @@ void rtw_add_network(struct adapter *adapter, struct wlan_bssid_ex *pnetwork)* (4) HT * (5) others */ -int rtw_is_desired_network (struct adapter *adapter,struct wlan_network *pnetwork); -int rtw_is_desired_network (struct adapter *adapter,struct wlan_network *pnetwork) +static bool rtw_is_desired_network (struct adapter *adapter,struct wlan_network *pnetwork) {struct security_priv *psecuritypriv = &adapter->securitypriv;struct mlme_priv *pmlmepriv = &adapter->mlmepriv;u32 desired_encmode;u32 privacy;uint wps_ielen; -int bselected = true; +bool bselected = true; desired_encmode = psecuritypriv->ndisencryptstatus; privacy = pnetwork->network.privacy;
Signature · 1 line
2.53.0
PATCH v2 4/4 staging: rtl8723bs: replace rtw_linked_check() return type to bool
In reply to Nikolay KulikovFunction rtw_linked_check() always return 'bool' value, but it's type 'int'. Replace 'int' with 'bool' to make it more accurate.
--- drivers/staging/rtl8723bs/core/rtw_mlme.c | 2 +- drivers/staging/rtl8723bs/include/rtw_mlme.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme.c +1 -1
@@ -2585,7 +2585,7 @@ void _rtw_roaming(struct adapter *padapter, struct wlan_network *tgt_network) } } -signed int rtw_linked_check (struct adapter *padapter) +bool rtw_linked_check (struct adapter *padapter) {if (check_fwstate (&padapter->mlmepriv,WIFI_AP_STATE ) ||check_fwstate (&padapter->mlmepriv,WIFI_ADHOC_STATE |WIFI_ADHOC_MASTER_STATE )) {
drivers/staging/rtl8723bs/include/rtw_mlme.h +1 -1
@@ -364,7 +364,7 @@ extern struct wlan_network *_rtw_find_network(struct __queue *scanned_queue, u8bool rtw_if_up (struct adapter *padapter); -signed int rtw_linked_check (struct adapter *padapter); +bool rtw_linked_check (struct adapter *padapter);u8 *rtw_get_capability_from_ie (u8 *ie);u8 *rtw_get_beacon_interval_from_ie (u8 *ie);
Signature · 1 line
2.53.0