2021-04-18 16:49:17

by Saurav Girepunje

Subject: [PATCH] staging: rtl8723bs: os_dep: remove unneeded variable ret

Fix the following coccicheck warning:

drivers/staging/rtl8723bs/os_dep/os_intfs.c:1156:5-8:
Unneeded variable: "ret". Return "0" on line 1199

Signed-off-by: Saurav Girepunje <[email protected]>
---
drivers/staging/rtl8723bs/os_dep/os_intfs.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/staging/rtl8723bs/os_dep/os_intfs.c b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
index 1f34cb2e367c..920ec25c9a4f 100644
--- a/drivers/staging/rtl8723bs/os_dep/os_intfs.c
+++ b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
@@ -1153,7 +1153,6 @@ int rtw_suspend_common(struct adapter *padapter)
struct pwrctrl_priv *pwrpriv = dvobj_to_pwrctl(psdpriv);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;

- int ret = 0;
unsigned long start_time = jiffies;

DBG_871X_LEVEL(_drv_always_, " suspend start\n");
@@ -1196,7 +1195,7 @@ int rtw_suspend_common(struct adapter *padapter)

exit:

- return ret;
+ return 0;
}

static int rtw_resume_process_normal(struct adapter *padapter)
--
2.25.1

2021-04-22 08:42:13

by Greg Kroah-Hartman

Subject: Re: [PATCH] staging: rtl8723bs: os_dep: remove unneeded variable ret

On Sun, Apr 18, 2021 at 10:18:13PM +0530, Saurav Girepunje wrote:
> Fix the following coccicheck warning:
>
> drivers/staging/rtl8723bs/os_dep/os_intfs.c:1156:5-8:
> Unneeded variable: "ret". Return "0" on line 1199
>
> Signed-off-by: Saurav Girepunje <[email protected]>
> ---
> drivers/staging/rtl8723bs/os_dep/os_intfs.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/staging/rtl8723bs/os_dep/os_intfs.c b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
> index 1f34cb2e367c..920ec25c9a4f 100644
> --- a/drivers/staging/rtl8723bs/os_dep/os_intfs.c
> +++ b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
> @@ -1153,7 +1153,6 @@ int rtw_suspend_common(struct adapter *padapter)
> struct pwrctrl_priv *pwrpriv = dvobj_to_pwrctl(psdpriv);
> struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
>
> - int ret = 0;
> unsigned long start_time = jiffies;
>
> DBG_871X_LEVEL(_drv_always_, " suspend start\n");
> @@ -1196,7 +1195,7 @@ int rtw_suspend_common(struct adapter *padapter)
>
> exit:
>
> - return ret;
> + return 0;
> }
>
> static int rtw_resume_process_normal(struct adapter *padapter)
> --
> 2.25.1
>
>

If this function can only ever return 0, why is it returning anything at
all? Please fix it up to not do that.

thanks,

greg k-h

2021-04-27 19:12:59

by Saurav Girepunje

Subject: Re: [PATCH] staging: rtl8723bs: os_dep: remove unneeded variable ret

On Thu, Apr 22, 2021 at 10:41:07AM +0200, Greg KH wrote:
> On Sun, Apr 18, 2021 at 10:18:13PM +0530, Saurav Girepunje wrote:
> > Fix the following coccicheck warning:
> >
> > drivers/staging/rtl8723bs/os_dep/os_intfs.c:1156:5-8:
> > Unneeded variable: "ret". Return "0" on line 1199
> >
> > Signed-off-by: Saurav Girepunje <[email protected]>
> > ---
> > drivers/staging/rtl8723bs/os_dep/os_intfs.c | 3 +--
> > 1 file changed, 1 insertion(+), 2 deletions(-)
> >
> > diff --git a/drivers/staging/rtl8723bs/os_dep/os_intfs.c b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
> > index 1f34cb2e367c..920ec25c9a4f 100644
> > --- a/drivers/staging/rtl8723bs/os_dep/os_intfs.c
> > +++ b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
> > @@ -1153,7 +1153,6 @@ int rtw_suspend_common(struct adapter *padapter)
> > struct pwrctrl_priv *pwrpriv = dvobj_to_pwrctl(psdpriv);
> > struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
> >
> > - int ret = 0;
> > unsigned long start_time = jiffies;
> >
> > DBG_871X_LEVEL(_drv_always_, " suspend start\n");
> > @@ -1196,7 +1195,7 @@ int rtw_suspend_common(struct adapter *padapter)
> >
> > exit:
> >
> > - return ret;
> > + return 0;
> > }
> >
> > static int rtw_resume_process_normal(struct adapter *padapter)
> > --
> > 2.25.1
> >
> >
>
> If this function can only ever return 0, why is it returning anything at
> all? Please fix it up to not do that.
>
> thanks,
>
> greg k-h

Yes,this function always return 0. Function return type could be change
to void. I will send another patch.