staging: rtl8723au: Kill off HW_VAR_CAM_EMPTY_ENTRY and some function layers wrapping it

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723au/core/rtw_wlan_util.c b/drivers/staging/rtl8723au/core/rtw_wlan_util.c
index d675891ad23eccf435f0ea75ebf31ee66eb1408e..1e538854dbb473c7b96b727f3bab7cac07610e7e 100644 (file)
--- a/drivers/staging/rtl8723au/core/rtw_wlan_util.c
+++ b/drivers/staging/rtl8723au/core/rtw_wlan_util.c
@@ -478,11 +478,6 @@ unsigned int decide_wait_for_beacon_timeout23a(unsigned int bcn_interval)
                return bcn_interval << 2;
 }
 
-void CAM_empty_entry23a(struct rtw_adapter *Adapter, u8 ucIndex)
-{
-       rtw_hal_set_hwreg23a(Adapter, HW_VAR_CAM_EMPTY_ENTRY, (u8 *)(&ucIndex));
-}
-
 void invalidate_cam_all23a(struct rtw_adapter *padapter)
 {
        rtl8723a_cam_invalid_all(padapter);

diff --git a/drivers/staging/rtl8723au/hal/hal_com.c b/drivers/staging/rtl8723au/hal/hal_com.c
index 29f42068d3b90681701a73ad3eeab0bd655611c2..06ea165ceddda8f1e8c92d606d458f7995aa3ae6 100644 (file)
--- a/drivers/staging/rtl8723au/hal/hal_com.c
+++ b/drivers/staging/rtl8723au/hal/hal_com.c
@@ -670,11 +670,13 @@ void rtl8723a_cam_empty_entry(struct rtw_adapter *padapter, u8 ucIndex)
                /* delay_ms(40); */
                rtw_write32(padapter, WCAMI, ulContent);
                /* RT_TRACE(COMP_SEC, DBG_LOUD,
-                  ("CAM_empty_entry23a(): WRITE A4: %lx \n", ulContent));*/
+                  ("rtl8723a_cam_empty_entry(): WRITE A4: %lx \n",
+                  ulContent));*/
                /* delay_ms(40); */
                rtw_write32(padapter, RWCAM, ulCommand);
                /* RT_TRACE(COMP_SEC, DBG_LOUD,
-                  ("CAM_empty_entry23a(): WRITE A0: %lx \n", ulCommand));*/
+                  ("rtl8723a_cam_empty_entry(): WRITE A0: %lx \n",
+                  ulCommand));*/
        }
 }
 

diff --git a/drivers/staging/rtl8723au/hal/rtl8723a_bt-coexist.c b/drivers/staging/rtl8723au/hal/rtl8723a_bt-coexist.c
index 5ff540e8241c56f38b13a466cb12175e50079c29..3de077b3ed5b5bf0377c8ad8d7893d64ed437011 100644 (file)
--- a/drivers/staging/rtl8723au/hal/rtl8723a_bt-coexist.c
+++ b/drivers/staging/rtl8723au/hal/rtl8723a_bt-coexist.c
@@ -11232,8 +11232,10 @@ void HALBT_RemoveKey(struct rtw_adapter *padapter, u8 EntryNum)
 
        if (pBTinfo->BtAsocEntry[EntryNum].HwCAMIndex != 0) {
                /*  ToDo : add New HALBT_RemoveKey function !! */
-               if (pBtAssocEntry->HwCAMIndex >= BT_HWCAM_STAR && pBtAssocEntry->HwCAMIndex < HALF_CAM_ENTRY)
-                       CAM_empty_entry23a(padapter, pBtAssocEntry->HwCAMIndex);
+               if (pBtAssocEntry->HwCAMIndex >= BT_HWCAM_STAR &&
+                   pBtAssocEntry->HwCAMIndex < HALF_CAM_ENTRY)
+                       rtl8723a_cam_empty_entry(padapter,
+                                                pBtAssocEntry->HwCAMIndex);
                pBTinfo->BtAsocEntry[EntryNum].HwCAMIndex = 0;
        }
 }

diff --git a/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c b/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
index 6d574cd961291b8f2cfbc53a2257d1a1149de1fa..cfc9eb1276eae5030c705adce0c18f0db6087ccc 100644 (file)
--- a/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
+++ b/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
@@ -3157,10 +3157,6 @@ void SetHwReg8723A(struct rtw_adapter *padapter, u8 variable, u8 *val)
                rtl8723a_odm_support_ability_clr(padapter, *val32);
                break;
 
-       case HW_VAR_CAM_EMPTY_ENTRY:
-               rtl8723a_cam_empty_entry(padapter, *val);
-               break;
-
        case HW_VAR_CAM_WRITE:
                rtl8723a_cam_write(padapter, val32[0], val32[1]);
                break;

diff --git a/drivers/staging/rtl8723au/include/hal_intf.h b/drivers/staging/rtl8723au/include/hal_intf.h
index 8e3dd1264380f029167d9edded8f3882abcbe86b..72da07444212bdea9d6023ecab84438360be0b07 100644 (file)
--- a/drivers/staging/rtl8723au/include/hal_intf.h
+++ b/drivers/staging/rtl8723au/include/hal_intf.h
@@ -44,7 +44,6 @@ enum HW_VARIABLES {
        HW_VAR_DM_FUNC_OP,
        HW_VAR_DM_FUNC_SET,
        HW_VAR_DM_FUNC_CLR,
-       HW_VAR_CAM_EMPTY_ENTRY,
        HW_VAR_CAM_WRITE,
        HW_VAR_CAM_READ,
        HW_VAR_AC_PARAM_VO,

diff --git a/drivers/staging/rtl8723au/include/rtw_mlme_ext.h b/drivers/staging/rtl8723au/include/rtw_mlme_ext.h
index 0aaf0d5d8aeaa654fce8c193401c729344977db4..060de9f3de836b051bd90b1d81dbe9f7ad66051c 100644 (file)
--- a/drivers/staging/rtl8723au/include/rtw_mlme_ext.h
+++ b/drivers/staging/rtl8723au/include/rtw_mlme_ext.h
@@ -500,7 +500,6 @@ void write_cam23a(struct rtw_adapter *padapter, u8 entry, u16 ctrl,
 void clear_cam_entry23a(struct rtw_adapter *padapter, u8 entry);
 
 void invalidate_cam_all23a(struct rtw_adapter *padapter);
-void CAM_empty_entry23a(struct rtw_adapter *Adapter, u8 ucIndex);
 
 int allocate_fw_sta_entry23a(struct rtw_adapter *padapter);
 void flush_all_cam_entry23a(struct rtw_adapter *padapter);