From: Michael Straube <straube.linux@gmail.com>
To: gregkh@linuxfoundation.org
Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk,
martin@kaiser.cx, fmdefrancesco@gmail.com,
linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org,
Michael Straube <straube.linux@gmail.com>
Subject: [PATCH 05/40] staging: r8188eu: remove SetHalODMVarHandler from hal_ops
Date: Mon, 6 Sep 2021 20:24:03 +0200 [thread overview]
Message-ID: <20210906182438.5417-6-straube.linux@gmail.com> (raw)
In-Reply-To: <20210906182438.5417-1-straube.linux@gmail.com>
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>
---
drivers/staging/r8188eu/core/rtw_ap.c | 4 ++--
drivers/staging/r8188eu/core/rtw_mlme.c | 4 ++--
drivers/staging/r8188eu/core/rtw_p2p.c | 4 ++--
drivers/staging/r8188eu/core/rtw_sta_mgt.c | 2 +-
drivers/staging/r8188eu/hal/hal_intf.c | 9 ---------
drivers/staging/r8188eu/hal/rtl8188e_hal_init.c | 4 +---
drivers/staging/r8188eu/include/hal_intf.h | 10 ++--------
7 files changed, 10 insertions(+), 27 deletions(-)
diff --git a/drivers/staging/r8188eu/core/rtw_ap.c b/drivers/staging/r8188eu/core/rtw_ap.c
index 1c07ad28b242..da8b5332b5e7 100644
--- 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 37578638bb76..d330f58ab3ad 100644
--- 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 e2b6cf2386e0..3d237f276847 100644
--- 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 c3600cb1790a..fc6484e403d0 100644
--- 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 d467e734a699..4f893333cade 100644
--- 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 355878ec270d..bed89a1234bd 100644
--- 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 61f4a6bcb7dc..f6f0763e0ab3 100644
--- 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);
--
2.33.0
next prev parent reply other threads:[~2021-09-06 18:25 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-06 18:23 [PATCH 00/40] staging: r8188eu: remove function pointers from struct hal_ops Michael Straube
2021-09-06 18:23 ` [PATCH 01/40] staging: r8188eu: remove InitSwLeds from hal_ops Michael Straube
2021-09-06 18:24 ` [PATCH 02/40] staging: r8188eu: remove DeInitSwLeds " Michael Straube
2021-09-06 18:24 ` [PATCH 03/40] staging: r8188eu: remove dm_init " Michael Straube
2021-09-06 18:24 ` [PATCH 04/40] staging: r8188eu: remove dm_deinit " Michael Straube
2021-09-06 18:24 ` Michael Straube [this message]
2021-09-06 18:24 ` [PATCH 06/40] staging: r8188eu: remove empty functions Michael Straube
2021-09-06 18:24 ` [PATCH 07/40] staging: r8188eu: remove unused function rtw_interface_ps_func() Michael Straube
2021-09-06 18:24 ` [PATCH 08/40] staging: r8188eu: remove interface_ps_func from hal_ops Michael Straube
2021-09-06 18:24 ` [PATCH 09/40] staging: r8188eu: remove hal_dm_watchdog " Michael Straube
2021-09-06 18:24 ` [PATCH 10/40] staging: r8188eu: remove set_bwmode_handler " Michael Straube
2021-09-06 18:24 ` [PATCH 11/40] staging: r8188eu: remove set_channel_handler " Michael Straube
2021-09-06 18:24 ` [PATCH 12/40] staging: r8188eu: remove unused enum hal_intf_ps_func Michael Straube
2021-09-06 18:24 ` [PATCH 13/40] staging: r8188eu: remove Add_RateATid from hal_ops Michael Straube
2021-09-06 18:24 ` [PATCH 14/40] staging: r8188eu: remove hal_power_on " Michael Straube
2021-09-06 18:24 ` [PATCH 15/40] staging: r8188eu: remove sreset_init_value " Michael Straube
2021-09-06 18:24 ` [PATCH 16/40] staging: r8188eu: remove sreset_reset_value " Michael Straube
2021-09-06 18:24 ` [PATCH 17/40] staging: r8188eu: remove silentreset " Michael Straube
2021-09-06 18:24 ` [PATCH 18/40] staging: r8188eu: remove sreset_xmit_status_check " Michael Straube
2021-09-06 18:24 ` [PATCH 19/40] staging: r8188eu: remove sreset_linked_status_check " Michael Straube
2021-09-06 18:24 ` [PATCH 20/40] staging: r8188eu: remove sreset_get_wifi_status " Michael Straube
2021-09-06 18:24 ` [PATCH 21/40] staging: r8188eu: remove EfusePowerSwitch " Michael Straube
2021-09-06 18:24 ` [PATCH 22/40] staging: r8188eu: rename hal_EfusePowerSwitch_RTL8188E() Michael Straube
2021-09-06 18:24 ` [PATCH 23/40] staging: r8188eu: remove wrapper Efuse_PowerSwitch() Michael Straube
2021-09-06 18:24 ` [PATCH 24/40] staging: r8188eu: remove ReadEFuse from hal_ops Michael Straube
2021-09-06 18:24 ` [PATCH 25/40] staging: r8188eu: remove EFUSEGetEfuseDefinition " Michael Straube
2021-09-06 18:24 ` [PATCH 26/40] staging: r8188eu: remove EfuseGetCurrentSize " Michael Straube
2021-09-06 18:24 ` [PATCH 27/40] staging: r8188eu: remove empty comments Michael Straube
2021-09-06 18:24 ` [PATCH 28/40] staging: r8188eu: remove Efuse_PgPacketRead from hal_ops Michael Straube
2021-09-06 18:24 ` [PATCH 29/40] staging: r8188eu: remove Efuse_PgPacketWrite " Michael Straube
2021-09-06 18:24 ` [PATCH 30/40] staging: r8188eu: remove Efuse_WordEnableDataWrite " Michael Straube
2021-09-06 18:24 ` [PATCH 31/40] staging: r8188eu: remove useless assignment Michael Straube
2021-09-06 18:24 ` [PATCH 32/40] staging: r8188eu: remove AntDivBeforeLinkHandler from hal_ops Michael Straube
2021-09-06 18:24 ` [PATCH 33/40] staging: r8188eu: remove AntDivCompareHandler " Michael Straube
2021-09-06 18:24 ` [PATCH 34/40] staging: r8188eu: remove empty function rtl8188e_start_thread() Michael Straube
2021-09-06 18:24 ` [PATCH 35/40] staging: r8188eu: remove empty function rtl8188e_stop_thread() Michael Straube
2021-09-06 18:24 ` [PATCH 36/40] staging: r8188eu: remove hal_notch_filter from hal_ops Michael Straube
2021-09-06 18:24 ` [PATCH 37/40] staging: r8188eu: remove free_hal_data " Michael Straube
2021-09-06 18:24 ` [PATCH 38/40] staging: r8188eu: remove unused function rtl8188e_clone_haldata() Michael Straube
2021-09-06 18:24 ` [PATCH 39/40] staging: r8188eu: remove SetBeaconRelatedRegistersHandler from hal_ops Michael Straube
2021-09-06 18:24 ` [PATCH 40/40] staging: r8188eu: remove UpdateHalRAMask8188EUsb " Michael Straube
2021-09-06 18:38 ` [PATCH 00/40] staging: r8188eu: remove function pointers from struct hal_ops Michael Straube
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210906182438.5417-6-straube.linux@gmail.com \
--to=straube.linux@gmail.com \
--cc=Larry.Finger@lwfinger.net \
--cc=fmdefrancesco@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=martin@kaiser.cx \
--cc=phil@philpotter.co.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).