* [PATCH 00/11] staging: r8188eu: the next set of cleanups
@ 2022-01-02 13:11 Michael Straube
2022-01-02 13:11 ` [PATCH 01/11] staging: r8188eu: remove MAX_CHANNEL_NUM_2G Michael Straube
` (11 more replies)
0 siblings, 12 replies; 13+ messages in thread
From: Michael Straube @ 2022-01-02 13:11 UTC (permalink / raw)
To: gregkh; +Cc: Larry.Finger, phil, linux-staging, linux-kernel, Michael Straube
This set
- removes some unused structs, enums and defines
- removes set but not used fields from some structures
Tested on x86_64 with Inter-Tech DMG-02.
Michael Straube (11):
staging: r8188eu: remove MAX_CHANNEL_NUM_2G
staging: r8188eu: remove struct rt_channel_plan_2g
staging: r8188eu: remove unused enum and defines
staging: r8188eu: struct rx_hpc is not used
staging: r8188eu: clean up struct rtw_dig
staging: r8188eu: clean up struct sw_ant_switch
staging: r8188eu: struct odm_sta_info is not used
staging: r8188eu: enum hw90_block is not used
staging: r8188eu: remove unneeded comments from Hal8188EPhyCfg.h
staging: r8188eu: remove unused defines from Hal8188EPhyCfg.h
staging: r8188eu: remove unused defines from rtw_eeprom.h
drivers/staging/r8188eu/core/rtw_mlme_ext.c | 2 +-
drivers/staging/r8188eu/hal/odm.c | 11 ---
.../staging/r8188eu/include/Hal8188EPhyCfg.h | 34 +------
drivers/staging/r8188eu/include/odm.h | 90 +------------------
drivers/staging/r8188eu/include/rtw_eeprom.h | 31 -------
.../staging/r8188eu/include/rtw_mlme_ext.h | 5 --
drivers/staging/r8188eu/include/rtw_rf.h | 24 -----
7 files changed, 3 insertions(+), 194 deletions(-)
--
2.34.1
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 01/11] staging: r8188eu: remove MAX_CHANNEL_NUM_2G
2022-01-02 13:11 [PATCH 00/11] staging: r8188eu: the next set of cleanups Michael Straube
@ 2022-01-02 13:11 ` Michael Straube
2022-01-02 13:11 ` [PATCH 02/11] staging: r8188eu: remove struct rt_channel_plan_2g Michael Straube
` (10 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Michael Straube @ 2022-01-02 13:11 UTC (permalink / raw)
To: gregkh; +Cc: Larry.Finger, phil, linux-staging, linux-kernel, Michael Straube
The constants MAX_CHANNEL_NUM_2G and MAX_CHANNEL_NUM have the same
value. Remove MAX_CHANNEL_NUM_2G and fix the place where it is used.
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
drivers/staging/r8188eu/include/rtw_mlme_ext.h | 2 +-
drivers/staging/r8188eu/include/rtw_rf.h | 5 -----
2 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/drivers/staging/r8188eu/include/rtw_mlme_ext.h b/drivers/staging/r8188eu/include/rtw_mlme_ext.h
index 5b307ad3afa5..afdbc5e28fca 100644
--- a/drivers/staging/r8188eu/include/rtw_mlme_ext.h
+++ b/drivers/staging/r8188eu/include/rtw_mlme_ext.h
@@ -163,7 +163,7 @@ struct rt_channel_plan {
};
struct rt_channel_plan_2g {
- unsigned char Channel[MAX_CHANNEL_NUM_2G];
+ unsigned char Channel[MAX_CHANNEL_NUM];
unsigned char Len;
};
diff --git a/drivers/staging/r8188eu/include/rtw_rf.h b/drivers/staging/r8188eu/include/rtw_rf.h
index d0a408b903dc..2308a00b5dec 100644
--- a/drivers/staging/r8188eu/include/rtw_rf.h
+++ b/drivers/staging/r8188eu/include/rtw_rf.h
@@ -19,11 +19,6 @@
#define RTL8711_RF_MAX_SENS 6
#define RTL8711_RF_DEF_SENS 4
-/* We now define the following channels as the max channels in each
- * channel plan. */
-/* 2G, total 14 chnls */
-/* {1,2,3,4,5,6,7,8,9,10,11,12,13,14} */
-#define MAX_CHANNEL_NUM_2G 14
#define MAX_CHANNEL_NUM 14 /* 2.4 GHz only */
#define NUM_REGULATORYS 1
--
2.34.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 02/11] staging: r8188eu: remove struct rt_channel_plan_2g
2022-01-02 13:11 [PATCH 00/11] staging: r8188eu: the next set of cleanups Michael Straube
2022-01-02 13:11 ` [PATCH 01/11] staging: r8188eu: remove MAX_CHANNEL_NUM_2G Michael Straube
@ 2022-01-02 13:11 ` Michael Straube
2022-01-02 13:11 ` [PATCH 03/11] staging: r8188eu: remove unused enum and defines Michael Straube
` (9 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Michael Straube @ 2022-01-02 13:11 UTC (permalink / raw)
To: gregkh; +Cc: Larry.Finger, phil, linux-staging, linux-kernel, Michael Straube
The structures rt_channel_plan and rt_channel_plan_2g are identical.
Keep rt_channel_plan and remove rt_channel_plan_2g.
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
drivers/staging/r8188eu/core/rtw_mlme_ext.c | 2 +-
drivers/staging/r8188eu/include/rtw_mlme_ext.h | 5 -----
2 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
index 0aa958f20cd6..a9141ab1690e 100644
--- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c
+++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
@@ -76,7 +76,7 @@ unsigned char MCS_rate_1R[16] = {0xff, 0x00, 0x0, 0x0, 0x01, 0x0, 0x0, 0x0, 0x0,
/********************************************************
ChannelPlan definitions
*********************************************************/
-static struct rt_channel_plan_2g RTW_ChannelPlan2G[RT_CHANNEL_DOMAIN_2G_MAX] = {
+static struct rt_channel_plan RTW_ChannelPlan2G[RT_CHANNEL_DOMAIN_2G_MAX] = {
{{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13}, 13}, /* 0x00, RT_CHANNEL_DOMAIN_2G_WORLD , Passive scan CH 12, 13 */
{{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13}, 13}, /* 0x01, RT_CHANNEL_DOMAIN_2G_ETSI1 */
{{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11}, 11}, /* 0x02, RT_CHANNEL_DOMAIN_2G_FCC1 */
diff --git a/drivers/staging/r8188eu/include/rtw_mlme_ext.h b/drivers/staging/r8188eu/include/rtw_mlme_ext.h
index afdbc5e28fca..26f31f20e428 100644
--- a/drivers/staging/r8188eu/include/rtw_mlme_ext.h
+++ b/drivers/staging/r8188eu/include/rtw_mlme_ext.h
@@ -162,11 +162,6 @@ struct rt_channel_plan {
unsigned char Len;
};
-struct rt_channel_plan_2g {
- unsigned char Channel[MAX_CHANNEL_NUM];
- unsigned char Len;
-};
-
struct rt_channel_plan_map {
unsigned char Index2G;
};
--
2.34.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 03/11] staging: r8188eu: remove unused enum and defines
2022-01-02 13:11 [PATCH 00/11] staging: r8188eu: the next set of cleanups Michael Straube
2022-01-02 13:11 ` [PATCH 01/11] staging: r8188eu: remove MAX_CHANNEL_NUM_2G Michael Straube
2022-01-02 13:11 ` [PATCH 02/11] staging: r8188eu: remove struct rt_channel_plan_2g Michael Straube
@ 2022-01-02 13:11 ` Michael Straube
2022-01-02 13:11 ` [PATCH 04/11] staging: r8188eu: struct rx_hpc is not used Michael Straube
` (8 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Michael Straube @ 2022-01-02 13:11 UTC (permalink / raw)
To: gregkh; +Cc: Larry.Finger, phil, linux-staging, linux-kernel, Michael Straube
Remove the unused enum rf90_radio_path and some unused defines.
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
drivers/staging/r8188eu/include/rtw_eeprom.h | 5 -----
drivers/staging/r8188eu/include/rtw_rf.h | 19 -------------------
2 files changed, 24 deletions(-)
diff --git a/drivers/staging/r8188eu/include/rtw_eeprom.h b/drivers/staging/r8188eu/include/rtw_eeprom.h
index e517239bd75e..22c2eddd5e75 100644
--- a/drivers/staging/r8188eu/include/rtw_eeprom.h
+++ b/drivers/staging/r8188eu/include/rtw_eeprom.h
@@ -21,11 +21,6 @@
#define EEPROM_EWEN_OPCODE 19 /* Erase/write enable */
#define EEPROM_EWDS_OPCODE 16 /* Erase/write disable */
-/* Country codes */
-#define USA 0x555320
-#define EUROPE 0x1 /* temp, should be provided later */
-#define JAPAN 0x2 /* temp, should be provided later */
-
#define EEPROM_CID_DEFAULT 0x0
#define EEPROM_CID_ALPHA 0x1
#define EEPROM_CID_Senao 0x3
diff --git a/drivers/staging/r8188eu/include/rtw_rf.h b/drivers/staging/r8188eu/include/rtw_rf.h
index 2308a00b5dec..b7267e75346c 100644
--- a/drivers/staging/r8188eu/include/rtw_rf.h
+++ b/drivers/staging/r8188eu/include/rtw_rf.h
@@ -6,28 +6,16 @@
#include "rtw_cmd.h"
-#define OFDM_PHY 1
-#define MIXED_PHY 2
-#define CCK_PHY 3
-
#define NumRates (13)
/* slot time for 11g */
#define SHORT_SLOT_TIME 9
#define NON_SHORT_SLOT_TIME 20
-#define RTL8711_RF_MAX_SENS 6
-#define RTL8711_RF_DEF_SENS 4
-
#define MAX_CHANNEL_NUM 14 /* 2.4 GHz only */
#define NUM_REGULATORYS 1
-/* Country codes */
-#define USA 0x555320
-#define EUROPE 0x1 /* temp, should be provided later */
-#define JAPAN 0x2 /* temp, should be provided later */
-
struct regulatory_class {
u32 starting_freq; /* MHz, */
u8 channel_set[MAX_CHANNEL_NUM];
@@ -64,13 +52,6 @@ enum _REG_PREAMBLE_MODE {
PREAMBLE_SHORT = 3,
};
-enum rf90_radio_path {
- RF90_PATH_A = 0, /* Radio Path A */
- RF90_PATH_B = 1, /* Radio Path B */
- RF90_PATH_C = 2, /* Radio Path C */
- RF90_PATH_D = 3 /* Radio Path D */
-};
-
/* Bandwidth Offset */
#define HAL_PRIME_CHNL_OFFSET_DONT_CARE 0
#define HAL_PRIME_CHNL_OFFSET_LOWER 1
--
2.34.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 04/11] staging: r8188eu: struct rx_hpc is not used
2022-01-02 13:11 [PATCH 00/11] staging: r8188eu: the next set of cleanups Michael Straube
` (2 preceding siblings ...)
2022-01-02 13:11 ` [PATCH 03/11] staging: r8188eu: remove unused enum and defines Michael Straube
@ 2022-01-02 13:11 ` Michael Straube
2022-01-02 13:11 ` [PATCH 05/11] staging: r8188eu: clean up struct rtw_dig Michael Straube
` (7 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Michael Straube @ 2022-01-02 13:11 UTC (permalink / raw)
To: gregkh; +Cc: Larry.Finger, phil, linux-staging, linux-kernel, Michael Straube
The structure rx_hpc is not used. Remove it.
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
drivers/staging/r8188eu/include/odm.h | 14 --------------
1 file changed, 14 deletions(-)
diff --git a/drivers/staging/r8188eu/include/odm.h b/drivers/staging/r8188eu/include/odm.h
index 793068778833..46fdc87a5e2f 100644
--- a/drivers/staging/r8188eu/include/odm.h
+++ b/drivers/staging/r8188eu/include/odm.h
@@ -75,20 +75,6 @@ struct false_alarm_stats {
u32 Cnt_BW_LSC; /* Gary */
};
-struct rx_hpc {
- u8 RXHP_flag;
- u8 PSD_func_trigger;
- u8 PSD_bitmap_RXHP[80];
- u8 Pre_IGI;
- u8 Cur_IGI;
- u8 Pre_pw_th;
- u8 Cur_pw_th;
- bool First_time_enter;
- bool RXHP_enable;
- u8 TP_Mode;
- struct timer_list PSDTimer;
-};
-
#define ODM_ASSOCIATE_ENTRY_NUM 32 /* Max size of AsocEntry[]. */
struct sw_ant_switch {
--
2.34.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 05/11] staging: r8188eu: clean up struct rtw_dig
2022-01-02 13:11 [PATCH 00/11] staging: r8188eu: the next set of cleanups Michael Straube
` (3 preceding siblings ...)
2022-01-02 13:11 ` [PATCH 04/11] staging: r8188eu: struct rx_hpc is not used Michael Straube
@ 2022-01-02 13:11 ` Michael Straube
2022-01-02 13:11 ` [PATCH 06/11] staging: r8188eu: clean up struct sw_ant_switch Michael Straube
` (6 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Michael Straube @ 2022-01-02 13:11 UTC (permalink / raw)
To: gregkh; +Cc: Larry.Finger, phil, linux-staging, linux-kernel, Michael Straube
Remove unused and set but never used fields from struct rtw_dig.
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
drivers/staging/r8188eu/hal/odm.c | 11 ---------
drivers/staging/r8188eu/include/odm.h | 32 ---------------------------
2 files changed, 43 deletions(-)
diff --git a/drivers/staging/r8188eu/hal/odm.c b/drivers/staging/r8188eu/hal/odm.c
index 4ec377f1b90c..d8fa587ff286 100644
--- a/drivers/staging/r8188eu/hal/odm.c
+++ b/drivers/staging/r8188eu/hal/odm.c
@@ -146,24 +146,14 @@ static void odm_DIGInit(struct odm_dm_struct *pDM_Odm)
struct adapter *adapter = pDM_Odm->Adapter;
pDM_DigTable->CurIGValue = (u8)rtl8188e_PHY_QueryBBReg(adapter, ODM_REG_IGI_A_11N, ODM_BIT_IGI_11N);
- pDM_DigTable->RssiLowThresh = DM_DIG_THRESH_LOW;
- pDM_DigTable->RssiHighThresh = DM_DIG_THRESH_HIGH;
- pDM_DigTable->FALowThresh = DM_false_ALARM_THRESH_LOW;
- pDM_DigTable->FAHighThresh = DM_false_ALARM_THRESH_HIGH;
pDM_DigTable->rx_gain_range_max = DM_DIG_MAX_NIC;
pDM_DigTable->rx_gain_range_min = DM_DIG_MIN_NIC;
- pDM_DigTable->BackoffVal = DM_DIG_BACKOFF_DEFAULT;
- pDM_DigTable->BackoffVal_range_max = DM_DIG_BACKOFF_MAX;
- pDM_DigTable->BackoffVal_range_min = DM_DIG_BACKOFF_MIN;
- pDM_DigTable->PreCCK_CCAThres = 0xFF;
pDM_DigTable->CurCCK_CCAThres = 0x83;
pDM_DigTable->ForbiddenIGI = DM_DIG_MIN_NIC;
pDM_DigTable->LargeFAHit = 0;
pDM_DigTable->Recover_cnt = 0;
pDM_DigTable->DIG_Dynamic_MIN_0 = DM_DIG_MIN_NIC;
- pDM_DigTable->DIG_Dynamic_MIN_1 = DM_DIG_MIN_NIC;
pDM_DigTable->bMediaConnect_0 = false;
- pDM_DigTable->bMediaConnect_1 = false;
/* To Initialize pDM_Odm->bDMInitialGainEnable == false to avoid DIG error */
pDM_Odm->bDMInitialGainEnable = true;
@@ -771,7 +761,6 @@ void ODM_Write_CCK_CCA_Thres(struct odm_dm_struct *pDM_Odm, u8 CurCCK_CCAThres)
if (pDM_DigTable->CurCCK_CCAThres != CurCCK_CCAThres) /* modify by Guo.Mingzhi 2012-01-03 */
rtw_write8(pDM_Odm->Adapter, ODM_REG_CCK_CCA_11N, CurCCK_CCAThres);
- pDM_DigTable->PreCCK_CCAThres = pDM_DigTable->CurCCK_CCAThres;
pDM_DigTable->CurCCK_CCAThres = CurCCK_CCAThres;
}
diff --git a/drivers/staging/r8188eu/include/odm.h b/drivers/staging/r8188eu/include/odm.h
index 46fdc87a5e2f..065f2ec91a38 100644
--- a/drivers/staging/r8188eu/include/odm.h
+++ b/drivers/staging/r8188eu/include/odm.h
@@ -5,43 +5,21 @@
#define __HALDMOUTSRC_H__
struct rtw_dig {
- u8 Dig_Enable_Flag;
- u8 Dig_Ext_Port_Stage;
-
- int RssiLowThresh;
- int RssiHighThresh;
-
- u32 FALowThresh;
- u32 FAHighThresh;
-
- u8 CurSTAConnectState;
- u8 PreSTAConnectState;
- u8 CurMultiSTAConnectState;
-
u8 PreIGValue;
u8 CurIGValue;
u8 BackupIGValue;
- s8 BackoffVal;
- s8 BackoffVal_range_max;
- s8 BackoffVal_range_min;
u8 rx_gain_range_max;
u8 rx_gain_range_min;
- u8 Rssi_val_min;
- u8 PreCCK_CCAThres;
u8 CurCCK_CCAThres;
- u8 PreCCKPDState;
- u8 CurCCKPDState;
u8 LargeFAHit;
u8 ForbiddenIGI;
u32 Recover_cnt;
u8 DIG_Dynamic_MIN_0;
- u8 DIG_Dynamic_MIN_1;
bool bMediaConnect_0;
- bool bMediaConnect_1;
u32 AntDiv_RSSI_max;
u32 RSSI_max;
@@ -482,12 +460,6 @@ enum odm_bb_config_type {
CONFIG_BB_PHY_REG_PG,
};
-#define DM_DIG_THRESH_HIGH 40
-#define DM_DIG_THRESH_LOW 35
-
-#define DM_false_ALARM_THRESH_LOW 400
-#define DM_false_ALARM_THRESH_HIGH 1000
-
#define DM_DIG_MAX_NIC 0x4e
#define DM_DIG_MIN_NIC 0x1e /* 0x22/0x1c */
@@ -499,10 +471,6 @@ enum odm_bb_config_type {
#define DM_DIG_FA_TH1 0x300/* 0x100 */
#define DM_DIG_FA_TH2 0x400/* 0x200 */
-#define DM_DIG_BACKOFF_MAX 12
-#define DM_DIG_BACKOFF_MIN -4
-#define DM_DIG_BACKOFF_DEFAULT 10
-
/* 3=========================================================== */
/* 3 Rate Adaptive */
/* 3=========================================================== */
--
2.34.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 06/11] staging: r8188eu: clean up struct sw_ant_switch
2022-01-02 13:11 [PATCH 00/11] staging: r8188eu: the next set of cleanups Michael Straube
` (4 preceding siblings ...)
2022-01-02 13:11 ` [PATCH 05/11] staging: r8188eu: clean up struct rtw_dig Michael Straube
@ 2022-01-02 13:11 ` Michael Straube
2022-01-02 13:11 ` [PATCH 07/11] staging: r8188eu: struct odm_sta_info is not used Michael Straube
` (5 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Michael Straube @ 2022-01-02 13:11 UTC (permalink / raw)
To: gregkh; +Cc: Larry.Finger, phil, linux-staging, linux-kernel, Michael Straube
Remove unused fields from struct sw_ant_switch.
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
drivers/staging/r8188eu/include/odm.h | 28 +--------------------------
1 file changed, 1 insertion(+), 27 deletions(-)
diff --git a/drivers/staging/r8188eu/include/odm.h b/drivers/staging/r8188eu/include/odm.h
index 065f2ec91a38..d81aff9c9467 100644
--- a/drivers/staging/r8188eu/include/odm.h
+++ b/drivers/staging/r8188eu/include/odm.h
@@ -56,34 +56,8 @@ struct false_alarm_stats {
#define ODM_ASSOCIATE_ENTRY_NUM 32 /* Max size of AsocEntry[]. */
struct sw_ant_switch {
- u8 try_flag;
- s32 PreRSSI;
u8 CurAntenna;
- u8 PreAntenna;
- u8 RSSI_Trying;
- u8 TestMode;
- u8 bTriggerAntennaSwitch;
- u8 SelectAntennaMap;
- u8 RSSI_target;
-
- /* Before link Antenna Switch check */
- u8 SWAS_NoLink_State;
- u32 SWAS_NoLink_BK_Reg860;
-
- s32 RSSI_sum_A;
- s32 RSSI_sum_B;
- s32 RSSI_cnt_A;
- s32 RSSI_cnt_B;
- u64 lastTxOkCnt;
- u64 lastRxOkCnt;
- u64 TXByteCnt_A;
- u64 TXByteCnt_B;
- u64 RXByteCnt_A;
- u64 RXByteCnt_B;
- u8 TrafficLoad;
- struct timer_list SwAntennaSwitchTimer;
- u8 TxAnt[ODM_ASSOCIATE_ENTRY_NUM];
- u8 TargetSTA;
+ u8 SWAS_NoLink_State; /* Before link Antenna Switch check */
u8 RxIdleAnt;
};
--
2.34.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 07/11] staging: r8188eu: struct odm_sta_info is not used
2022-01-02 13:11 [PATCH 00/11] staging: r8188eu: the next set of cleanups Michael Straube
` (5 preceding siblings ...)
2022-01-02 13:11 ` [PATCH 06/11] staging: r8188eu: clean up struct sw_ant_switch Michael Straube
@ 2022-01-02 13:11 ` Michael Straube
2022-01-02 13:11 ` [PATCH 08/11] staging: r8188eu: enum hw90_block " Michael Straube
` (4 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Michael Straube @ 2022-01-02 13:11 UTC (permalink / raw)
To: gregkh; +Cc: Larry.Finger, phil, linux-staging, linux-kernel, Michael Straube
The structure odm_sta_info is not used. Remove it.
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
drivers/staging/r8188eu/include/odm.h | 16 ----------------
1 file changed, 16 deletions(-)
diff --git a/drivers/staging/r8188eu/include/odm.h b/drivers/staging/r8188eu/include/odm.h
index d81aff9c9467..23a151c558dc 100644
--- a/drivers/staging/r8188eu/include/odm.h
+++ b/drivers/staging/r8188eu/include/odm.h
@@ -116,22 +116,6 @@ enum odm_ability {
ODM_PSD2AFH = 0x00000800
};
-/* 2011/20/20 MH For MP driver RT_WLAN_STA = struct sta_info */
-/* Please declare below ODM relative info in your STA info structure. */
-
-struct odm_sta_info {
- /* Driver Write */
- bool bUsed; /* record the sta status link or not? */
- u8 IOTPeer; /* Enum value. HT_IOT_PEER_E */
-
- /* ODM Write */
- /* 1 PHY_STATUS_INFO */
- u8 RSSI_Path[4]; /* */
- u8 RSSI_Ave;
- u8 RXEVM[4];
- u8 RXSNR[4];
-};
-
/* 2011/10/20 MH Define Common info enum for all team. */
enum odm_common_info_def {
--
2.34.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 08/11] staging: r8188eu: enum hw90_block is not used
2022-01-02 13:11 [PATCH 00/11] staging: r8188eu: the next set of cleanups Michael Straube
` (6 preceding siblings ...)
2022-01-02 13:11 ` [PATCH 07/11] staging: r8188eu: struct odm_sta_info is not used Michael Straube
@ 2022-01-02 13:11 ` Michael Straube
2022-01-02 13:11 ` [PATCH 09/11] staging: r8188eu: remove unneeded comments from Hal8188EPhyCfg.h Michael Straube
` (3 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Michael Straube @ 2022-01-02 13:11 UTC (permalink / raw)
To: gregkh; +Cc: Larry.Finger, phil, linux-staging, linux-kernel, Michael Straube
The enumeration hw90_block is not used. Remove it.
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
drivers/staging/r8188eu/include/Hal8188EPhyCfg.h | 8 --------
1 file changed, 8 deletions(-)
diff --git a/drivers/staging/r8188eu/include/Hal8188EPhyCfg.h b/drivers/staging/r8188eu/include/Hal8188EPhyCfg.h
index addc6a5354a6..fe6111fe278e 100644
--- a/drivers/staging/r8188eu/include/Hal8188EPhyCfg.h
+++ b/drivers/staging/r8188eu/include/Hal8188EPhyCfg.h
@@ -17,14 +17,6 @@
/*------------------------------Define structure----------------------------*/
-enum hw90_block {
- HW90_BLOCK_MAC = 0,
- HW90_BLOCK_PHY0 = 1,
- HW90_BLOCK_PHY1 = 2,
- HW90_BLOCK_RF = 3,
- HW90_BLOCK_MAXIMUM = 4, /* Never use this */
-};
-
enum rf_radio_path {
RF_PATH_A = 0, /* Radio Path A */
RF_PATH_B = 1, /* Radio Path B */
--
2.34.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 09/11] staging: r8188eu: remove unneeded comments from Hal8188EPhyCfg.h
2022-01-02 13:11 [PATCH 00/11] staging: r8188eu: the next set of cleanups Michael Straube
` (7 preceding siblings ...)
2022-01-02 13:11 ` [PATCH 08/11] staging: r8188eu: enum hw90_block " Michael Straube
@ 2022-01-02 13:11 ` Michael Straube
2022-01-02 13:11 ` [PATCH 10/11] staging: r8188eu: remove unused defines " Michael Straube
` (2 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Michael Straube @ 2022-01-02 13:11 UTC (permalink / raw)
To: gregkh; +Cc: Larry.Finger, phil, linux-staging, linux-kernel, Michael Straube
Remove unneeded comments from Hal8188EPhyCfg.h.
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
.../staging/r8188eu/include/Hal8188EPhyCfg.h | 19 +------------------
1 file changed, 1 insertion(+), 18 deletions(-)
diff --git a/drivers/staging/r8188eu/include/Hal8188EPhyCfg.h b/drivers/staging/r8188eu/include/Hal8188EPhyCfg.h
index fe6111fe278e..e01de2ebb75f 100644
--- a/drivers/staging/r8188eu/include/Hal8188EPhyCfg.h
+++ b/drivers/staging/r8188eu/include/Hal8188EPhyCfg.h
@@ -4,7 +4,6 @@
#ifndef __INC_HAL8188EPHYCFG_H__
#define __INC_HAL8188EPHYCFG_H__
-/*--------------------------Define Parameters-------------------------------*/
#define LOOP_LIMIT 5
#define MAX_STALL_TIME 50 /* us */
#define AntennaDiversityValue 0x80
@@ -13,10 +12,6 @@
#define MAX_AGGR_NUM 0x07
-/*--------------------------Define Parameters-------------------------------*/
-
-/*------------------------------Define structure----------------------------*/
-
enum rf_radio_path {
RF_PATH_A = 0, /* Radio Path A */
RF_PATH_B = 1, /* Radio Path B */
@@ -81,18 +76,7 @@ struct bb_reg_def {
* Path A and B */
};
-/*------------------------------Define structure----------------------------*/
-
-/*------------------------Export global variable----------------------------*/
-/*------------------------Export global variable----------------------------*/
-
-/*------------------------Export Marco Definition---------------------------*/
-/*------------------------Export Marco Definition---------------------------*/
-
-/*--------------------------Exported Function prototype---------------------*/
-/* */
/* BB and RF register read/write */
-/* */
u32 rtl8188e_PHY_QueryBBReg(struct adapter *adapter, u32 regaddr, u32 mask);
void rtl8188e_PHY_SetBBReg(struct adapter *Adapter, u32 RegAddr,
u32 mask, u32 data);
@@ -119,6 +103,5 @@ void PHY_SwChnl8188E(struct adapter *adapter, u8 channel);
void storePwrIndexDiffRateOffset(struct adapter *adapter, u32 regaddr,
u32 mask, u32 data);
-/*--------------------------Exported Function prototype---------------------*/
-#endif /* __INC_HAL8192CPHYCFG_H */
+#endif
--
2.34.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 10/11] staging: r8188eu: remove unused defines from Hal8188EPhyCfg.h
2022-01-02 13:11 [PATCH 00/11] staging: r8188eu: the next set of cleanups Michael Straube
` (8 preceding siblings ...)
2022-01-02 13:11 ` [PATCH 09/11] staging: r8188eu: remove unneeded comments from Hal8188EPhyCfg.h Michael Straube
@ 2022-01-02 13:11 ` Michael Straube
2022-01-02 13:11 ` [PATCH 11/11] staging: r8188eu: remove unused defines from rtw_eeprom.h Michael Straube
2022-01-02 18:06 ` [PATCH 00/11] staging: r8188eu: the next set of cleanups Martin Kaiser
11 siblings, 0 replies; 13+ messages in thread
From: Michael Straube @ 2022-01-02 13:11 UTC (permalink / raw)
To: gregkh; +Cc: Larry.Finger, phil, linux-staging, linux-kernel, Michael Straube
Remove unused defines from Hal8188EPhyCfg.h.
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
drivers/staging/r8188eu/include/Hal8188EPhyCfg.h | 7 -------
1 file changed, 7 deletions(-)
diff --git a/drivers/staging/r8188eu/include/Hal8188EPhyCfg.h b/drivers/staging/r8188eu/include/Hal8188EPhyCfg.h
index e01de2ebb75f..2517a08bc95a 100644
--- a/drivers/staging/r8188eu/include/Hal8188EPhyCfg.h
+++ b/drivers/staging/r8188eu/include/Hal8188EPhyCfg.h
@@ -4,12 +4,6 @@
#ifndef __INC_HAL8188EPHYCFG_H__
#define __INC_HAL8188EPHYCFG_H__
-#define LOOP_LIMIT 5
-#define MAX_STALL_TIME 50 /* us */
-#define AntennaDiversityValue 0x80
-#define MAX_TXPWR_IDX_NMODE_92S 63
-#define Reset_Cnt_Limit 3
-
#define MAX_AGGR_NUM 0x07
enum rf_radio_path {
@@ -26,7 +20,6 @@ enum rf_radio_path {
#define MAX_CHNL_GROUP_24G 6 /* ch1~2, ch3~5, ch6~8,
*ch9~11, ch12~13, CH 14
* total three groups */
-#define CHANNEL_GROUP_MAX_88E 6
struct bb_reg_def {
u32 rfintfs; /* set software control: */
--
2.34.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 11/11] staging: r8188eu: remove unused defines from rtw_eeprom.h
2022-01-02 13:11 [PATCH 00/11] staging: r8188eu: the next set of cleanups Michael Straube
` (9 preceding siblings ...)
2022-01-02 13:11 ` [PATCH 10/11] staging: r8188eu: remove unused defines " Michael Straube
@ 2022-01-02 13:11 ` Michael Straube
2022-01-02 18:06 ` [PATCH 00/11] staging: r8188eu: the next set of cleanups Martin Kaiser
11 siblings, 0 replies; 13+ messages in thread
From: Michael Straube @ 2022-01-02 13:11 UTC (permalink / raw)
To: gregkh; +Cc: Larry.Finger, phil, linux-staging, linux-kernel, Michael Straube
Remove unused defines from rtw_eeprom.h.
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
drivers/staging/r8188eu/include/rtw_eeprom.h | 26 --------------------
1 file changed, 26 deletions(-)
diff --git a/drivers/staging/r8188eu/include/rtw_eeprom.h b/drivers/staging/r8188eu/include/rtw_eeprom.h
index 22c2eddd5e75..3e8d3bb48903 100644
--- a/drivers/staging/r8188eu/include/rtw_eeprom.h
+++ b/drivers/staging/r8188eu/include/rtw_eeprom.h
@@ -7,33 +7,7 @@
#include "osdep_service.h"
#include "drv_types.h"
-#define RTL8712_EEPROM_ID 0x8712
-
#define HWSET_MAX_SIZE_512 512
-#define EEPROM_MAX_SIZE HWSET_MAX_SIZE_512
-
-#define CLOCK_RATE 50 /* 100us */
-
-/* EEPROM opcodes */
-#define EEPROM_READ_OPCODE 06
-#define EEPROM_WRITE_OPCODE 05
-#define EEPROM_ERASE_OPCODE 07
-#define EEPROM_EWEN_OPCODE 19 /* Erase/write enable */
-#define EEPROM_EWDS_OPCODE 16 /* Erase/write disable */
-
-#define EEPROM_CID_DEFAULT 0x0
-#define EEPROM_CID_ALPHA 0x1
-#define EEPROM_CID_Senao 0x3
-#define EEPROM_CID_NetCore 0x5
-#define EEPROM_CID_CAMEO 0X8
-#define EEPROM_CID_SITECOM 0x9
-#define EEPROM_CID_COREGA 0xB
-#define EEPROM_CID_EDIMAX_BELK 0xC
-#define EEPROM_CID_SERCOMM_BELK 0xE
-#define EEPROM_CID_CAMEO1 0xF
-#define EEPROM_CID_WNC_COREGA 0x12
-#define EEPROM_CID_CLEVO 0x13
-#define EEPROM_CID_WHQL 0xFE
struct eeprom_priv {
u8 bautoload_fail_flag;
--
2.34.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH 00/11] staging: r8188eu: the next set of cleanups
2022-01-02 13:11 [PATCH 00/11] staging: r8188eu: the next set of cleanups Michael Straube
` (10 preceding siblings ...)
2022-01-02 13:11 ` [PATCH 11/11] staging: r8188eu: remove unused defines from rtw_eeprom.h Michael Straube
@ 2022-01-02 18:06 ` Martin Kaiser
11 siblings, 0 replies; 13+ messages in thread
From: Martin Kaiser @ 2022-01-02 18:06 UTC (permalink / raw)
To: Michael Straube; +Cc: gregkh, Larry.Finger, phil, linux-staging, linux-kernel
Thus wrote Michael Straube (straube.linux@gmail.com):
> This set
> - removes some unused structs, enums and defines
> - removes set but not used fields from some structures
> Tested on x86_64 with Inter-Tech DMG-02.
> Michael Straube (11):
> staging: r8188eu: remove MAX_CHANNEL_NUM_2G
> staging: r8188eu: remove struct rt_channel_plan_2g
> staging: r8188eu: remove unused enum and defines
> staging: r8188eu: struct rx_hpc is not used
> staging: r8188eu: clean up struct rtw_dig
> staging: r8188eu: clean up struct sw_ant_switch
> staging: r8188eu: struct odm_sta_info is not used
> staging: r8188eu: enum hw90_block is not used
> staging: r8188eu: remove unneeded comments from Hal8188EPhyCfg.h
> staging: r8188eu: remove unused defines from Hal8188EPhyCfg.h
> staging: r8188eu: remove unused defines from rtw_eeprom.h
> drivers/staging/r8188eu/core/rtw_mlme_ext.c | 2 +-
> drivers/staging/r8188eu/hal/odm.c | 11 ---
> .../staging/r8188eu/include/Hal8188EPhyCfg.h | 34 +------
> drivers/staging/r8188eu/include/odm.h | 90 +------------------
> drivers/staging/r8188eu/include/rtw_eeprom.h | 31 -------
> .../staging/r8188eu/include/rtw_mlme_ext.h | 5 --
> drivers/staging/r8188eu/include/rtw_rf.h | 24 -----
> 7 files changed, 3 insertions(+), 194 deletions(-)
> --
> 2.34.1
for all patches
Acked-by: Martin Kaiser <martin@kaiser.cx>
^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2022-01-02 18:06 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-02 13:11 [PATCH 00/11] staging: r8188eu: the next set of cleanups Michael Straube
2022-01-02 13:11 ` [PATCH 01/11] staging: r8188eu: remove MAX_CHANNEL_NUM_2G Michael Straube
2022-01-02 13:11 ` [PATCH 02/11] staging: r8188eu: remove struct rt_channel_plan_2g Michael Straube
2022-01-02 13:11 ` [PATCH 03/11] staging: r8188eu: remove unused enum and defines Michael Straube
2022-01-02 13:11 ` [PATCH 04/11] staging: r8188eu: struct rx_hpc is not used Michael Straube
2022-01-02 13:11 ` [PATCH 05/11] staging: r8188eu: clean up struct rtw_dig Michael Straube
2022-01-02 13:11 ` [PATCH 06/11] staging: r8188eu: clean up struct sw_ant_switch Michael Straube
2022-01-02 13:11 ` [PATCH 07/11] staging: r8188eu: struct odm_sta_info is not used Michael Straube
2022-01-02 13:11 ` [PATCH 08/11] staging: r8188eu: enum hw90_block " Michael Straube
2022-01-02 13:11 ` [PATCH 09/11] staging: r8188eu: remove unneeded comments from Hal8188EPhyCfg.h Michael Straube
2022-01-02 13:11 ` [PATCH 10/11] staging: r8188eu: remove unused defines " Michael Straube
2022-01-02 13:11 ` [PATCH 11/11] staging: r8188eu: remove unused defines from rtw_eeprom.h Michael Straube
2022-01-02 18:06 ` [PATCH 00/11] staging: r8188eu: the next set of cleanups Martin Kaiser
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).