[PATCH] staging: r8188eu: change return type of rtw_set_802_11_disassociate to void

[PATCH] staging: r8188eu: change return type of rtw_set_802_11_disassociate to void

[Phillip Potter]

Change return type of rtw_set_802_11_disassociate to void. This function
always returns 'true' no matter what, so there is no need to return a
value, and no need to check for it in the two call sites within
rtw_wx_set_mlme.

Signed-off-by: Phillip Potter <phil@philpotter.co.uk>
---
 drivers/staging/r8188eu/core/rtw_ioctl_set.c    | 4 +---
 drivers/staging/r8188eu/include/rtw_ioctl_set.h | 2 +-
 drivers/staging/r8188eu/os_dep/ioctl_linux.c    | 6 ++----
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/drivers/staging/r8188eu/core/rtw_ioctl_set.c b/drivers/staging/r8188eu/core/rtw_ioctl_set.c
index 786431826659..785c0dba508f 100644
--- a/drivers/staging/r8188eu/core/rtw_ioctl_set.c
+++ b/drivers/staging/r8188eu/core/rtw_ioctl_set.c
@@ -314,7 +314,7 @@ u8 rtw_set_802_11_infrastructure_mode(struct adapter *padapter,
 	return true;
 }
 
-u8 rtw_set_802_11_disassociate(struct adapter *padapter)
+void rtw_set_802_11_disassociate(struct adapter *padapter)
 {
 	struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
 
@@ -328,8 +328,6 @@ u8 rtw_set_802_11_disassociate(struct adapter *padapter)
 	}
 
 	spin_unlock_bh(&pmlmepriv->lock);
-
-	return true;
 }
 
 u8 rtw_set_802_11_bssid_list_scan(struct adapter *padapter, struct ndis_802_11_ssid *pssid, int ssid_max_num)
diff --git a/drivers/staging/r8188eu/include/rtw_ioctl_set.h b/drivers/staging/r8188eu/include/rtw_ioctl_set.h
index abe460d6504d..c3eb2479f27b 100644
--- a/drivers/staging/r8188eu/include/rtw_ioctl_set.h
+++ b/drivers/staging/r8188eu/include/rtw_ioctl_set.h
@@ -12,7 +12,7 @@ u8 rtw_set_802_11_authentication_mode(struct adapter *adapt,
 				      enum ndis_802_11_auth_mode authmode);
 u8 rtw_set_802_11_bssid(struct adapter *adapter, u8 *bssid);
 u8 rtw_set_802_11_add_wep(struct adapter *adapter, struct ndis_802_11_wep *wep);
-u8 rtw_set_802_11_disassociate(struct adapter *adapter);
+void rtw_set_802_11_disassociate(struct adapter *adapter);
 u8 rtw_set_802_11_bssid_list_scan(struct adapter *adapter,
 				  struct ndis_802_11_ssid *pssid,
 				  int ssid_max_num);
