linux-staging.lists.linux.dev archive mirror
 help / color / mirror / Atom feed
From: Phillip Potter <phil@philpotter.co.uk>
To: gregkh@linuxfoundation.org
Cc: Larry.Finger@lwfinger.net, dan.carpenter@oracle.com,
	linux-kernel@vger.kernel.org, linux-staging@lists.linux.dev
Subject: [PATCH 1/7] staging: rtl8188eu: remove empty label from mlmeext_joinbss_event_callback
Date: Tue, 15 Jun 2021 23:36:01 +0100	[thread overview]
Message-ID: <20210615223607.13863-2-phil@philpotter.co.uk> (raw)
In-Reply-To: <20210615223607.13863-1-phil@philpotter.co.uk>

Remove empty label at end of mlmeext_joinbss_event_callback function, as
it only contained a return in my last patch to make the code build. It
is better removed, and the corresponding goto converted to a return.

Signed-off-by: Phillip Potter <phil@philpotter.co.uk>
---
 drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
index 6107257900c2..d41fd0b8980a 100644
--- a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
@@ -4253,7 +4253,7 @@ void mlmeext_joinbss_event_callback(struct adapter *padapter, int join_res)
 		/* restore to initial setting. */
 		update_tx_basic_rate(padapter, padapter->registrypriv.wireless_mode);
 
-		goto exit_mlmeext_joinbss_event_callback;
+		return;
 	}
 
 	if ((pmlmeinfo->state & 0x03) == WIFI_FW_ADHOC_STATE) {
@@ -4309,9 +4309,6 @@ void mlmeext_joinbss_event_callback(struct adapter *padapter, int join_res)
 		correct_TSF(padapter, pmlmeext);
 	}
 	rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_CONNECT, 0);
-
-exit_mlmeext_joinbss_event_callback:
-	return;
 }
 
 void mlmeext_sta_add_event_callback(struct adapter *padapter, struct sta_info *psta)
-- 
2.30.2


  reply	other threads:[~2021-06-15 22:36 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-15 22:36 [PATCH 0/7] Fixup unused variables and warnings Phillip Potter
2021-06-15 22:36 ` Phillip Potter [this message]
2021-06-15 22:36 ` [PATCH 2/7] staging: rtl8188eu: use prefix decrement operator on trycnt variable Phillip Potter
2021-06-15 22:36 ` [PATCH 3/7] staging: rtl8188eu: remove unused variables from core/rtw_efuse.c Phillip Potter
2021-06-15 22:36 ` [PATCH 4/7] staging: rtl8188eu: remove unused variables from core/rtw_mlme_ext.c Phillip Potter
2021-06-15 22:36 ` [PATCH 5/7] staging: rtl8188eu: remove unused variable from os_dep/ioctl_linux.c Phillip Potter
2021-06-15 22:36 ` [PATCH 6/7] staging: rtl8188eu: remove unused variables from hal/rtl8188e_cmd.c Phillip Potter
2021-06-15 22:36 ` [PATCH 7/7] staging: rtl8188eu: remove _dbg_dump_tx_info function Phillip Potter
2021-06-16  7:24 ` [PATCH 0/7] Fixup unused variables and warnings Greg KH
2021-06-16  7:58   ` Phillip Potter

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=20210615223607.13863-2-phil@philpotter.co.uk \
    --to=phil@philpotter.co.uk \
    --cc=Larry.Finger@lwfinger.net \
    --cc=dan.carpenter@oracle.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-staging@lists.linux.dev \
    /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).