From: Larry Finger <Larry.Finger@lwfinger.net>
To: Michael Straube <straube.linux@gmail.com>, gregkh@linuxfoundation.org
Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] staging: rtl8188eu: remove braces from single line if blocks
Date: Mon, 26 Jul 2021 10:09:51 -0500 [thread overview]
Message-ID: <a4eb0dea-a34b-8dd9-03c6-aa0d87e68986@lwfinger.net> (raw)
In-Reply-To: <20210726092129.30334-1-straube.linux@gmail.com>
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@gmail.com>
> ---
> 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@lwfinger.net>
Larry
next prev parent reply other threads:[~2021-07-26 15:09 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-26 9:21 [PATCH] staging: rtl8188eu: remove braces from single line if blocks Michael Straube
2021-07-26 15:09 ` Larry Finger [this message]
2021-07-26 18:07 ` Michael Straube
2021-07-27 13:05 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=a4eb0dea-a34b-8dd9-03c6-aa0d87e68986@lwfinger.net \
--to=larry.finger@lwfinger.net \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=straube.linux@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).