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>,
	linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org,
	Martin Kaiser <martin@kaiser.cx>
Subject: [PATCH 4/9] staging: r8188eu: remove action_handler string
Date: Mon,  2 May 2022 22:06:47 +0200	[thread overview]
Message-ID: <20220502200652.143665-5-martin@kaiser.cx> (raw)
In-Reply-To: <20220502200652.143665-1-martin@kaiser.cx>

Remove the unused str component from struct action_handler and the
corresponding entries in OnAction_tbl.

Signed-off-by: Martin Kaiser <martin@kaiser.cx>
---
 drivers/staging/r8188eu/core/rtw_mlme_ext.c    | 6 +++---
 drivers/staging/r8188eu/include/rtw_mlme_ext.h | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
index a581930b05df..9c83a74f0795 100644
--- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c
+++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
@@ -33,9 +33,9 @@ static mlme_handler mlme_sta_tbl[] = {
 };
 
 static struct action_handler OnAction_tbl[] = {
-	{RTW_WLAN_CATEGORY_BACK, "ACTION_BACK", &OnAction_back},
-	{RTW_WLAN_CATEGORY_PUBLIC, "ACTION_PUBLIC", on_action_public},
-	{RTW_WLAN_CATEGORY_P2P, "ACTION_P2P", &OnAction_p2p},
+	{RTW_WLAN_CATEGORY_BACK, &OnAction_back},
+	{RTW_WLAN_CATEGORY_PUBLIC, on_action_public},
+	{RTW_WLAN_CATEGORY_P2P, &OnAction_p2p},
 };
 
 static u8 null_addr[ETH_ALEN] = {0, 0, 0, 0, 0, 0};
diff --git a/drivers/staging/r8188eu/include/rtw_mlme_ext.h b/drivers/staging/r8188eu/include/rtw_mlme_ext.h
index 136879a0a0f9..63e4ee8e3dfb 100644
--- a/drivers/staging/r8188eu/include/rtw_mlme_ext.h
+++ b/drivers/staging/r8188eu/include/rtw_mlme_ext.h
@@ -188,7 +188,6 @@ typedef unsigned int (*mlme_handler)(struct adapter *adapt, struct recv_frame *f
 
 struct action_handler {
 	unsigned int   num;
-	char* str;
 	unsigned int (*func)(struct adapter *adapt, struct recv_frame *frame);
 };
 
-- 
2.30.2


  parent reply	other threads:[~2022-05-02 20:07 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-05-02 20:06 [PATCH 0/9] staging: r8188eu: clean up OnAction Martin Kaiser
2022-05-02 20:06 ` [PATCH 1/9] staging: r8188eu: action category ht is not used Martin Kaiser
2022-05-02 20:06 ` [PATCH 2/9] staging: r8188eu: action category wmm " Martin Kaiser
2022-05-02 20:06 ` [PATCH 3/9] staging: r8188eu: remove unused action handler prototypes Martin Kaiser
2022-05-02 20:06 ` Martin Kaiser [this message]
2022-05-02 20:06 ` [PATCH 5/9] staging: r8188eu: remove an unused category define Martin Kaiser
2022-05-02 20:06 ` [PATCH 6/9] staging: r8188eu: replace OnAction_tbl with switch-case Martin Kaiser
2022-05-02 20:06 ` [PATCH 7/9] staging: r8188eu: use ieee80211_mgmt for action category Martin Kaiser
2022-05-02 20:06 ` [PATCH 8/9] staging: r8188eu: use standard category defines Martin Kaiser
2022-05-02 20:06 ` [PATCH 9/9] staging: r8188eu: remove unused IEEE_* defines Martin Kaiser

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=20220502200652.143665-5-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=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®