From: Leonardo Martins Martins <dev.lmmrtns@gmail.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org,
Leonardo Martins Martins <dev.lmmrtns@gmail.com>
Subject: [PATCH 2/4] staging: rtl8723bs: change issue_probereq return types to void
Date: Thu, 03 Sep 2026 02:18:08 -0300 [thread overview]
Message-ID: <20260903-issue_probereq-v1-2-82f153d157a1@gmail.com> (raw)
In-Reply-To: <20260903-issue_probereq-v1-0-82f153d157a1@gmail.com>
The return values of issue_probereq_ex() and _issue_probereq() are never
used anywhere, change their return types to void to reflect this.
Signed-off-by: Leonardo Martins Martins <dev.lmmrtns@gmail.com>
---
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 31 ++++++------------------
drivers/staging/rtl8723bs/include/rtw_mlme_ext.h | 2 +-
2 files changed, 8 insertions(+), 25 deletions(-)
diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
index 4bdd2ae24d274cdc4b2c6496f385856c6039c55c..d3c87d25fab1108adde15d959e0b890b2180f20d 100644
--- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
@@ -2401,11 +2401,10 @@ void issue_probersp(struct adapter *padapter, unsigned char *da, u8 is_valid_p2p
dump_mgntframe(padapter, pmgntframe);
}
-static int _issue_probereq(struct adapter *padapter,
- struct ndis_802_11_ssid *pssid,
- u8 *da, u8 ch, bool append_wps, bool wait_ack)
+static void _issue_probereq(struct adapter *padapter,
+ struct ndis_802_11_ssid *pssid,
+ u8 *da, u8 ch, bool append_wps, bool wait_ack)
{
- int ret = _FAIL;
struct xmit_frame *pmgntframe;
struct pkt_attrib *pattrib;
unsigned char *pframe;
@@ -2420,7 +2419,7 @@ static int _issue_probereq(struct adapter *padapter,
pmgntframe = alloc_mgtxmitframe(pxmitpriv);
if (!pmgntframe)
- goto exit;
+ return;
/* update attribute */
pattrib = &pmgntframe->attrib;
@@ -2484,14 +2483,10 @@ static int _issue_probereq(struct adapter *padapter,
pattrib->last_txcmdsz = pattrib->pktlen;
if (wait_ack) {
- ret = dump_mgntframe_and_wait_ack(padapter, pmgntframe);
+ dump_mgntframe_and_wait_ack(padapter, pmgntframe);
} else {
dump_mgntframe(padapter, pmgntframe);
- ret = _SUCCESS;
}
-
-exit:
- return ret;
}
inline void issue_probereq(struct adapter *padapter, struct ndis_802_11_ssid *pssid, u8 *da)
@@ -2499,21 +2494,9 @@ inline void issue_probereq(struct adapter *padapter, struct ndis_802_11_ssid *ps
_issue_probereq(padapter, pssid, da, 0, 1, false);
}
-int issue_probereq_ex(struct adapter *padapter, struct ndis_802_11_ssid *pssid, u8 *da)
+void issue_probereq_ex(struct adapter *padapter, struct ndis_802_11_ssid *pssid, u8 *da)
{
- int ret;
-
- ret = _issue_probereq(padapter, pssid, da, 0, 0, false);
-
- if (ret != _FAIL) {
- ret = _SUCCESS;
- #ifndef DBG_XMIT_ACK
- goto exit;
- #endif
- }
-
-exit:
- return ret;
+ _issue_probereq(padapter, pssid, da, 0, 0, false);
}
/* if psta == NULL, indicate we are station(client) now... */
diff --git a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h b/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h
index acea9cef7756e158c7ab9e357a06a7aab300943f..8e35aabb0ccf96a2bb0c1208db8ad74598a687e0 100644
--- a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h
+++ b/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h
@@ -542,7 +542,7 @@ void issue_assocreq(struct adapter *padapter);
void issue_asocrsp(struct adapter *padapter, unsigned short status, struct sta_info *pstat, int pkt_type);
void issue_auth(struct adapter *padapter, struct sta_info *psta, unsigned short status);
void issue_probereq(struct adapter *padapter, struct ndis_802_11_ssid *pssid, u8 *da);
-s32 issue_probereq_ex(struct adapter *padapter, struct ndis_802_11_ssid *pssid, u8 *da);
+void issue_probereq_ex(struct adapter *padapter, struct ndis_802_11_ssid *pssid, u8 *da);
int issue_nulldata(struct adapter *padapter, unsigned char *da, unsigned int power_mode, int try_cnt, int wait_ms);
s32 issue_nulldata_in_interrupt(struct adapter *padapter, u8 *da);
int issue_qos_nulldata(struct adapter *padapter, unsigned char *da, u16 tid, int try_cnt, int wait_ms);
--
2.47.3
next prev parent reply other threads:[~2026-09-03 5:19 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-03 5:18 [PATCH 0/4] staging: rtl8723bs: refactor issue_probereq() into a single function Leonardo Martins Martins
2026-09-03 5:18 ` [PATCH 1/4] staging: rtl8723bs: remove invariant parameters from issue_probereq_ex() Leonardo Martins Martins
2026-09-03 5:18 ` Leonardo Martins Martins [this message]
2026-09-03 5:18 ` [PATCH 3/4] staging: rtl8723bs: remove invariant parameters from _issue_probereq() Leonardo Martins Martins
2026-09-03 5:18 ` [PATCH 4/4] staging: rtl8723bs: coalesce issue_probereq functions into a single one Leonardo Martins Martins
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=20260903-issue_probereq-v1-2-82f153d157a1@gmail.com \
--to=dev.lmmrtns@gmail.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
all inboxes | Powered by JetHome®