On Sat, Nov 05, 2022 at 10:39:16AM +0100, Michael Straube wrote:
> The functions
>
> is_client_associated_to_ap()
> is_client_associated_to_ibss()
> is_IBSS_empty()
>
> return boolean values. Convert their return type to bool and replace
> _FAIL, which is defined as 0, with false. Another step to get rid of
> _SUCCESS / _FAIL.
>
> Signed-off-by: Michael Straube <straube.linux@xxxxxxxxx>
> ---
> drivers/staging/r8188eu/core/rtw_wlan_util.c | 18 +++++++++---------
> drivers/staging/r8188eu/include/rtw_mlme_ext.h | 6 +++---
> 2 files changed, 12 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/staging/r8188eu/core/rtw_wlan_util.c b/drivers/staging/r8188eu/core/rtw_wlan_util.c
> index e50631848cab..c95438a12b59 100644
> --- a/drivers/staging/r8188eu/core/rtw_wlan_util.c
> +++ b/drivers/staging/r8188eu/core/rtw_wlan_util.c
> @@ -331,35 +331,35 @@ u16 get_beacon_interval(struct wlan_bssid_ex *bss)
> return le16_to_cpu(val);
> }
>
> -int is_client_associated_to_ap(struct adapter *padapter)
> +bool is_client_associated_to_ap(struct adapter *padapter)
> {
> struct mlme_ext_priv *pmlmeext;
> struct mlme_ext_info *pmlmeinfo;
>
> if (!padapter)
> - return _FAIL;
> + return false;
>
> pmlmeext = &padapter->mlmeextpriv;
> pmlmeinfo = &pmlmeext->mlmext_info;
>
> if ((pmlmeinfo->state & WIFI_FW_ASSOC_SUCCESS) && ((pmlmeinfo->state & 0x03) == WIFI_FW_STATION_STATE))
> return true;
> - else
> - return _FAIL;
> +
> + return false;
> }
>
> -int is_client_associated_to_ibss(struct adapter *padapter)
> +bool is_client_associated_to_ibss(struct adapter *padapter)
> {
> struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
> struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;
>
> if ((pmlmeinfo->state & WIFI_FW_ASSOC_SUCCESS) && ((pmlmeinfo->state & 0x03) == WIFI_FW_ADHOC_STATE))
> return true;
> - else
> - return _FAIL;
> +
> + return false;
> }
>
> -int is_IBSS_empty(struct adapter *padapter)
> +bool is_IBSS_empty(struct adapter *padapter)
> {
> unsigned int i;
> struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
> @@ -367,7 +367,7 @@ int is_IBSS_empty(struct adapter *padapter)
>
> for (i = IBSS_START_MAC_ID; i < NUM_STA; i++) {
> if (pmlmeinfo->FW_sta_info[i].status == 1)
> - return _FAIL;
> + return false;
> }
> return true;
> }
> diff --git a/drivers/staging/r8188eu/include/rtw_mlme_ext.h b/drivers/staging/r8188eu/include/rtw_mlme_ext.h
> index e234a3b9af6f..7652e72a03f4 100644
> --- a/drivers/staging/r8188eu/include/rtw_mlme_ext.h
> +++ b/drivers/staging/r8188eu/include/rtw_mlme_ext.h
> @@ -432,9 +432,9 @@ void update_network(struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src,
> u8 *get_my_bssid(struct wlan_bssid_ex *pnetwork);
> u16 get_beacon_interval(struct wlan_bssid_ex *bss);
>
> -int is_client_associated_to_ap(struct adapter *padapter);
> -int is_client_associated_to_ibss(struct adapter *padapter);
> -int is_IBSS_empty(struct adapter *padapter);
> +bool is_client_associated_to_ap(struct adapter *padapter);
> +bool is_client_associated_to_ibss(struct adapter *padapter);
> +bool is_IBSS_empty(struct adapter *padapter);
>
> unsigned char check_assoc_AP(u8 *pframe, uint len);
>
> --
> 2.38.0
>
Hi Michael,
Thanks for the patch. Just my personal opinion, but I would prefer to
keep the return type as int, and have 0 for success and then _FAIL
replaced with an appropriate error code depending on the circumstance,
(e.g. -ENOMEM). This is generally the convention elsewhere in the
kernel. Others may not agree though.
All the best,
Phil
