Thus wrote Michael Straube (straube.linux@xxxxxxxxx):
> 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 <straube.linux@xxxxxxxxx>
> ---
> 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
looks good to me
Acked-by: Martin Kaiser <martin@xxxxxxxxx>
