staging: rtl8188eu: odm.h: Remove unused struct dyn_primary_cca

struct odm_dm_struct has a member of struct dyn_primary_cca,
which is initialized once and then never used by driver, so
we can remove struct dyn_promary_cca and code which initialize
it.

Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8188eu/hal/odm.c b/drivers/staging/rtl8188eu/hal/odm.c
index 7da7fd7f4b974dc1dee89e0b46db8fcee303dbe5..e4df83710ca68fc1dd7efb028530b4527b2fa78c 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/odm.c
+++ b/drivers/staging/rtl8188eu/hal/odm.c
@@ -191,7 +191,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_DynamicTxPowerInit(pDM_Odm);
        odm_TXPowerTrackingInit(pDM_Odm);
        ODM_EdcaTurboInit(pDM_Odm);

diff --git a/drivers/staging/rtl8188eu/hal/odm_RTL8188E.c b/drivers/staging/rtl8188eu/hal/odm_RTL8188E.c
index 495d9eca07d46a3f9da7d5eee08c4617572548b2..5342af778eb0b27275049edb3d6abba9b6f9b75b 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/odm_RTL8188E.c
+++ b/drivers/staging/rtl8188eu/hal/odm_RTL8188E.c
@@ -370,18 +370,3 @@ void rtl88eu_dm_antenna_diversity(struct odm_dm_struct *dm_odm)
            (dm_odm->AntDivType == CGCS_RX_HW_ANTDIV))
                rtl88eu_dm_hw_ant_div(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->DupRTS_flag = 0;
-       PrimaryCCA->intf_flag = 0;
-       PrimaryCCA->intf_type = 0;
-       PrimaryCCA->Monitor_flag = 0;
-       PrimaryCCA->PriCCA_flag = 0;
-}

diff --git a/drivers/staging/rtl8188eu/include/odm.h b/drivers/staging/rtl8188eu/include/odm.h
index e83812f35ad68a88f4447ff2c9d60f961e8e0c84..525eb100cd1523a3b3337cfcc5fdd36fa888e821 100644 (file)
--- a/drivers/staging/rtl8188eu/include/odm.h
+++ b/drivers/staging/rtl8188eu/include/odm.h
@@ -164,14 +164,6 @@ struct false_alarm_stats {
        u32     Cnt_BW_LSC;     /* Gary */
 };
 
-struct dyn_primary_cca {
-       u8              PriCCA_flag;
-       u8              intf_flag;
-       u8              intf_type;
-       u8              DupRTS_flag;
-       u8              Monitor_flag;
-};
-
 struct rx_hpc {
        u8              RXHP_flag;
        u8              PSD_func_trigger;
@@ -867,7 +859,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 rx_hpc   DM_RXHP_Table;
        struct false_alarm_stats FalseAlmCnt;
        struct false_alarm_stats FlaseAlmCntBuddyAdapter;

diff --git a/drivers/staging/rtl8188eu/include/odm_RTL8188E.h b/drivers/staging/rtl8188eu/include/odm_RTL8188E.h
index eabef39a554cac6547245813c7d1efd169bd295a..14dce6c4b1bc7ca97938d514a277500e1de79358 100644 (file)
--- a/drivers/staging/rtl8188eu/include/odm_RTL8188E.h
+++ b/drivers/staging/rtl8188eu/include/odm_RTL8188E.h
@@ -47,8 +47,6 @@ 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);
-
 bool ODM_DynamicPrimaryCCA_DupRTS(struct odm_dm_struct *pDM_Odm);
 
 #endif