diff --git a/drivers/staging/r8188eu/os_dep/ioctl_linux.c b/drivers/staging/r8188eu/os_dep/ioctl_linux.c
index dda48a2a6d0c..04d9384d239a 100644
--- a/drivers/staging/r8188eu/os_dep/ioctl_linux.c
+++ b/drivers/staging/r8188eu/os_dep/ioctl_linux.c
@@ -1020,12 +1020,10 @@ static int rtw_wx_set_mlme(struct net_device *dev,
 
 	switch (mlme->cmd) {
 	case IW_MLME_DEAUTH:
-		if (!rtw_set_802_11_disassociate(padapter))
-			ret = -1;
+		rtw_set_802_11_disassociate(padapter);
 		break;
 	case IW_MLME_DISASSOC:
-		if (!rtw_set_802_11_disassociate(padapter))
-			ret = -1;
+		rtw_set_802_11_disassociate(padapter);
 		break;
 	default:
 		return -EOPNOTSUPP;
-- 
2.38.1

Re: [PATCH] staging: r8188eu: change return type of rtw_set_802_11_disassociate to void

[Michael Straube]

Hi Phillip,

On 11/3/22 00:36, Phillip Potter wrote:
> Change return type of rtw_set_802_11_disassociate to void. This function
> always returns 'true' no matter what, so there is no need to return a
> value, and no need to check for it in the two call sites within
> rtw_wx_set_mlme.
> 
> Signed-off-by: Phillip Potter <phil@philpotter.co.uk>
> ---
>   drivers/staging/r8188eu/core/rtw_ioctl_set.c    | 4 +---
>   drivers/staging/r8188eu/include/rtw_ioctl_set.h | 2 +-
>   drivers/staging/r8188eu/os_dep/ioctl_linux.c    | 6 ++----
>   3 files changed, 4 insertions(+), 8 deletions(-)
> 

<snip>

> --- a/drivers/staging/r8188eu/os_dep/ioctl_linux.c
> +++ b/drivers/staging/r8188eu/os_dep/ioctl_linux.c
> @@ -1020,12 +1020,10 @@ static int rtw_wx_set_mlme(struct net_device *dev,
>   
>   	switch (mlme->cmd) {
>   	case IW_MLME_DEAUTH:
> -		if (!rtw_set_802_11_disassociate(padapter))
> -			ret = -1;
> +		rtw_set_802_11_disassociate(padapter);
>   		break;
>   	case IW_MLME_DISASSOC:
> -		if (!rtw_set_802_11_disassociate(padapter))
> -			ret = -1;
> +		rtw_set_802_11_disassociate(padapter);
>   		break;
>   	default:
>   		return -EOPNOTSUPP;

You could also remove the ret variable and return 0 directly, since ret
is not changed anymore in the function.

regards,
Michael

Re: [PATCH] staging: r8188eu: change return type of rtw_set_802_11_disassociate to void

[Phillip Potter]

On Thu, Nov 03, 2022 at 06:37:38AM +0100, Michael Straube wrote:
> Hi Phillip,
> 
> On 11/3/22 00:36, Phillip Potter wrote:
> > Change return type of rtw_set_802_11_disassociate to void. This function
> > always returns 'true' no matter what, so there is no need to return a
> > value, and no need to check for it in the two call sites within
> > rtw_wx_set_mlme.
> > 
> > Signed-off-by: Phillip Potter <phil@philpotter.co.uk>
> > ---
> >   drivers/staging/r8188eu/core/rtw_ioctl_set.c    | 4 +---
> >   drivers/staging/r8188eu/include/rtw_ioctl_set.h | 2 +-
> >   drivers/staging/r8188eu/os_dep/ioctl_linux.c    | 6 ++----
> >   3 files changed, 4 insertions(+), 8 deletions(-)
> > 
> 
> <snip>
> 
> > --- a/drivers/staging/r8188eu/os_dep/ioctl_linux.c
> > +++ b/drivers/staging/r8188eu/os_dep/ioctl_linux.c
> > @@ -1020,12 +1020,10 @@ static int rtw_wx_set_mlme(struct net_device *dev,
> >   	switch (mlme->cmd) {
> >   	case IW_MLME_DEAUTH:
> > -		if (!rtw_set_802_11_disassociate(padapter))
> > -			ret = -1;
> > +		rtw_set_802_11_disassociate(padapter);
> >   		break;
> >   	case IW_MLME_DISASSOC:
> > -		if (!rtw_set_802_11_disassociate(padapter))
> > -			ret = -1;
> > +		rtw_set_802_11_disassociate(padapter);
> >   		break;
> >   	default:
> >   		return -EOPNOTSUPP;
> 
> You could also remove the ret variable and return 0 directly, since ret
> is not changed anymore in the function.
> 
> regards,
> Michael

Hi Michael,

Thanks for the review, and you're absolutely right. I will publish a V2
shortly.

Regards,
Phil