Re: [PATCH] staging: r8188eu: convert three functions to bool

From: Joe Perches
Date: Sun Nov 06 2022 - 03:58:37 EST


On Sat, 2022-11-05 at 10:39 +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.

yay.

> diff --git a/drivers/staging/r8188eu/core/rtw_wlan_util.c b/drivers/staging/r8188eu/core/rtw_wlan_util.c
[]
> +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;

instead of

if (foo)
return true;
return false;

These could be:

return (pmlmeinfo->state & WIFI_FW_ASSOC_SUCCESS) &&
((pmlmeinfo->state & 0x03) == WIFI_FW_STATION_STATE);

> +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;

and

return (pmlmeinfo->state & WIFI_FW_ASSOC_SUCCESS) &&
((pmlmeinfo->state & 0x03) == WIFI_FW_ADHOC_STATE);