* [PATCH 0/4] staging: r8188eu: simple mlme cleanups
@ 2022-03-22 20:24 Martin Kaiser
2022-03-22 20:24 ` [PATCH 1/4] staging: r8188eu: make _rtw_init_mlme_priv static Martin Kaiser
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Martin Kaiser @ 2022-03-22 20:24 UTC (permalink / raw
To: Greg Kroah-Hartman
Cc: Larry Finger, Phillip Potter, Michael Straube, linux-staging,
linux-kernel, Martin Kaiser
some simple cleanups in the mlme part of the driver
Martin Kaiser (4):
staging: r8188eu: make _rtw_init_mlme_priv static
staging: r8188eu: the MCS_rate_2R array is not used
staging: r8188eu: remove empty rtw_dummy_event_callback
staging: r8188eu: remove empty rtw_fwdbg_event_callback
drivers/staging/r8188eu/core/rtw_mlme.c | 11 +----------
drivers/staging/r8188eu/core/rtw_mlme_ext.c | 1 -
drivers/staging/r8188eu/include/rtw_mlme.h | 2 --
drivers/staging/r8188eu/include/rtw_mlme_ext.h | 9 +++------
4 files changed, 4 insertions(+), 19 deletions(-)
--
2.30.2
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/4] staging: r8188eu: make _rtw_init_mlme_priv static
2022-03-22 20:24 [PATCH 0/4] staging: r8188eu: simple mlme cleanups Martin Kaiser
@ 2022-03-22 20:24 ` Martin Kaiser
2022-03-22 20:24 ` [PATCH 2/4] staging: r8188eu: the MCS_rate_2R array is not used Martin Kaiser
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Martin Kaiser @ 2022-03-22 20:24 UTC (permalink / raw
To: Greg Kroah-Hartman
Cc: Larry Finger, Phillip Potter, Michael Straube, linux-staging,
linux-kernel, Martin Kaiser
The _rtw_init_mlme_priv function is used only in rtw_mlme.c.
It can be declared as static.
Signed-off-by: Martin Kaiser <martin@kaiser.cx>
---
drivers/staging/r8188eu/core/rtw_mlme.c | 2 +-
drivers/staging/r8188eu/include/rtw_mlme.h | 2 --
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/staging/r8188eu/core/rtw_mlme.c b/drivers/staging/r8188eu/core/rtw_mlme.c
index 6f0bff186477..a98712e85d6d 100644
--- a/drivers/staging/r8188eu/core/rtw_mlme.c
+++ b/drivers/staging/r8188eu/core/rtw_mlme.c
@@ -31,7 +31,7 @@ u8 rtw_to_roaming(struct adapter *adapter)
return adapter->mlmepriv.to_roaming;
}
-int _rtw_init_mlme_priv(struct adapter *padapter)
+static int _rtw_init_mlme_priv(struct adapter *padapter)
{
int i;
u8 *pbuf;
diff --git a/drivers/staging/r8188eu/include/rtw_mlme.h b/drivers/staging/r8188eu/include/rtw_mlme.h
index 42d850f9d777..01de253c0376 100644
--- a/drivers/staging/r8188eu/include/rtw_mlme.h
+++ b/drivers/staging/r8188eu/include/rtw_mlme.h
@@ -558,8 +558,6 @@ void rtw_scan_timeout_handler(struct adapter *adapter);
#define rtw_set_scan_deny_timer_hdl(adapter) do {} while (0)
#define rtw_set_scan_deny(adapter, ms) do {} while (0)
-int _rtw_init_mlme_priv(struct adapter *padapter);
-
void rtw_free_mlme_priv_ie_data(struct mlme_priv *pmlmepriv);
void _rtw_free_mlme_priv(struct mlme_priv *pmlmepriv);
--
2.30.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/4] staging: r8188eu: the MCS_rate_2R array is not used
2022-03-22 20:24 [PATCH 0/4] staging: r8188eu: simple mlme cleanups Martin Kaiser
2022-03-22 20:24 ` [PATCH 1/4] staging: r8188eu: make _rtw_init_mlme_priv static Martin Kaiser
@ 2022-03-22 20:24 ` Martin Kaiser
2022-03-22 20:24 ` [PATCH 3/4] staging: r8188eu: remove empty rtw_dummy_event_callback Martin Kaiser
2022-03-22 20:24 ` [PATCH 4/4] staging: r8188eu: remove empty rtw_fwdbg_event_callback Martin Kaiser
3 siblings, 0 replies; 5+ messages in thread
From: Martin Kaiser @ 2022-03-22 20:24 UTC (permalink / raw
To: Greg Kroah-Hartman
Cc: Larry Finger, Phillip Potter, Michael Straube, linux-staging,
linux-kernel, Martin Kaiser
The MCS_rate_2R array is not used in the r8188eu driver. Remove it.
Signed-off-by: Martin Kaiser <martin@kaiser.cx>
---
drivers/staging/r8188eu/core/rtw_mlme.c | 1 -
drivers/staging/r8188eu/core/rtw_mlme_ext.c | 1 -
2 files changed, 2 deletions(-)
diff --git a/drivers/staging/r8188eu/core/rtw_mlme.c b/drivers/staging/r8188eu/core/rtw_mlme.c
index a98712e85d6d..59af1df81565 100644
--- a/drivers/staging/r8188eu/core/rtw_mlme.c
+++ b/drivers/staging/r8188eu/core/rtw_mlme.c
@@ -16,7 +16,6 @@
#include "../include/usb_osintf.h"
#include "../include/rtl8188e_dm.h"
-extern unsigned char MCS_rate_2R[16];
extern unsigned char MCS_rate_1R[16];
void rtw_set_roaming(struct adapter *adapter, u8 to_roaming)
diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
index 96e8d346588b..c0a1efcd8b28 100644
--- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c
+++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
@@ -71,7 +71,6 @@ extern unsigned char REALTEK_96B_IE[];
/********************************************************
MCS rate definitions
*********************************************************/
-unsigned char MCS_rate_2R[16] = {0xff, 0xff, 0x0, 0x0, 0x01, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0};
unsigned char MCS_rate_1R[16] = {0xff, 0x00, 0x0, 0x0, 0x01, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0};
/********************************************************
--
2.30.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 3/4] staging: r8188eu: remove empty rtw_dummy_event_callback
2022-03-22 20:24 [PATCH 0/4] staging: r8188eu: simple mlme cleanups Martin Kaiser
2022-03-22 20:24 ` [PATCH 1/4] staging: r8188eu: make _rtw_init_mlme_priv static Martin Kaiser
2022-03-22 20:24 ` [PATCH 2/4] staging: r8188eu: the MCS_rate_2R array is not used Martin Kaiser
@ 2022-03-22 20:24 ` Martin Kaiser
2022-03-22 20:24 ` [PATCH 4/4] staging: r8188eu: remove empty rtw_fwdbg_event_callback Martin Kaiser
3 siblings, 0 replies; 5+ messages in thread
From: Martin Kaiser @ 2022-03-22 20:24 UTC (permalink / raw
To: Greg Kroah-Hartman
Cc: Larry Finger, Phillip Potter, Michael Straube, linux-staging,
linux-kernel, Martin Kaiser
Remove the empty function rtw_dummy_event_callback.
Signed-off-by: Martin Kaiser <martin@kaiser.cx>
---
drivers/staging/r8188eu/core/rtw_mlme.c | 4 ----
drivers/staging/r8188eu/include/rtw_mlme_ext.h | 5 ++---
2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/r8188eu/core/rtw_mlme.c b/drivers/staging/r8188eu/core/rtw_mlme.c
index 59af1df81565..4ef50224c775 100644
--- a/drivers/staging/r8188eu/core/rtw_mlme.c
+++ b/drivers/staging/r8188eu/core/rtw_mlme.c
@@ -747,10 +747,6 @@ void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf)
rtw_os_xmit_schedule(adapter);
}
-void rtw_dummy_event_callback(struct adapter *adapter, u8 *pbuf)
-{
-}
-
void rtw_fwdbg_event_callback(struct adapter *adapter, u8 *pbuf)
{
}
diff --git a/drivers/staging/r8188eu/include/rtw_mlme_ext.h b/drivers/staging/r8188eu/include/rtw_mlme_ext.h
index 3dde2bd0d77a..3da7b93ba5e9 100644
--- a/drivers/staging/r8188eu/include/rtw_mlme_ext.h
+++ b/drivers/staging/r8188eu/include/rtw_mlme_ext.h
@@ -744,7 +744,6 @@ struct C2HEvent_Header {
unsigned int rsvd;
};
-void rtw_dummy_event_callback(struct adapter *adapter, u8 *pbuf);
void rtw_fwdbg_event_callback(struct adapter *adapter, u8 *pbuf);
enum rtw_c2h_event {
@@ -781,7 +780,7 @@ enum rtw_c2h_event {
#ifdef _RTW_MLME_EXT_C_
static struct fwevent wlanevents[] = {
- {0, rtw_dummy_event_callback}, /*0*/
+ {0, NULL}, /*0*/
{0, NULL},
{0, NULL},
{0, NULL},
@@ -795,7 +794,7 @@ static struct fwevent wlanevents[] = {
{sizeof(struct stassoc_event), &rtw_stassoc_event_callback},
{sizeof(struct stadel_event), &rtw_stadel_event_callback},
{0, NULL},
- {0, rtw_dummy_event_callback},
+ {0, NULL},
{0, NULL}, /*15*/
{0, NULL},
{0, NULL},
--
2.30.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 4/4] staging: r8188eu: remove empty rtw_fwdbg_event_callback
2022-03-22 20:24 [PATCH 0/4] staging: r8188eu: simple mlme cleanups Martin Kaiser
` (2 preceding siblings ...)
2022-03-22 20:24 ` [PATCH 3/4] staging: r8188eu: remove empty rtw_dummy_event_callback Martin Kaiser
@ 2022-03-22 20:24 ` Martin Kaiser
3 siblings, 0 replies; 5+ messages in thread
From: Martin Kaiser @ 2022-03-22 20:24 UTC (permalink / raw
To: Greg Kroah-Hartman
Cc: Larry Finger, Phillip Potter, Michael Straube, linux-staging,
linux-kernel, Martin Kaiser
Remove the empty function rtw_fwdbg_event_callback.
Signed-off-by: Martin Kaiser <martin@kaiser.cx>
---
drivers/staging/r8188eu/core/rtw_mlme.c | 4 ----
drivers/staging/r8188eu/include/rtw_mlme_ext.h | 4 +---
2 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/drivers/staging/r8188eu/core/rtw_mlme.c b/drivers/staging/r8188eu/core/rtw_mlme.c
index 4ef50224c775..f1e1627641cb 100644
--- a/drivers/staging/r8188eu/core/rtw_mlme.c
+++ b/drivers/staging/r8188eu/core/rtw_mlme.c
@@ -747,10 +747,6 @@ void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf)
rtw_os_xmit_schedule(adapter);
}
-void rtw_fwdbg_event_callback(struct adapter *adapter, u8 *pbuf)
-{
-}
-
static void free_scanqueue(struct mlme_priv *pmlmepriv)
{
struct __queue *free_queue = &pmlmepriv->free_bss_pool;
diff --git a/drivers/staging/r8188eu/include/rtw_mlme_ext.h b/drivers/staging/r8188eu/include/rtw_mlme_ext.h
index 3da7b93ba5e9..bab6eeae6fc9 100644
--- a/drivers/staging/r8188eu/include/rtw_mlme_ext.h
+++ b/drivers/staging/r8188eu/include/rtw_mlme_ext.h
@@ -744,8 +744,6 @@ struct C2HEvent_Header {
unsigned int rsvd;
};
-void rtw_fwdbg_event_callback(struct adapter *adapter, u8 *pbuf);
-
enum rtw_c2h_event {
GEN_EVT_CODE(_Read_MACREG) = 0, /*0*/
GEN_EVT_CODE(_Read_BBREG),
@@ -799,7 +797,7 @@ static struct fwevent wlanevents[] = {
{0, NULL},
{0, NULL},
{0, NULL},
- {0, rtw_fwdbg_event_callback},
+ {0, NULL},
{0, NULL}, /*20*/
{0, NULL},
{0, NULL},
--
2.30.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-03-22 20:25 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-03-22 20:24 [PATCH 0/4] staging: r8188eu: simple mlme cleanups Martin Kaiser
2022-03-22 20:24 ` [PATCH 1/4] staging: r8188eu: make _rtw_init_mlme_priv static Martin Kaiser
2022-03-22 20:24 ` [PATCH 2/4] staging: r8188eu: the MCS_rate_2R array is not used Martin Kaiser
2022-03-22 20:24 ` [PATCH 3/4] staging: r8188eu: remove empty rtw_dummy_event_callback Martin Kaiser
2022-03-22 20:24 ` [PATCH 4/4] staging: r8188eu: remove empty rtw_fwdbg_event_callback Martin Kaiser
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.