Commit af44525a authored by Michael Straube's avatar Michael Straube Committed by Greg Kroah-Hartman

staging: r8188eu: remove sreset_init_value from hal_ops

Remove sreset_init_value from hal_ops and remove its wrapper
rtw_hal_sreset_init(). Call sreset_init_value() directly instead.
Signed-off-by: default avatarMichael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20210906190223.11396-16-straube.linux@gmail.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b8bdd099
...@@ -221,12 +221,6 @@ void rtw_hal_antdiv_rssi_compared(struct adapter *adapt, ...@@ -221,12 +221,6 @@ void rtw_hal_antdiv_rssi_compared(struct adapter *adapt,
adapt->HalFunc.AntDivCompareHandler(adapt, dst, src); adapt->HalFunc.AntDivCompareHandler(adapt, dst, src);
} }
void rtw_hal_sreset_init(struct adapter *adapt)
{
if (adapt->HalFunc.sreset_init_value)
adapt->HalFunc.sreset_init_value(adapt);
}
void rtw_hal_sreset_reset(struct adapter *adapt) void rtw_hal_sreset_reset(struct adapter *adapt)
{ {
if (adapt->HalFunc.silentreset) if (adapt->HalFunc.silentreset)
......
...@@ -1803,7 +1803,6 @@ void rtl8188e_set_hal_ops(struct hal_ops *pHalFunc) ...@@ -1803,7 +1803,6 @@ void rtl8188e_set_hal_ops(struct hal_ops *pHalFunc)
pHalFunc->Efuse_PgPacketWrite = &rtl8188e_Efuse_PgPacketWrite; pHalFunc->Efuse_PgPacketWrite = &rtl8188e_Efuse_PgPacketWrite;
pHalFunc->Efuse_WordEnableDataWrite = &rtl8188e_Efuse_WordEnableDataWrite; pHalFunc->Efuse_WordEnableDataWrite = &rtl8188e_Efuse_WordEnableDataWrite;
pHalFunc->sreset_init_value = &sreset_init_value;
pHalFunc->sreset_reset_value = &sreset_reset_value; pHalFunc->sreset_reset_value = &sreset_reset_value;
pHalFunc->silentreset = &rtl8188e_silentreset_for_specific_platform; pHalFunc->silentreset = &rtl8188e_silentreset_for_specific_platform;
pHalFunc->sreset_xmit_status_check = &rtl8188e_sreset_xmit_status_check; pHalFunc->sreset_xmit_status_check = &rtl8188e_sreset_xmit_status_check;
......
...@@ -193,7 +193,6 @@ struct hal_ops { ...@@ -193,7 +193,6 @@ struct hal_ops {
u16 efuse_addr, u8 word_en, u16 efuse_addr, u8 word_en,
u8 *data, bool bPseudoTest); u8 *data, bool bPseudoTest);
void (*sreset_init_value)(struct adapter *padapter);
void (*sreset_reset_value)(struct adapter *padapter); void (*sreset_reset_value)(struct adapter *padapter);
void (*silentreset)(struct adapter *padapter); void (*silentreset)(struct adapter *padapter);
void (*sreset_xmit_status_check)(struct adapter *padapter); void (*sreset_xmit_status_check)(struct adapter *padapter);
...@@ -274,7 +273,6 @@ void rtw_hal_antdiv_rssi_compared(struct adapter *padapter, ...@@ -274,7 +273,6 @@ void rtw_hal_antdiv_rssi_compared(struct adapter *padapter,
struct wlan_bssid_ex *dst, struct wlan_bssid_ex *dst,
struct wlan_bssid_ex *src); struct wlan_bssid_ex *src);
void rtw_hal_sreset_init(struct adapter *padapter);
void rtw_hal_sreset_reset(struct adapter *padapter); void rtw_hal_sreset_reset(struct adapter *padapter);
void rtw_hal_sreset_reset_value(struct adapter *padapter); void rtw_hal_sreset_reset_value(struct adapter *padapter);
void rtw_hal_sreset_xmit_status_check(struct adapter *padapter); void rtw_hal_sreset_xmit_status_check(struct adapter *padapter);
......
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#include "../include/rtw_br_ext.h" #include "../include/rtw_br_ext.h"
#include "../include/rtl8188e_led.h" #include "../include/rtl8188e_led.h"
#include "../include/rtl8188e_dm.h" #include "../include/rtl8188e_dm.h"
#include "../include/rtw_sreset.h"
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("Realtek Wireless Lan Driver"); MODULE_DESCRIPTION("Realtek Wireless Lan Driver");
...@@ -890,7 +891,7 @@ u8 rtw_init_drv_sw(struct adapter *padapter) ...@@ -890,7 +891,7 @@ u8 rtw_init_drv_sw(struct adapter *padapter)
rtl8188e_init_dm_priv(padapter); rtl8188e_init_dm_priv(padapter);
rtl8188eu_InitSwLeds(padapter); rtl8188eu_InitSwLeds(padapter);
rtw_hal_sreset_init(padapter); sreset_init_value(padapter);
spin_lock_init(&padapter->br_ext_lock); spin_lock_init(&padapter->br_ext_lock);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment