staging: r8188eu: remove SetHalODMVarHandler from hal_ops

Remove SetHalODMVarHandler from hal_ops and remove its wrapper
rtw_hal_set_odm_var(). Call rtl8188e_SetHalODMVar() directly instead.

Signed-off-by: Michael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20210906190223.11396-6-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/r8188eu/core/rtw_ap.c b/drivers/staging/r8188eu/core/rtw_ap.c
index 1c07ad2..da8b533 100644 (file)
--- a/drivers/staging/r8188eu/core/rtw_ap.c
+++ b/drivers/staging/r8188eu/core/rtw_ap.c
@@ -453,7 +453,7 @@ void update_bmc_sta(struct adapter *padapter)
                init_rate = get_highest_rate_idx(tx_ra_bitmap & 0x0fffffff) & 0x3f;
 
                /* ap mode */
-               rtw_hal_set_odm_var(padapter, HAL_ODM_STA_INFO, psta, true);
+               rtl8188e_SetHalODMVar(padapter, HAL_ODM_STA_INFO, psta, true);
 
                {
                        u8 arg = 0;
@@ -505,7 +505,7 @@ void update_sta_info_apmode(struct adapter *padapter, struct sta_info *psta)
        DBG_88E("%s\n", __func__);
 
        /* ap mode */
-       rtw_hal_set_odm_var(padapter, HAL_ODM_STA_INFO, psta, true);
+       rtl8188e_SetHalODMVar(padapter, HAL_ODM_STA_INFO, psta, true);
 
        if (psecuritypriv->dot11AuthAlgrthm == dot11AuthAlgrthm_8021X)
                psta->ieee8021x_blocked = true;

diff --git a/drivers/staging/r8188eu/core/rtw_mlme.c b/drivers/staging/r8188eu/core/rtw_mlme.c
index 3757863..d330f58 100644 (file)
--- a/drivers/staging/r8188eu/core/rtw_mlme.c
+++ b/drivers/staging/r8188eu/core/rtw_mlme.c
@@ -984,7 +984,7 @@ static struct sta_info *rtw_joinbss_update_stainfo(struct adapter *padapter, str
                psta->aid  = pnetwork->join_res;
                psta->mac_id = 0;
                /* sta mode */
-               rtw_hal_set_odm_var(padapter, HAL_ODM_STA_INFO, psta, true);
+               rtl8188e_SetHalODMVar(padapter, HAL_ODM_STA_INFO, psta, true);
                /* security related */
                if (padapter->securitypriv.dot11AuthAlgrthm == dot11AuthAlgrthm_8021X) {
                        padapter->securitypriv.binstallGrpkey = false;
@@ -1276,7 +1276,7 @@ void rtw_stassoc_event_callback(struct adapter *adapter, u8 *pbuf)
        psta->mac_id = (uint)pstassoc->cam_id;
        DBG_88E("%s\n", __func__);
        /* for ad-hoc mode */
-       rtw_hal_set_odm_var(adapter, HAL_ODM_STA_INFO, psta, true);
+       rtl8188e_SetHalODMVar(adapter, HAL_ODM_STA_INFO, psta, true);
        rtw_sta_media_status_rpt(adapter, psta, 1);
        if (adapter->securitypriv.dot11AuthAlgrthm == dot11AuthAlgrthm_8021X)
                psta->dot118021XPrivacy = adapter->securitypriv.dot11PrivacyAlgrthm;

diff --git a/drivers/staging/r8188eu/core/rtw_p2p.c b/drivers/staging/r8188eu/core/rtw_p2p.c
index e2b6cf2..3d237f2 100644 (file)
--- a/drivers/staging/r8188eu/core/rtw_p2p.c
+++ b/drivers/staging/r8188eu/core/rtw_p2p.c
@@ -1955,7 +1955,7 @@ int rtw_p2p_enable(struct adapter *padapter, enum P2P_ROLE role)
                /* Enable P2P function */
                init_wifidirect_info(padapter, role);
 
-               rtw_hal_set_odm_var(padapter, HAL_ODM_P2P_STATE, NULL, true);
+               rtl8188e_SetHalODMVar(padapter, HAL_ODM_P2P_STATE, NULL, true);
        } else if (role == P2P_ROLE_DISABLE) {
                if (_FAIL == rtw_pwr_wakeup(padapter)) {
                        ret = _FAIL;
@@ -1974,7 +1974,7 @@ int rtw_p2p_enable(struct adapter *padapter, enum P2P_ROLE role)
                        memset(&pwdinfo->rx_prov_disc_info, 0x00, sizeof(struct rx_provdisc_req_info));
                }
 
-               rtw_hal_set_odm_var(padapter, HAL_ODM_P2P_STATE, NULL, false);
+               rtl8188e_SetHalODMVar(padapter, HAL_ODM_P2P_STATE, NULL, false);
 
                /* Restore to initial setting. */
                update_tx_basic_rate(padapter, padapter->registrypriv.wireless_mode);

diff --git a/drivers/staging/r8188eu/core/rtw_sta_mgt.c b/drivers/staging/r8188eu/core/rtw_sta_mgt.c
index c3600cb..fc6484e 100644 (file)
--- a/drivers/staging/r8188eu/core/rtw_sta_mgt.c
+++ b/drivers/staging/r8188eu/core/rtw_sta_mgt.c
@@ -320,7 +320,7 @@ u32 rtw_free_stainfo(struct adapter *padapter, struct sta_info *psta)
        }
 
        if (!(psta->state & WIFI_AP_STATE))
-               rtw_hal_set_odm_var(padapter, HAL_ODM_STA_INFO, psta, false);
+               rtl8188e_SetHalODMVar(padapter, HAL_ODM_STA_INFO, psta, false);
 
 #ifdef CONFIG_88EU_AP_MODE
 

diff --git a/drivers/staging/r8188eu/hal/hal_intf.c b/drivers/staging/r8188eu/hal/hal_intf.c
index d467e73..4f89333 100644 (file)
--- a/drivers/staging/r8188eu/hal/hal_intf.c
+++ b/drivers/staging/r8188eu/hal/hal_intf.c
@@ -82,15 +82,6 @@ u8 rtw_hal_get_def_var(struct adapter *adapt,
        return _FAIL;
 }
 
-void rtw_hal_set_odm_var(struct adapter *adapt,
-                        enum hal_odm_variable var, void *val1,
-                        bool set)
-{
-       if (adapt->HalFunc.SetHalODMVarHandler)
-               adapt->HalFunc.SetHalODMVarHandler(adapt, var,
-                                                     val1, set);
-}
-
 u32 rtw_hal_inirp_init(struct adapter *adapt)
 {
        u32 rst = _FAIL;

diff --git a/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c b/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c
index 355878e..bed89a1 100644 (file)
--- a/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c
+++ b/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c
@@ -1728,7 +1728,7 @@ void rtl8188e_read_chip_version(struct adapter *padapter)
        MSG_88E("RF_Type is %x!!\n", pHalData->rf_type);
 }
 
-static void rtl8188e_SetHalODMVar(struct adapter *Adapter, enum hal_odm_variable eVariable, void *pValue1, bool bSet)
+void rtl8188e_SetHalODMVar(struct adapter *Adapter, enum hal_odm_variable eVariable, void *pValue1, bool bSet)
 {
        struct hal_data_8188e   *pHalData = GET_HAL_DATA(Adapter);
        struct odm_dm_struct *podmpriv = &pHalData->odmpriv;
@@ -1816,8 +1816,6 @@ void rtl8188e_set_hal_ops(struct hal_ops *pHalFunc)
        pHalFunc->sreset_linked_status_check  = &rtl8188e_sreset_linked_status_check;
        pHalFunc->sreset_get_wifi_status  = &sreset_get_wifi_status;
 
-       pHalFunc->SetHalODMVarHandler = &rtl8188e_SetHalODMVar;
-
        pHalFunc->IOL_exec_cmds_sync = &rtl8188e_IOL_exec_cmds_sync;
 
        pHalFunc->hal_notch_filter = &hal_notch_filter_8188e;

diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r8188eu/include/hal_intf.h
index 61f4a6b..f6f0763 100644 (file)
--- a/drivers/staging/r8188eu/include/hal_intf.h
+++ b/drivers/staging/r8188eu/include/hal_intf.h
@@ -162,10 +162,6 @@ struct hal_ops {
                                       enum hal_def_variable eVariable,
                                       void *pValue);
 
-       void    (*SetHalODMVarHandler)(struct adapter *padapter,
-                                      enum hal_odm_variable eVariable,
-                                      void *pValue1, bool bSet);
-
        void    (*UpdateRAMaskHandler)(struct adapter *padapter,
                                       u32 mac_id, u8 rssi_level);
        void    (*SetBeaconRelatedRegistersHandler)(struct adapter *padapter);
@@ -245,6 +241,8 @@ void rtl8188eu_set_hal_ops(struct adapter *padapter);
 void rtl8188eu_interface_configure(struct adapter *adapt);
 void ReadAdapterInfo8188EU(struct adapter *Adapter);
 void rtl8188eu_init_default_value(struct adapter *adapt);
+void rtl8188e_SetHalODMVar(struct adapter *Adapter,
+                          enum hal_odm_variable eVariable, void *pValue1, bool bSet);
 
 void   rtw_hal_free_data(struct adapter *padapter);
 
@@ -260,10 +258,6 @@ u8 rtw_hal_set_def_var(struct adapter *padapter,
 u8 rtw_hal_get_def_var(struct adapter *padapter,
                       enum hal_def_variable eVariable, void *pValue);
 
-void rtw_hal_set_odm_var(struct adapter *padapter,
-                        enum hal_odm_variable eVariable, void *pValue1,
-                        bool bSet);
-
 u32    rtw_hal_inirp_init(struct adapter *padapter);
 u32    rtw_hal_inirp_deinit(struct adapter *padapter);