mirror of
https://github.com/hardkernel/linux.git
synced 2026-06-06 19:08:57 +09:00
staging: r8188eu: remove dm_init from hal_ops
Remove dm_init from hal_ops and remove its wrapper rtw_hal_dm_init(). Call rtl8188e_init_dm_priv() directly instead. Signed-off-by: Michael Straube <straube.linux@gmail.com> Link: https://lore.kernel.org/r/20210906190223.11396-4-straube.linux@gmail.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
9b0c770f6d
commit
63b4b687c7
@@ -12,12 +12,6 @@ void rtw_hal_free_data(struct adapter *adapt)
|
||||
adapt->HalFunc.free_hal_data(adapt);
|
||||
}
|
||||
|
||||
void rtw_hal_dm_init(struct adapter *adapt)
|
||||
{
|
||||
if (adapt->HalFunc.dm_init)
|
||||
adapt->HalFunc.dm_init(adapt);
|
||||
}
|
||||
|
||||
void rtw_hal_dm_deinit(struct adapter *adapt)
|
||||
{
|
||||
/* cancel dm timer */
|
||||
|
||||
@@ -1784,7 +1784,6 @@ void rtl8188e_set_hal_ops(struct hal_ops *pHalFunc)
|
||||
{
|
||||
pHalFunc->free_hal_data = &rtl8188e_free_hal_data;
|
||||
|
||||
pHalFunc->dm_init = &rtl8188e_init_dm_priv;
|
||||
pHalFunc->dm_deinit = &rtl8188e_deinit_dm_priv;
|
||||
|
||||
pHalFunc->set_bwmode_handler = &PHY_SetBWMode8188E;
|
||||
|
||||
@@ -143,7 +143,6 @@ struct hal_ops {
|
||||
s32 (*init_recv_priv)(struct adapter *padapter);
|
||||
void (*free_recv_priv)(struct adapter *padapter);
|
||||
|
||||
void (*dm_init)(struct adapter *padapter);
|
||||
void (*dm_deinit)(struct adapter *padapter);
|
||||
|
||||
void (*set_bwmode_handler)(struct adapter *padapter,
|
||||
@@ -251,7 +250,6 @@ void rtl8188eu_init_default_value(struct adapter *adapt);
|
||||
|
||||
void rtw_hal_free_data(struct adapter *padapter);
|
||||
|
||||
void rtw_hal_dm_init(struct adapter *padapter);
|
||||
void rtw_hal_dm_deinit(struct adapter *padapter);
|
||||
|
||||
u32 rtw_hal_power_on(struct adapter *padapter);
|
||||
|
||||
@@ -12,6 +12,7 @@
|
||||
#include "../include/usb_osintf.h"
|
||||
#include "../include/rtw_br_ext.h"
|
||||
#include "../include/rtl8188e_led.h"
|
||||
#include "../include/rtl8188e_dm.h"
|
||||
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_DESCRIPTION("Realtek Wireless Lan Driver");
|
||||
@@ -886,7 +887,7 @@ u8 rtw_init_drv_sw(struct adapter *padapter)
|
||||
|
||||
ret8 = rtw_init_default_value(padapter);
|
||||
|
||||
rtw_hal_dm_init(padapter);
|
||||
rtl8188e_init_dm_priv(padapter);
|
||||
rtl8188eu_InitSwLeds(padapter);
|
||||
|
||||
rtw_hal_sreset_init(padapter);
|
||||
|
||||
Reference in New Issue
Block a user