Re: [PATCH] staging: rtl8188eu: remove braces from single line if blocks

[Michael Straube]

Am 26.07.21 um 17:09 schrieb Larry Finger:
> On 7/26/21 4:21 AM, Michael Straube wrote:
> > Remove braces from single line if blocks to clear checkpatch warnings.
> > WARNING: braces {} are not necessary for single statement blocks
> >
> > Signed-off-by: Michael Straube <straube.linux@xxxxxxxxx>
> > ---
> >   drivers/staging/rtl8188eu/core/rtw_cmd.c          | 3 +--
> >   drivers/staging/rtl8188eu/core/rtw_mlme.c         | 3 +--
> >   drivers/staging/rtl8188eu/core/rtw_xmit.c         | 3 +--
> >   drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 3 +--
> >   drivers/staging/rtl8188eu/hal/usb_halinit.c       | 6 ++----
> >   5 files changed, 6 insertions(+), 12 deletions(-)
> >
> > diff --git a/drivers/staging/rtl8188eu/core/rtw_cmd.c 
> > b/drivers/staging/rtl8188eu/core/rtw_cmd.c
> > index eb89a52aa4e3..56ece839c9ca 100644
> > --- a/drivers/staging/rtl8188eu/core/rtw_cmd.c
> > +++ b/drivers/staging/rtl8188eu/core/rtw_cmd.c
> > @@ -1159,9 +1159,8 @@ void rtw_createbss_cmd_callback(struct adapter 
> > *padapter, struct cmd_obj *pcmd)
> >           psta = rtw_get_stainfo(&padapter->stapriv, 
> > pnetwork->MacAddress);
> >           if (!psta) {
> >               psta = rtw_alloc_stainfo(&padapter->stapriv, 
> > pnetwork->MacAddress);
> > -            if (!psta) {
> > +            if (!psta)
> >                   goto createbss_cmd_fail;
> > -            }
> >           }
> >           rtw_indicate_connect(padapter);
> > diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme.c 
> > b/drivers/staging/rtl8188eu/core/rtw_mlme.c
> > index 71d205f3d73d..0d334aba9a3f 100644
> > --- a/drivers/staging/rtl8188eu/core/rtw_mlme.c
> > +++ b/drivers/staging/rtl8188eu/core/rtw_mlme.c
> > @@ -953,9 +953,8 @@ void rtw_joinbss_event_prehandle(struct adapter 
> > *adapter, u8 *pbuf)
> >               }
> >               /* s4. indicate connect */
> > -            if (check_fwstate(pmlmepriv, WIFI_STATION_STATE)) {
> > +            if (check_fwstate(pmlmepriv, WIFI_STATION_STATE))
> >                   rtw_indicate_connect(adapter);
> > -            }
> >               /* s5. Cancel assoc_timer */
> >               del_timer_sync(&pmlmepriv->assoc_timer);
> > diff --git a/drivers/staging/rtl8188eu/core/rtw_xmit.c 
> > b/drivers/staging/rtl8188eu/core/rtw_xmit.c
> > index d5fc59417ec6..c77ebd18f40c 100644
> > --- a/drivers/staging/rtl8188eu/core/rtw_xmit.c
> > +++ b/drivers/staging/rtl8188eu/core/rtw_xmit.c
> > @@ -1124,9 +1124,8 @@ struct xmit_buf *rtw_alloc_xmitbuf(struct 
> > xmit_priv *pxmitpriv)
> >           list_del_init(&pxmitbuf->list);
> >           pxmitpriv->free_xmitbuf_cnt--;
> >           pxmitbuf->priv_data = NULL;
> > -        if (pxmitbuf->sctx) {
> > +        if (pxmitbuf->sctx)
> >               rtw_sctx_done_err(&pxmitbuf->sctx, 
> > RTW_SCTX_DONE_BUF_ALLOC);
> > -        }
> >       }
> >       spin_unlock_irqrestore(&pfree_xmitbuf_queue->lock, irql);
> > diff --git a/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c 
> > b/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
> > index 6cf87312bc36..a67615708745 100644
> > --- a/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
> > +++ b/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
> > @@ -510,7 +510,6 @@ void Hal_ReadThermalMeter_88E(struct adapter 
> > *Adapter, u8 *PROMContent, bool Aut
> >       else
> >           pHalData->EEPROMThermalMeter = EEPROM_Default_ThermalMeter_88E;
> > -    if (pHalData->EEPROMThermalMeter == 0xff || AutoloadFail) {
> > +    if (pHalData->EEPROMThermalMeter == 0xff || AutoloadFail)
> >           pHalData->EEPROMThermalMeter = EEPROM_Default_ThermalMeter_88E;
> > -    }
> >   }
> > diff --git a/drivers/staging/rtl8188eu/hal/usb_halinit.c 
> > b/drivers/staging/rtl8188eu/hal/usb_halinit.c
> > index 1d7d5037ce89..3e8f7315d377 100644
> > --- a/drivers/staging/rtl8188eu/hal/usb_halinit.c
> > +++ b/drivers/staging/rtl8188eu/hal/usb_halinit.c
> > @@ -641,9 +641,8 @@ u32 rtl8188eu_hal_init(struct adapter *Adapter)
> >       }
> >       status = rtw_hal_power_on(Adapter);
> > -    if (status == _FAIL) {
> > +    if (status == _FAIL)
> >           goto exit;
> > -    }
> >       /*  Save target channel */
> >       haldata->CurrentChannel = 6;/* default set to 6 */
> > @@ -696,9 +695,8 @@ u32 rtl8188eu_hal_init(struct adapter *Adapter)
> >       _InitTxBufferBoundary(Adapter, txpktbuf_bndy);
> >       status =  InitLLTTable(Adapter, txpktbuf_bndy);
> > -    if (status == _FAIL) {
> > +    if (status == _FAIL)
> >           goto exit;
> > -    }
> >       /*  Get Rx PHY status in order to report RSSI and others. */
> >       _InitDriverInfoSize(Adapter, DRVINFO_SZ);
>
> Michael,
>
> You might as well stop looking at drivers/staging/rtl8188eu. There is a 
> pending patch that blows away that directory and replaces it with a new 
> version from the GitHub repo. The new one will be in 
> drivers/staging/r8188eu.
>
> NACKed by Larry.Finger <Larry.Finger@xxxxxxxxxxxx>
>
> Larry

Ah ok, thank you for the information.

Michael