* [PATCH 00/10] staging: r8188eu: another set of cleanups
@ 2021-12-28 10:11 Michael Straube
2021-12-28 10:11 ` [PATCH 01/10] staging: r8188eu: DM_PriCCA is set but never used Michael Straube
` (9 more replies)
0 siblings, 10 replies; 11+ messages in thread
From: Michael Straube @ 2021-12-28 10:11 UTC (permalink / raw)
To: gregkh; +Cc: Larry.Finger, phil, linux-staging, linux-kernel, Michael Straube
This set contains some cleanups in different areas of the driver.
Tested on x86_64 with Inter-Tech DMG-02.
Michael Straube (10):
staging: r8188eu: DM_PriCCA is set but never used
staging: r8188eu: remove GET_CVID_ROM_VERSION
staging: r8188eu: remove unused enum odm_h2c_cmd
staging: r8188eu: remove ODM_CMNINFO_ABILITY from ODM_CmnInfoInit()
staging: r8188eu: remove write-only fields from struct rtl_ps
staging: r8188eu: FAT_State is always FAT_NORMAL_STATE
staging: r8188eu: FAT_State is set but never used
staging: r8188eu: TrainIdx is set but never used
staging: r8188eu: RSSI_test is always false
staging: r8188eu: merge _ReadLEDSetting() into ReadAdapterInfo8188EU()
drivers/staging/r8188eu/hal/odm.c | 7 -----
drivers/staging/r8188eu/hal/odm_HWConfig.c | 16 ++--------
drivers/staging/r8188eu/hal/odm_RTL8188E.c | 19 ------------
drivers/staging/r8188eu/hal/usb_halinit.c | 9 ++----
drivers/staging/r8188eu/include/HalVerDef.h | 1 -
drivers/staging/r8188eu/include/odm.h | 29 -------------------
.../staging/r8188eu/include/odm_RTL8188E.h | 2 --
.../staging/r8188eu/include/odm_interface.h | 7 -----
8 files changed, 5 insertions(+), 85 deletions(-)
--
2.34.1
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 01/10] staging: r8188eu: DM_PriCCA is set but never used
2021-12-28 10:11 [PATCH 00/10] staging: r8188eu: another set of cleanups Michael Straube
@ 2021-12-28 10:11 ` Michael Straube
2021-12-28 10:11 ` [PATCH 02/10] staging: r8188eu: remove GET_CVID_ROM_VERSION Michael Straube
` (8 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Michael Straube @ 2021-12-28 10:11 UTC (permalink / raw)
To: gregkh
Cc: Larry.Finger, phil, linux-staging, linux-kernel, Michael Straube,
Martin Kaiser
The field DM_PriCCA of struct odm_dm_struct is set but never used.
Remove it and remove related dead code.
Acked-by: Martin Kaiser <martin@kaiser.cx>
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
drivers/staging/r8188eu/hal/odm.c | 1 -
drivers/staging/r8188eu/hal/odm_RTL8188E.c | 15 ---------------
drivers/staging/r8188eu/include/odm.h | 9 ---------
drivers/staging/r8188eu/include/odm_RTL8188E.h | 2 --
4 files changed, 27 deletions(-)
diff --git a/drivers/staging/r8188eu/hal/odm.c b/drivers/staging/r8188eu/hal/odm.c
index 7a42687b3128..a820bdc26fbc 100644
--- a/drivers/staging/r8188eu/hal/odm.c
+++ b/drivers/staging/r8188eu/hal/odm.c
@@ -152,7 +152,6 @@ void ODM_DMInit(struct odm_dm_struct *pDM_Odm)
odm_DIGInit(pDM_Odm);
odm_RateAdaptiveMaskInit(pDM_Odm);
- odm_PrimaryCCA_Init(pDM_Odm); /* Gary */
odm_DynamicBBPowerSavingInit(pDM_Odm);
odm_TXPowerTrackingInit(pDM_Odm);
ODM_EdcaTurboInit(pDM_Odm);
diff --git a/drivers/staging/r8188eu/hal/odm_RTL8188E.c b/drivers/staging/r8188eu/hal/odm_RTL8188E.c
index 8af45c7535ea..34530fcd00d8 100644
--- a/drivers/staging/r8188eu/hal/odm_RTL8188E.c
+++ b/drivers/staging/r8188eu/hal/odm_RTL8188E.c
@@ -260,18 +260,3 @@ void ODM_AntennaDiversity_88E(struct odm_dm_struct *dm_odm)
if ((dm_odm->AntDivType == CG_TRX_HW_ANTDIV) || (dm_odm->AntDivType == CGCS_RX_HW_ANTDIV))
odm_HWAntDiv(dm_odm);
}
-
-/* 3============================================================ */
-/* 3 Dynamic Primary CCA */
-/* 3============================================================ */
-
-void odm_PrimaryCCA_Init(struct odm_dm_struct *dm_odm)
-{
- struct dyn_primary_cca *PrimaryCCA = &dm_odm->DM_PriCCA;
-
- PrimaryCCA->dup_rts_flag = 0;
- PrimaryCCA->intf_flag = 0;
- PrimaryCCA->intf_type = 0;
- PrimaryCCA->monitor_flag = 0;
- PrimaryCCA->pri_cca_flag = 0;
-}
diff --git a/drivers/staging/r8188eu/include/odm.h b/drivers/staging/r8188eu/include/odm.h
index 19e859b989ad..306640e92e6f 100644
--- a/drivers/staging/r8188eu/include/odm.h
+++ b/drivers/staging/r8188eu/include/odm.h
@@ -81,14 +81,6 @@ struct false_alarm_stats {
u32 Cnt_BW_LSC; /* Gary */
};
-struct dyn_primary_cca {
- u8 pri_cca_flag;
- u8 intf_flag;
- u8 intf_type;
- u8 dup_rts_flag;
- u8 monitor_flag;
-};
-
struct rx_hpc {
u8 RXHP_flag;
u8 PSD_func_trigger;
@@ -487,7 +479,6 @@ struct odm_dm_struct {
struct fast_ant_train DM_FatTable;
struct rtw_dig DM_DigTable;
struct rtl_ps DM_PSTable;
- struct dyn_primary_cca DM_PriCCA;
struct false_alarm_stats FalseAlmCnt;
struct sw_ant_switch DM_SWAT_Table;
bool RSSI_test;
diff --git a/drivers/staging/r8188eu/include/odm_RTL8188E.h b/drivers/staging/r8188eu/include/odm_RTL8188E.h
index 96e50c9224aa..85a0d7ec7378 100644
--- a/drivers/staging/r8188eu/include/odm_RTL8188E.h
+++ b/drivers/staging/r8188eu/include/odm_RTL8188E.h
@@ -29,6 +29,4 @@ void odm_FastAntTrainingCallback(struct odm_dm_struct *pDM_Odm);
void odm_FastAntTrainingWorkItemCallback(struct odm_dm_struct *pDM_Odm);
-void odm_PrimaryCCA_Init(struct odm_dm_struct *pDM_Odm);
-
#endif
--
2.34.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 02/10] staging: r8188eu: remove GET_CVID_ROM_VERSION
2021-12-28 10:11 [PATCH 00/10] staging: r8188eu: another set of cleanups Michael Straube
2021-12-28 10:11 ` [PATCH 01/10] staging: r8188eu: DM_PriCCA is set but never used Michael Straube
@ 2021-12-28 10:11 ` Michael Straube
2021-12-28 10:11 ` [PATCH 03/10] staging: r8188eu: remove unused enum odm_h2c_cmd Michael Straube
` (7 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Michael Straube @ 2021-12-28 10:11 UTC (permalink / raw)
To: gregkh; +Cc: Larry.Finger, phil, linux-staging, linux-kernel, Michael Straube
The macro GET_CVID_ROM_VERSION is not used. Remove it.
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
drivers/staging/r8188eu/include/HalVerDef.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/staging/r8188eu/include/HalVerDef.h b/drivers/staging/r8188eu/include/HalVerDef.h
index 1d96657e6a98..62b94c993f0d 100644
--- a/drivers/staging/r8188eu/include/HalVerDef.h
+++ b/drivers/staging/r8188eu/include/HalVerDef.h
@@ -35,7 +35,6 @@ struct HAL_VERSION {
#define GET_CVID_CHIP_TYPE(version) (((version).ChipType))
#define GET_CVID_MANUFACTUER(version) (((version).VendorType))
#define GET_CVID_CUT_VERSION(version) (((version).CUTVersion))
-#define GET_CVID_ROM_VERSION(version) (((version).ROMVer) & ROM_VERSION_MASK)
/* Common Macro. -- */
/* HAL_VERSION VersionID */
--
2.34.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 03/10] staging: r8188eu: remove unused enum odm_h2c_cmd
2021-12-28 10:11 [PATCH 00/10] staging: r8188eu: another set of cleanups Michael Straube
2021-12-28 10:11 ` [PATCH 01/10] staging: r8188eu: DM_PriCCA is set but never used Michael Straube
2021-12-28 10:11 ` [PATCH 02/10] staging: r8188eu: remove GET_CVID_ROM_VERSION Michael Straube
@ 2021-12-28 10:11 ` Michael Straube
2021-12-28 10:11 ` [PATCH 04/10] staging: r8188eu: remove ODM_CMNINFO_ABILITY from ODM_CmnInfoInit() Michael Straube
` (6 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Michael Straube @ 2021-12-28 10:11 UTC (permalink / raw)
To: gregkh; +Cc: Larry.Finger, phil, linux-staging, linux-kernel, Michael Straube
The enum odm_h2c_cmd is not used in this driver. Remove it.
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
drivers/staging/r8188eu/include/odm_interface.h | 7 -------
1 file changed, 7 deletions(-)
diff --git a/drivers/staging/r8188eu/include/odm_interface.h b/drivers/staging/r8188eu/include/odm_interface.h
index 64c29c1da19d..e27ba77577a7 100644
--- a/drivers/staging/r8188eu/include/odm_interface.h
+++ b/drivers/staging/r8188eu/include/odm_interface.h
@@ -4,13 +4,6 @@
#ifndef __ODM_INTERFACE_H__
#define __ODM_INTERFACE_H__
-enum odm_h2c_cmd {
- ODM_H2C_RSSI_REPORT = 0,
- ODM_H2C_PSD_RESULT= 1,
- ODM_H2C_PathDiv = 2,
- ODM_MAX_H2CCMD
-};
-
/* 2012/02/17 MH For non-MP compile pass only. Linux does not support workitem. */
/* Suggest HW team to use thread instead of workitem. Windows also support the feature. */
typedef void (*RT_WORKITEM_CALL_BACK)(void *pContext);
--
2.34.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 04/10] staging: r8188eu: remove ODM_CMNINFO_ABILITY from ODM_CmnInfoInit()
2021-12-28 10:11 [PATCH 00/10] staging: r8188eu: another set of cleanups Michael Straube
` (2 preceding siblings ...)
2021-12-28 10:11 ` [PATCH 03/10] staging: r8188eu: remove unused enum odm_h2c_cmd Michael Straube
@ 2021-12-28 10:11 ` Michael Straube
2021-12-28 10:11 ` [PATCH 05/10] staging: r8188eu: remove write-only fields from struct rtl_ps Michael Straube
` (5 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Michael Straube @ 2021-12-28 10:11 UTC (permalink / raw)
To: gregkh; +Cc: Larry.Finger, phil, linux-staging, linux-kernel, Michael Straube
ODM_CmnInfoInit() is never called with ODM_CMNINFO_ABILITY.
Remove that unused case from ODM_CmnInfoInit().
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
drivers/staging/r8188eu/hal/odm.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/drivers/staging/r8188eu/hal/odm.c b/drivers/staging/r8188eu/hal/odm.c
index a820bdc26fbc..afd208c3ba05 100644
--- a/drivers/staging/r8188eu/hal/odm.c
+++ b/drivers/staging/r8188eu/hal/odm.c
@@ -195,9 +195,6 @@ void ODM_CmnInfoInit(struct odm_dm_struct *pDM_Odm, enum odm_common_info_def Cmn
/* This section is used for init value */
switch (CmnInfo) {
/* Fixed ODM value. */
- case ODM_CMNINFO_ABILITY:
- pDM_Odm->SupportAbility = (u32)Value;
- break;
case ODM_CMNINFO_MP_TEST_CHIP:
pDM_Odm->bIsMPChip = (u8)Value;
break;
--
2.34.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 05/10] staging: r8188eu: remove write-only fields from struct rtl_ps
2021-12-28 10:11 [PATCH 00/10] staging: r8188eu: another set of cleanups Michael Straube
` (3 preceding siblings ...)
2021-12-28 10:11 ` [PATCH 04/10] staging: r8188eu: remove ODM_CMNINFO_ABILITY from ODM_CmnInfoInit() Michael Straube
@ 2021-12-28 10:11 ` Michael Straube
2021-12-28 10:11 ` [PATCH 06/10] staging: r8188eu: FAT_State is always FAT_NORMAL_STATE Michael Straube
` (4 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Michael Straube @ 2021-12-28 10:11 UTC (permalink / raw)
To: gregkh; +Cc: Larry.Finger, phil, linux-staging, linux-kernel, Michael Straube
The fields pre_cca_state, cur_cca_state and rssi_val_min of struct
rtl_ps are set but never used. Remove them.
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
drivers/staging/r8188eu/hal/odm.c | 3 ---
drivers/staging/r8188eu/include/odm.h | 12 ------------
2 files changed, 15 deletions(-)
diff --git a/drivers/staging/r8188eu/hal/odm.c b/drivers/staging/r8188eu/hal/odm.c
index afd208c3ba05..b1bb81c97c5c 100644
--- a/drivers/staging/r8188eu/hal/odm.c
+++ b/drivers/staging/r8188eu/hal/odm.c
@@ -574,11 +574,8 @@ void odm_DynamicBBPowerSavingInit(struct odm_dm_struct *pDM_Odm)
{
struct rtl_ps *pDM_PSTable = &pDM_Odm->DM_PSTable;
- pDM_PSTable->pre_cca_state = CCA_MAX;
- pDM_PSTable->cur_cca_state = CCA_MAX;
pDM_PSTable->pre_rf_state = RF_MAX;
pDM_PSTable->cur_rf_state = RF_MAX;
- pDM_PSTable->rssi_val_min = 0;
pDM_PSTable->initialize = 0;
}
diff --git a/drivers/staging/r8188eu/include/odm.h b/drivers/staging/r8188eu/include/odm.h
index 306640e92e6f..66dc93518628 100644
--- a/drivers/staging/r8188eu/include/odm.h
+++ b/drivers/staging/r8188eu/include/odm.h
@@ -48,14 +48,8 @@ struct rtw_dig {
};
struct rtl_ps {
- u8 pre_cca_state;
- u8 cur_cca_state;
-
u8 pre_rf_state;
u8 cur_rf_state;
-
- int rssi_val_min;
-
u8 initialize;
u32 reg_874;
u32 reg_c70;
@@ -543,12 +537,6 @@ enum odm_bb_config_type {
/* 3 BB Power Save */
/* 3=========================================================== */
-enum dm_1r_cca {
- CCA_1R = 0,
- CCA_2R = 1,
- CCA_MAX = 2,
-};
-
enum dm_rf {
RF_Save = 0,
RF_Normal = 1,
--
2.34.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 06/10] staging: r8188eu: FAT_State is always FAT_NORMAL_STATE
2021-12-28 10:11 [PATCH 00/10] staging: r8188eu: another set of cleanups Michael Straube
` (4 preceding siblings ...)
2021-12-28 10:11 ` [PATCH 05/10] staging: r8188eu: remove write-only fields from struct rtl_ps Michael Straube
@ 2021-12-28 10:11 ` Michael Straube
2021-12-28 10:11 ` [PATCH 07/10] staging: r8188eu: FAT_State is set but never used Michael Straube
` (3 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Michael Straube @ 2021-12-28 10:11 UTC (permalink / raw)
To: gregkh; +Cc: Larry.Finger, phil, linux-staging, linux-kernel, Michael Straube
In this driver pDM_FatTable->FAT_State is always FAT_NORMAL_STATE.
So the check 'if (pDM_FatTable->FAT_State == FAT_TRAINING_STATE)'
is always false. Remove dead code that is executed only if that
check is true.
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
drivers/staging/r8188eu/hal/odm_HWConfig.c | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/drivers/staging/r8188eu/hal/odm_HWConfig.c b/drivers/staging/r8188eu/hal/odm_HWConfig.c
index 1fb2d9a16fea..9de16383cb2d 100644
--- a/drivers/staging/r8188eu/hal/odm_HWConfig.c
+++ b/drivers/staging/r8188eu/hal/odm_HWConfig.c
@@ -251,15 +251,7 @@ static void odm_Process_RSSIForDM(struct odm_dm_struct *dm_odm,
isCCKrate = ((pPktinfo->Rate >= DESC92C_RATE1M) && (pPktinfo->Rate <= DESC92C_RATE11M)) ? true : false;
/* Smart Antenna Debug Message------------------ */
- if (dm_odm->AntDivType == CG_TRX_SMART_ANTDIV) {
- if (pDM_FatTable->FAT_State == FAT_TRAINING_STATE) {
- if (pPktinfo->bPacketToSelf) {
- antsel_tr_mux = (pDM_FatTable->antsel_rx_keep_2 << 2) |
- (pDM_FatTable->antsel_rx_keep_1 << 1) |
- pDM_FatTable->antsel_rx_keep_0;
- }
- }
- } else if ((dm_odm->AntDivType == CG_TRX_HW_ANTDIV) || (dm_odm->AntDivType == CGCS_RX_HW_ANTDIV)) {
+ if ((dm_odm->AntDivType == CG_TRX_HW_ANTDIV) || (dm_odm->AntDivType == CGCS_RX_HW_ANTDIV)) {
if (pPktinfo->bPacketToSelf || pPktinfo->bPacketBeacon) {
antsel_tr_mux = (pDM_FatTable->antsel_rx_keep_2 << 2) |
(pDM_FatTable->antsel_rx_keep_1 << 1) | pDM_FatTable->antsel_rx_keep_0;
--
2.34.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 07/10] staging: r8188eu: FAT_State is set but never used
2021-12-28 10:11 [PATCH 00/10] staging: r8188eu: another set of cleanups Michael Straube
` (5 preceding siblings ...)
2021-12-28 10:11 ` [PATCH 06/10] staging: r8188eu: FAT_State is always FAT_NORMAL_STATE Michael Straube
@ 2021-12-28 10:11 ` Michael Straube
2021-12-28 10:11 ` [PATCH 08/10] staging: r8188eu: TrainIdx " Michael Straube
` (2 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Michael Straube @ 2021-12-28 10:11 UTC (permalink / raw)
To: gregkh; +Cc: Larry.Finger, phil, linux-staging, linux-kernel, Michael Straube
The field FAT_State of struct fast_ant_train is set but never used.
Remove it.
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
drivers/staging/r8188eu/hal/odm_RTL8188E.c | 1 -
drivers/staging/r8188eu/include/odm.h | 6 ------
2 files changed, 7 deletions(-)
diff --git a/drivers/staging/r8188eu/hal/odm_RTL8188E.c b/drivers/staging/r8188eu/hal/odm_RTL8188E.c
index 34530fcd00d8..1dcdf6a131fc 100644
--- a/drivers/staging/r8188eu/hal/odm_RTL8188E.c
+++ b/drivers/staging/r8188eu/hal/odm_RTL8188E.c
@@ -60,7 +60,6 @@ static void odm_FastAntTrainingInit(struct odm_dm_struct *dm_odm)
struct fast_ant_train *dm_fat_tbl = &dm_odm->DM_FatTable;
dm_fat_tbl->TrainIdx = 0;
- dm_fat_tbl->FAT_State = FAT_NORMAL_STATE;
/* MAC Setting */
value32 = ODM_GetMACReg(dm_odm, 0x4c, bMaskDWord);
diff --git a/drivers/staging/r8188eu/include/odm.h b/drivers/staging/r8188eu/include/odm.h
index 66dc93518628..db72eea83382 100644
--- a/drivers/staging/r8188eu/include/odm.h
+++ b/drivers/staging/r8188eu/include/odm.h
@@ -387,7 +387,6 @@ struct fast_ant_train {
u8 antsel_rx_keep_0;
u8 antsel_rx_keep_1;
u8 antsel_rx_keep_2;
- u8 FAT_State;
u32 TrainIdx;
u8 antsel_a[ODM_ASSOCIATE_ENTRY_NUM];
u8 antsel_b[ODM_ASSOCIATE_ENTRY_NUM];
@@ -400,11 +399,6 @@ struct fast_ant_train {
bool bBecomeLinked;
};
-enum fat_state {
- FAT_NORMAL_STATE = 0,
- FAT_TRAINING_STATE = 1,
-};
-
enum ant_div_type {
NO_ANTDIV = 0xFF,
CG_TRX_HW_ANTDIV = 0x01,
--
2.34.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 08/10] staging: r8188eu: TrainIdx is set but never used
2021-12-28 10:11 [PATCH 00/10] staging: r8188eu: another set of cleanups Michael Straube
` (6 preceding siblings ...)
2021-12-28 10:11 ` [PATCH 07/10] staging: r8188eu: FAT_State is set but never used Michael Straube
@ 2021-12-28 10:11 ` Michael Straube
2021-12-28 10:11 ` [PATCH 09/10] staging: r8188eu: RSSI_test is always false Michael Straube
2021-12-28 10:11 ` [PATCH 10/10] staging: r8188eu: merge _ReadLEDSetting() into ReadAdapterInfo8188EU() Michael Straube
9 siblings, 0 replies; 11+ messages in thread
From: Michael Straube @ 2021-12-28 10:11 UTC (permalink / raw)
To: gregkh; +Cc: Larry.Finger, phil, linux-staging, linux-kernel, Michael Straube
The field TrainIdx of struct fast_ant_train is set but never used.
Remove it.
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
drivers/staging/r8188eu/hal/odm_RTL8188E.c | 3 ---
drivers/staging/r8188eu/include/odm.h | 1 -
2 files changed, 4 deletions(-)
diff --git a/drivers/staging/r8188eu/hal/odm_RTL8188E.c b/drivers/staging/r8188eu/hal/odm_RTL8188E.c
index 1dcdf6a131fc..eefa448d2002 100644
--- a/drivers/staging/r8188eu/hal/odm_RTL8188E.c
+++ b/drivers/staging/r8188eu/hal/odm_RTL8188E.c
@@ -57,9 +57,6 @@ static void odm_TRX_HWAntDivInit(struct odm_dm_struct *dm_odm)
static void odm_FastAntTrainingInit(struct odm_dm_struct *dm_odm)
{
u32 value32;
- struct fast_ant_train *dm_fat_tbl = &dm_odm->DM_FatTable;
-
- dm_fat_tbl->TrainIdx = 0;
/* MAC Setting */
value32 = ODM_GetMACReg(dm_odm, 0x4c, bMaskDWord);
diff --git a/drivers/staging/r8188eu/include/odm.h b/drivers/staging/r8188eu/include/odm.h
index db72eea83382..a037d7b863fb 100644
--- a/drivers/staging/r8188eu/include/odm.h
+++ b/drivers/staging/r8188eu/include/odm.h
@@ -387,7 +387,6 @@ struct fast_ant_train {
u8 antsel_rx_keep_0;
u8 antsel_rx_keep_1;
u8 antsel_rx_keep_2;
- u32 TrainIdx;
u8 antsel_a[ODM_ASSOCIATE_ENTRY_NUM];
u8 antsel_b[ODM_ASSOCIATE_ENTRY_NUM];
u8 antsel_c[ODM_ASSOCIATE_ENTRY_NUM];
--
2.34.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 09/10] staging: r8188eu: RSSI_test is always false
2021-12-28 10:11 [PATCH 00/10] staging: r8188eu: another set of cleanups Michael Straube
` (7 preceding siblings ...)
2021-12-28 10:11 ` [PATCH 08/10] staging: r8188eu: TrainIdx " Michael Straube
@ 2021-12-28 10:11 ` Michael Straube
2021-12-28 10:11 ` [PATCH 10/10] staging: r8188eu: merge _ReadLEDSetting() into ReadAdapterInfo8188EU() Michael Straube
9 siblings, 0 replies; 11+ messages in thread
From: Michael Straube @ 2021-12-28 10:11 UTC (permalink / raw)
To: gregkh; +Cc: Larry.Finger, phil, linux-staging, linux-kernel, Michael Straube
The field RSSI_test of struct odm_dm_struct is never set. It stays
at the default value 0. Remove it and remove a related if test that
is always true.
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
drivers/staging/r8188eu/hal/odm_HWConfig.c | 6 ++----
drivers/staging/r8188eu/include/odm.h | 1 -
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/r8188eu/hal/odm_HWConfig.c b/drivers/staging/r8188eu/hal/odm_HWConfig.c
index 9de16383cb2d..7509e3c3f418 100644
--- a/drivers/staging/r8188eu/hal/odm_HWConfig.c
+++ b/drivers/staging/r8188eu/hal/odm_HWConfig.c
@@ -358,10 +358,8 @@ void ODM_PhyStatusQuery(struct odm_dm_struct *dm_odm,
struct odm_per_pkt_info *pPktinfo,
struct adapter *adapt)
{
- odm_RxPhyStatus92CSeries_Parsing(dm_odm, pPhyInfo, pPhyStatus,
- pPktinfo, adapt);
- if (!dm_odm->RSSI_test)
- odm_Process_RSSIForDM(dm_odm, pPhyInfo, pPktinfo);
+ odm_RxPhyStatus92CSeries_Parsing(dm_odm, pPhyInfo, pPhyStatus, pPktinfo, adapt);
+ odm_Process_RSSIForDM(dm_odm, pPhyInfo, pPktinfo);
}
enum HAL_STATUS ODM_ConfigRFWithHeaderFile(struct odm_dm_struct *dm_odm,
diff --git a/drivers/staging/r8188eu/include/odm.h b/drivers/staging/r8188eu/include/odm.h
index a037d7b863fb..c07dbf763903 100644
--- a/drivers/staging/r8188eu/include/odm.h
+++ b/drivers/staging/r8188eu/include/odm.h
@@ -468,7 +468,6 @@ struct odm_dm_struct {
struct rtl_ps DM_PSTable;
struct false_alarm_stats FalseAlmCnt;
struct sw_ant_switch DM_SWAT_Table;
- bool RSSI_test;
struct edca_turbo DM_EDCA_Table;
--
2.34.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 10/10] staging: r8188eu: merge _ReadLEDSetting() into ReadAdapterInfo8188EU()
2021-12-28 10:11 [PATCH 00/10] staging: r8188eu: another set of cleanups Michael Straube
` (8 preceding siblings ...)
2021-12-28 10:11 ` [PATCH 09/10] staging: r8188eu: RSSI_test is always false Michael Straube
@ 2021-12-28 10:11 ` Michael Straube
9 siblings, 0 replies; 11+ messages in thread
From: Michael Straube @ 2021-12-28 10:11 UTC (permalink / raw)
To: gregkh; +Cc: Larry.Finger, phil, linux-staging, linux-kernel, Michael Straube
Function _ReadLEDSetting() sets only a single variable and the only
user is ReadAdapterInfo8188EU(). Remove _ReadLEDSetting() and set the
variable in ReadAdapterInfo8188EU() directly.
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
drivers/staging/r8188eu/hal/usb_halinit.c | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8188eu/hal/usb_halinit.c
index 9edde72aebb2..b362c622ea8a 100644
--- a/drivers/staging/r8188eu/hal/usb_halinit.c
+++ b/drivers/staging/r8188eu/hal/usb_halinit.c
@@ -914,12 +914,6 @@ unsigned int rtl8188eu_inirp_init(struct adapter *Adapter)
/* EEPROM/EFUSE Content Parsing */
/* */
/* */
-static void _ReadLEDSetting(struct adapter *Adapter, u8 *PROMContent, bool AutoloadFail)
-{
- struct led_priv *pledpriv = &Adapter->ledpriv;
-
- pledpriv->bRegUseLed = true;
-}
static void Hal_EfuseParseMACAddr_8188EU(struct adapter *adapt, u8 *hwinfo, bool AutoLoadFail)
{
@@ -939,6 +933,7 @@ static void Hal_EfuseParseMACAddr_8188EU(struct adapter *adapt, u8 *hwinfo, bool
void ReadAdapterInfo8188EU(struct adapter *Adapter)
{
struct eeprom_priv *eeprom = &Adapter->eeprompriv;
+ struct led_priv *ledpriv = &Adapter->ledpriv;
u8 eeValue;
/* Read EEPROM size before call any EEPROM function */
@@ -966,7 +961,7 @@ void ReadAdapterInfo8188EU(struct adapter *Adapter)
Hal_ReadAntennaDiversity88E(Adapter, eeprom->efuse_eeprom_data, eeprom->bautoload_fail_flag);
Hal_ReadThermalMeter_88E(Adapter, eeprom->efuse_eeprom_data, eeprom->bautoload_fail_flag);
- _ReadLEDSetting(Adapter, eeprom->efuse_eeprom_data, eeprom->bautoload_fail_flag);
+ ledpriv->bRegUseLed = true;
}
static void ResumeTxBeacon(struct adapter *adapt)
--
2.34.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
end of thread, other threads:[~2021-12-28 10:12 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-28 10:11 [PATCH 00/10] staging: r8188eu: another set of cleanups Michael Straube
2021-12-28 10:11 ` [PATCH 01/10] staging: r8188eu: DM_PriCCA is set but never used Michael Straube
2021-12-28 10:11 ` [PATCH 02/10] staging: r8188eu: remove GET_CVID_ROM_VERSION Michael Straube
2021-12-28 10:11 ` [PATCH 03/10] staging: r8188eu: remove unused enum odm_h2c_cmd Michael Straube
2021-12-28 10:11 ` [PATCH 04/10] staging: r8188eu: remove ODM_CMNINFO_ABILITY from ODM_CmnInfoInit() Michael Straube
2021-12-28 10:11 ` [PATCH 05/10] staging: r8188eu: remove write-only fields from struct rtl_ps Michael Straube
2021-12-28 10:11 ` [PATCH 06/10] staging: r8188eu: FAT_State is always FAT_NORMAL_STATE Michael Straube
2021-12-28 10:11 ` [PATCH 07/10] staging: r8188eu: FAT_State is set but never used Michael Straube
2021-12-28 10:11 ` [PATCH 08/10] staging: r8188eu: TrainIdx " Michael Straube
2021-12-28 10:11 ` [PATCH 09/10] staging: r8188eu: RSSI_test is always false Michael Straube
2021-12-28 10:11 ` [PATCH 10/10] staging: r8188eu: merge _ReadLEDSetting() into ReadAdapterInfo8188EU() Michael Straube
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).