[v1] staging: r8188eu: remove unnecessary braces in if statements

[PATCH] staging: r8188eu: remove unnecessary braces in if statements

Posted by Marcelo Aloisio da Silva 4 years, 4 months ago

Braces are not necessary for single statement blocks.

Signed-off-by: Marcelo Aloisio da Silva <marcelo.as@aol.com>
---
 drivers/staging/r8188eu/core/rtw_mlme.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/r8188eu/core/rtw_mlme.c b/drivers/staging/r8188eu/core/rtw_mlme.c
index 45eff3018d73..ad1d73a27548 100644
--- a/drivers/staging/r8188eu/core/rtw_mlme.c
+++ b/drivers/staging/r8188eu/core/rtw_mlme.c
@@ -1379,10 +1379,8 @@ void rtw_dynamic_check_timer_handlder(struct adapter *adapter)
 	if (pregistrypriv->wifi_spec == 1) {
 		struct wifidirect_info *pwdinfo = &adapter->wdinfo;
 		if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE))
-		{
 			/* auto site survey */
 			rtw_auto_scan_handler(adapter);
-		}
 	}
 
 	rcu_read_lock();
@@ -1392,14 +1390,12 @@ void rtw_dynamic_check_timer_handlder(struct adapter *adapter)
 		/*  expire NAT2.5 entry */
 		nat25_db_expire(adapter);
 
-		if (adapter->pppoe_connection_in_progress > 0) {
+		if (adapter->pppoe_connection_in_progress > 0)
 			adapter->pppoe_connection_in_progress--;
-		}
 
 		/*  due to rtw_dynamic_check_timer_handlder() is called every 2 seconds */
-		if (adapter->pppoe_connection_in_progress > 0) {
+		if (adapter->pppoe_connection_in_progress > 0)
 			adapter->pppoe_connection_in_progress--;
-		}
 	}
 
 	rcu_read_unlock();
-- 
2.25.1

Re: [PATCH] staging: r8188eu: remove unnecessary braces in if statements

Posted by Dan Carpenter 4 years, 4 months ago

On Fri, Feb 18, 2022 at 01:37:05AM -0300, Marcelo Aloisio da Silva wrote:
> Braces are not necessary for single statement blocks.
> 
> Signed-off-by: Marcelo Aloisio da Silva <marcelo.as@aol.com>
> ---
>  drivers/staging/r8188eu/core/rtw_mlme.c | 8 ++------
>  1 file changed, 2 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/staging/r8188eu/core/rtw_mlme.c b/drivers/staging/r8188eu/core/rtw_mlme.c
> index 45eff3018d73..ad1d73a27548 100644
> --- a/drivers/staging/r8188eu/core/rtw_mlme.c
> +++ b/drivers/staging/r8188eu/core/rtw_mlme.c
> @@ -1379,10 +1379,8 @@ void rtw_dynamic_check_timer_handlder(struct adapter *adapter)
>  	if (pregistrypriv->wifi_spec == 1) {
>  		struct wifidirect_info *pwdinfo = &adapter->wdinfo;
>  		if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE))
> -		{
>  			/* auto site survey */
>  			rtw_auto_scan_handler(adapter);
> -		}

Generally we prefer if statements around multi-line indents.  It helps
for readability.  But you could move them to the right place in a
different patch.

 		if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) {
 			/* auto site survey */
 			rtw_auto_scan_handler(adapter);
		}

The rest of the patch is fine.

regards,
dan carpenter

Re: [PATCH] staging: r8188eu: remove unnecessary braces in if statements

Posted by Dan Carpenter 4 years, 4 months ago

On Fri, Feb 18, 2022 at 02:44:55PM +0300, Dan Carpenter wrote:
> On Fri, Feb 18, 2022 at 01:37:05AM -0300, Marcelo Aloisio da Silva wrote:
> > Braces are not necessary for single statement blocks.
> > 
> > Signed-off-by: Marcelo Aloisio da Silva <marcelo.as@aol.com>
> > ---
> >  drivers/staging/r8188eu/core/rtw_mlme.c | 8 ++------
> >  1 file changed, 2 insertions(+), 6 deletions(-)
> > 
> > diff --git a/drivers/staging/r8188eu/core/rtw_mlme.c b/drivers/staging/r8188eu/core/rtw_mlme.c
> > index 45eff3018d73..ad1d73a27548 100644
> > --- a/drivers/staging/r8188eu/core/rtw_mlme.c
> > +++ b/drivers/staging/r8188eu/core/rtw_mlme.c
> > @@ -1379,10 +1379,8 @@ void rtw_dynamic_check_timer_handlder(struct adapter *adapter)
> >  	if (pregistrypriv->wifi_spec == 1) {
> >  		struct wifidirect_info *pwdinfo = &adapter->wdinfo;
> >  		if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE))
> > -		{
> >  			/* auto site survey */
> >  			rtw_auto_scan_handler(adapter);
> > -		}
> 
> Generally we prefer if statements around multi-line indents.  It helps

I meant "prefer curly braces around multi-line indents".

regards,
dan carpenter

Re: [PATCH] staging: r8188eu: remove unnecessary braces in if statements

Posted by Marcelo Aloisio da Silva 4 years, 4 months ago

On Fri, Feb 18, 2022 at 03:50:58PM +0300, Dan Carpenter wrote:
> On Fri, Feb 18, 2022 at 02:44:55PM +0300, Dan Carpenter wrote:
> > On Fri, Feb 18, 2022 at 01:37:05AM -0300, Marcelo Aloisio da Silva wrote:
> > > Braces are not necessary for single statement blocks.
> > > 
> > > Signed-off-by: Marcelo Aloisio da Silva <marcelo.as@aol.com>
> > > ---
> > >  drivers/staging/r8188eu/core/rtw_mlme.c | 8 ++------
> > >  1 file changed, 2 insertions(+), 6 deletions(-)
> > > 
> > > diff --git a/drivers/staging/r8188eu/core/rtw_mlme.c b/drivers/staging/r8188eu/core/rtw_mlme.c
> > > index 45eff3018d73..ad1d73a27548 100644
> > > --- a/drivers/staging/r8188eu/core/rtw_mlme.c
> > > +++ b/drivers/staging/r8188eu/core/rtw_mlme.c
> > > @@ -1379,10 +1379,8 @@ void rtw_dynamic_check_timer_handlder(struct adapter *adapter)
> > >  	if (pregistrypriv->wifi_spec == 1) {
> > >  		struct wifidirect_info *pwdinfo = &adapter->wdinfo;
> > >  		if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE))
> > > -		{
> > >  			/* auto site survey */
> > >  			rtw_auto_scan_handler(adapter);
> > > -		}
> > 
> > Generally we prefer if statements around multi-line indents.  It helps
> 
> I meant "prefer curly braces around multi-line indents".
> 
> regards,
> dan carpenter
> 
Thanks Dan for the feedback.
I'll fix the brace for this if statement in another patch.

Regards,
Marcelo