mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Martin Kaiser <martin@kaiser.cx>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Larry Finger <Larry.Finger@lwfinger.net>,
	Phillip Potter <phil@philpotter.co.uk>,
	Michael Straube <straube.linux@gmail.com>,
	Pavel Skripkin <paskripkin@gmail.com>,
	linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org,
	Martin Kaiser <martin@kaiser.cx>,
	kernel test robot <lkp@intel.com>
Subject: [PATCH v2 03/13] staging: r8188eu: make on_action_public static void
Date: Sun, 30 Oct 2022 18:33:16 +0100	[thread overview]
Message-ID: <20221030173326.1588647-4-martin@kaiser.cx> (raw)
In-Reply-To: <20221030173326.1588647-1-martin@kaiser.cx>

The on_action_public function is called only by OnAction. This function
also lives in rtw_mlme_ext.c and does not check the return value from
on_action_public.

We can make on_action_public a static void function.

The ret variable is no longer needed if we don't return a value. It can
be removed.

Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Martin Kaiser <martin@kaiser.cx>
---
Changes in v2
- remove ret variable, it was written but never read

 drivers/staging/r8188eu/core/rtw_mlme_ext.c    | 12 ++++--------
 drivers/staging/r8188eu/include/rtw_mlme_ext.h |  2 --
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
index 7d4f208d161b..88600f62ffb4 100644
--- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c
+++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
@@ -3813,30 +3813,26 @@ static unsigned int on_action_public_default(struct recv_frame *precv_frame)
 	return ret;
 }
 
-unsigned int on_action_public(struct adapter *padapter, struct recv_frame *precv_frame)
+static void on_action_public(struct adapter *padapter, struct recv_frame *precv_frame)
 {
 	struct ieee80211_mgmt *mgmt = (struct ieee80211_mgmt *)precv_frame->rx_data;
-	unsigned int ret = _FAIL;
 	u8 *pframe = precv_frame->rx_data;
 	u8 *frame_body = pframe + sizeof(struct ieee80211_hdr_3addr);
 	u8 action;
 
 	/* check RA matches or not */
 	if (memcmp(myid(&padapter->eeprompriv), mgmt->da, ETH_ALEN))
-		goto exit;
+		return;
 
 	action = frame_body[1];
 	switch (action) {
 	case ACT_PUBLIC_VENDOR:
-		ret = on_action_public_vendor(precv_frame);
+		on_action_public_vendor(precv_frame);
 		break;
 	default:
-		ret = on_action_public_default(precv_frame);
+		on_action_public_default(precv_frame);
 		break;
 	}
-
-exit:
-	return ret;
 }
 
 unsigned int OnAction_p2p(struct adapter *padapter, struct recv_frame *precv_frame)
diff --git a/drivers/staging/r8188eu/include/rtw_mlme_ext.h b/drivers/staging/r8188eu/include/rtw_mlme_ext.h
index c8beaa927cba..ec2e9352011b 100644
--- a/drivers/staging/r8188eu/include/rtw_mlme_ext.h
+++ b/drivers/staging/r8188eu/include/rtw_mlme_ext.h
@@ -538,8 +538,6 @@ void start_create_ibss(struct adapter *padapter);
 
 unsigned int OnAction_back(struct adapter *padapter,
 			   struct recv_frame *precv_frame);
-unsigned int on_action_public(struct adapter *padapter,
-			      struct recv_frame *precv_frame);
 unsigned int OnAction_p2p(struct adapter *padapter,
 			  struct recv_frame *precv_frame);
 
-- 
2.30.2


  parent reply	other threads:[~2022-10-30 17:34 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-10-30 17:33 [PATCH v2 00/13] staging: r8188eu: clean up action frame handlers Martin Kaiser
2022-10-30 17:33 ` [PATCH v2 01/13] staging: r8188eu: replace a GetAddr1Ptr call Martin Kaiser
2022-10-30 17:33 ` [PATCH v2 02/13] staging: r8188eu: remove duplicate category check Martin Kaiser
2022-10-30 17:33 ` Martin Kaiser [this message]
2022-10-30 17:33 ` [PATCH v2 04/13] staging: r8188eu: make OnAction_back static void Martin Kaiser
2022-10-30 17:33 ` [PATCH v2 05/13] staging: r8188eu: make OnAction_p2p " Martin Kaiser
2022-10-30 17:33 ` [PATCH v2 06/13] staging: r8188eu: remove category check in OnAction_p2p Martin Kaiser
2022-10-30 17:33 ` [PATCH v2 07/13] staging: r8188eu: replace switch-case with if Martin Kaiser
2022-10-30 17:33 ` [PATCH v2 08/13] staging: r8188eu: replace GetAddr1Ptr call in OnAction_p2p Martin Kaiser
2022-10-30 17:33 ` [PATCH v2 09/13] staging: r8188eu: clean up on_action_public Martin Kaiser
2022-10-30 17:33 ` [PATCH v2 10/13] staging: r8188eu: remove return value from on_action_public_vendor Martin Kaiser
2022-10-30 17:33 ` [PATCH v2 11/13] staging: r8188eu: remove return value from on_action_public_default Martin Kaiser
2022-10-30 17:33 ` [PATCH v2 12/13] staging: r8188eu: rtw_action_public_decache's token is a u8 Martin Kaiser
2022-10-30 17:33 ` [PATCH v2 13/13] staging: r8188eu: check destination address in OnAction Martin Kaiser
2022-10-30 18:17 ` [PATCH v2 00/13] staging: r8188eu: clean up action frame handlers Philipp Hortmann
2022-10-30 18:48   ` Martin Kaiser
2022-10-30 19:15     ` Philipp Hortmann

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=20221030173326.1588647-4-martin@kaiser.cx \
    --to=martin@kaiser.cx \
    --cc=Larry.Finger@lwfinger.net \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-staging@lists.linux.dev \
    --cc=lkp@intel.com \
    --cc=paskripkin@gmail.com \
    --cc=phil@philpotter.co.uk \
    --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

all inboxes | Powered by JetHome®