[PATCH] staging: rtl8723bs: remove return from void function

Michael Straube posted 1 patch 3 months, 3 weeks ago
drivers/staging/rtl8723bs/os_dep/os_intfs.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
[PATCH] staging: rtl8723bs: remove return from void function
Posted by Michael Straube 3 months, 3 weeks ago
Remove exit label and return statement from a void function.
After the exit label no cleanup is done, so it is safe to remove it
and return early in the only place where the label is used.
This simplifies the code and clears a checkpatch warning.

WARNING: void function return statements are not generally useful

Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
 drivers/staging/rtl8723bs/os_dep/os_intfs.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/drivers/staging/rtl8723bs/os_dep/os_intfs.c b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
index 0248dff8f2aa..3cbfc305ede3 100644
--- a/drivers/staging/rtl8723bs/os_dep/os_intfs.c
+++ b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
@@ -1112,7 +1112,7 @@ void rtw_suspend_common(struct adapter *padapter)
 
 	if ((!padapter->bup) || (padapter->bDriverStopped) || (padapter->bSurpriseRemoved)) {
 		pdbgpriv->dbg_suspend_error_cnt++;
-		goto exit;
+		return;
 	}
 	rtw_ps_deny(padapter, PS_DENY_SUSPEND);
 
@@ -1134,10 +1134,6 @@ void rtw_suspend_common(struct adapter *padapter)
 
 	netdev_dbg(padapter->pnetdev, "rtw suspend success in %d ms\n",
 		   jiffies_to_msecs(jiffies - start_time));
-
-exit:
-
-	return;
 }
 
 static int rtw_resume_process_normal(struct adapter *padapter)
-- 
2.49.0
Re: [PATCH] staging: rtl8723bs: remove return from void function
Posted by Hans de Goede 3 months, 3 weeks ago
Hi,

On 15-Jun-25 14:37, Michael Straube wrote:
> Remove exit label and return statement from a void function.
> After the exit label no cleanup is done, so it is safe to remove it
> and return early in the only place where the label is used.
> This simplifies the code and clears a checkpatch warning.
> 
> WARNING: void function return statements are not generally useful
> 
> Signed-off-by: Michael Straube <straube.linux@gmail.com>

Thanks, patch looks good to me:

Reviewed-by: Hans de Goede <hansg@kernel.org>

Regards,

Hans


> ---
>  drivers/staging/rtl8723bs/os_dep/os_intfs.c | 6 +-----
>  1 file changed, 1 insertion(+), 5 deletions(-)
> 
> diff --git a/drivers/staging/rtl8723bs/os_dep/os_intfs.c b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
> index 0248dff8f2aa..3cbfc305ede3 100644
> --- a/drivers/staging/rtl8723bs/os_dep/os_intfs.c
> +++ b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
> @@ -1112,7 +1112,7 @@ void rtw_suspend_common(struct adapter *padapter)
>  
>  	if ((!padapter->bup) || (padapter->bDriverStopped) || (padapter->bSurpriseRemoved)) {
>  		pdbgpriv->dbg_suspend_error_cnt++;
> -		goto exit;
> +		return;
>  	}
>  	rtw_ps_deny(padapter, PS_DENY_SUSPEND);
>  
> @@ -1134,10 +1134,6 @@ void rtw_suspend_common(struct adapter *padapter)
>  
>  	netdev_dbg(padapter->pnetdev, "rtw suspend success in %d ms\n",
>  		   jiffies_to_msecs(jiffies - start_time));
> -
> -exit:
> -
> -	return;
>  }
>  
>  static int rtw_resume_process_normal(struct adapter *padapter)