staging: r8188eu: DM_PriCCA is set but never used
PATCH 1/1 staging: r8188eu: DM_PriCCA is set but never used
The field DM_PriCCA of struct odm_dm_struct is set but never used. Remove it and remove related dead code.
Signed-off-by Michael Straube <[email protected]>
--- 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(-)
drivers/staging/r8188eu/hal/odm.c +0 -1
@@ -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);
drivers/staging/r8188eu/hal/odm_RTL8188E.c +0 -15
@@ -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 ; -}
drivers/staging/r8188eu/include/odm.h +0 -9
@@ -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;
drivers/staging/r8188eu/include/odm_RTL8188E.h +0 -2
@@ -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
Signature · 1 line
2.34.1
Thus wrote Michael Straube ([email protected]):
Quoted 86 lines
The field
DM_PriCCAof structodm_dm_structis set but never used. Remove it and remove related dead code.Signed-off-by Michael Straube <[email protected]>--- 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(-)drivers/staging/r8188eu/hal/odm.c +0
-1@@ -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);drivers/staging/r8188eu/hal/odm_RTL8188E.c +0
-15@@ -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 ; -}drivers/staging/r8188eu/include/odm.h +0
-9@@ -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;drivers/staging/r8188eu/include/odm_RTL8188E.h +0
-2@@ -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 Signature · 1 line
2.34.1
looks good to me
Acked-by Martin Kaiser <[email protected]>
Quoted 11 lines · Michael Straube
The field
DM_PriCCAof structodm_dm_structis set but never used. Remove it and remove related dead code.Signed-off-by Michael Straube <[email protected]>--- 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(-)
This patch is outdated, please drop it.
I'll resend it as part of a series.
Thanks,
Michael