From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: Martin Kaiser <martin@kaiser.cx>
Cc: Larry Finger <Larry.Finger@lwfinger.net>,
Phillip Potter <phil@philpotter.co.uk>,
Dan Carpenter <dan.carpenter@oracle.com>,
linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2] staging: r8188eu: remove label at the end of a function
Date: Thu, 5 Aug 2021 19:55:16 +0200 [thread overview]
Message-ID: <YQwmBEAdUiPCbIj0@kroah.com> (raw)
In-Reply-To: <20210805145026.14572-1-martin@kaiser.cx>
On Thu, Aug 05, 2021 at 04:50:26PM +0200, Martin Kaiser wrote:
> Compilation fails for me
>
> drivers/staging/r8188eu/hal/rtl8188e_dm.c: In function ‘rtl8188e_HalDmWatchDog’:
> drivers/staging/r8188eu/hal/rtl8188e_dm.c:182:1: error: label at end of compound statement
> 182 | skip_dm:
> | ^~~~~~~
>
> Remove the label at the end of the function. Replace the jump to this label
> with a return statement.
>
> Fixes: b398ff88aa36 ("staging: r8188eu: remove return from void functions")
> Signed-off-by: Martin Kaiser <martin@kaiser.cx>
> ---
> v2:
> - add Fixes tag
>
> drivers/staging/r8188eu/hal/rtl8188e_dm.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/staging/r8188eu/hal/rtl8188e_dm.c b/drivers/staging/r8188eu/hal/rtl8188e_dm.c
> index b5f42127a751..72b3130eddd2 100644
> --- a/drivers/staging/r8188eu/hal/rtl8188e_dm.c
> +++ b/drivers/staging/r8188eu/hal/rtl8188e_dm.c
> @@ -145,7 +145,7 @@ void rtl8188e_HalDmWatchDog(struct adapter *Adapter)
> hw_init_completed = Adapter->hw_init_completed;
>
> if (!hw_init_completed)
> - goto skip_dm;
> + return;
>
> fw_cur_in_ps = Adapter->pwrctrlpriv.bFwCurrentInPSMode;
> rtw_hal_get_hwreg(Adapter, HW_VAR_FWLPS_RF_ON, (u8 *)(&fw_ps_awake));
> @@ -179,7 +179,7 @@ void rtl8188e_HalDmWatchDog(struct adapter *Adapter)
> ODM_CmnInfoUpdate(&hal_data->odmpriv, ODM_CMNINFO_LINK, bLinked);
> ODM_DMWatchdog(&hal_data->odmpriv);
> }
> -skip_dm:
> +
> /* Check GPIO to determine current RF on/off and Pbc status. */
> /* Check Hardware Radio ON/OFF or not */
> }
> --
> 2.20.1
>
>
How is this not showing up in my build tests? Odd, let me figure that
out...
greg k-h
next prev parent reply other threads:[~2021-08-05 17:55 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-05 13:07 [PATCH] staging: r8188eu: remove label at the end of a function Martin Kaiser
2021-08-05 14:37 ` Dan Carpenter
2021-08-05 14:50 ` [PATCH v2] " Martin Kaiser
2021-08-05 17:55 ` Greg Kroah-Hartman [this message]
2021-08-05 18:27 ` Greg Kroah-Hartman
2021-08-05 18:29 ` Greg Kroah-Hartman
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=YQwmBEAdUiPCbIj0@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=Larry.Finger@lwfinger.net \
--cc=dan.carpenter@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=martin@kaiser.cx \
--cc=phil@philpotter.co.uk \
/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).