Commit 4e487b75 authored by Michael Straube's avatar Michael Straube Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: remove hal_notch_filter from hal_ops 



Remove hal_notch_filter from hal_ops and remove its wrapper
rtw_hal_notch_filter(). Call hal_notch_filter_8188e() directly
instead.

Signed-off-by: default avatarMichael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20210906190223.11396-37-straube.linux@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a5ee5ea9

drivers/staging/r8188eu/hal/hal_intf.c

+1 −7
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ uint rtw_hal_init(struct adapter *adapt) 
		adapt->hw_init_completed = true;



		if (adapt->registrypriv.notch_filter == 1)

			rtw_hal_notch_filter(adapt, 1);

			hal_notch_filter_8188e(adapt, 1);

	} else {

		adapt->hw_init_completed = false;

		DBG_88E("rtw_hal_init: hal__init fail\n");
@@ -201,9 +201,3 @@ int rtw_hal_iol_cmd(struct adapter *adapter, struct xmit_frame *xmit_frame, 
							   bndy_cnt);

	return _FAIL;

}
 


void rtw_hal_notch_filter(struct adapter *adapter, bool enable)

{

	if (adapter->HalFunc.hal_notch_filter)

		adapter->HalFunc.hal_notch_filter(adapter, enable);

}

drivers/staging/r8188eu/hal/rtl8188e_hal_init.c

+1 −3
Original line number Diff line number Diff line
@@ -1748,7 +1748,7 @@ void rtl8188e_clone_haldata(struct adapter *dst_adapter, struct adapter *src_ada 
	memcpy(dst_adapter->HalData, src_adapter->HalData, dst_adapter->hal_data_sz);

}



static void hal_notch_filter_8188e(struct adapter *adapter, bool enable)

void hal_notch_filter_8188e(struct adapter *adapter, bool enable)

{

	if (enable) {

		DBG_88E("Enable notch filter\n");
@@ -1768,8 +1768,6 @@ void rtl8188e_set_hal_ops(struct hal_ops *pHalFunc) 
	pHalFunc->write_rfreg = &rtl8188e_PHY_SetRFReg;



	pHalFunc->IOL_exec_cmds_sync = &rtl8188e_IOL_exec_cmds_sync;



	pHalFunc->hal_notch_filter = &hal_notch_filter_8188e;

}



u8 GetEEPROMSize8188E(struct adapter *padapter)

drivers/staging/r8188eu/include/hal_intf.h

+2 −4
Original line number Diff line number Diff line
@@ -172,8 +172,6 @@ struct hal_ops { 
	int (*IOL_exec_cmds_sync)(struct adapter *padapter,

				  struct xmit_frame *frame, u32 max_wait,

				  u32 bndy_cnt);



	void (*hal_notch_filter)(struct adapter *adapter, bool enable);

};



#define RF_CHANGE_BY_INIT	0
@@ -207,6 +205,8 @@ u16 rtl8188e_EfuseGetCurrentSize(struct adapter *pAdapter, u8 efuseType, bool bP 
int rtl8188e_Efuse_PgPacketRead(struct adapter *pAdapter, u8 offset, u8 *data, bool bPseudoTest);

int rtl8188e_Efuse_PgPacketWrite(struct adapter *pAdapter, u8 offset, u8 word_en, u8 *data, bool bPseudoTest);



void hal_notch_filter_8188e(struct adapter *adapter, bool enable);



void	rtw_hal_free_data(struct adapter *padapter);

uint rtw_hal_init(struct adapter *padapter);

uint rtw_hal_deinit(struct adapter *padapter);
@@ -249,8 +249,6 @@ void rtw_hal_write_rfreg(struct adapter *padapter, 
int rtw_hal_iol_cmd(struct adapter  *adapter, struct xmit_frame *xmit_frame,

		    u32 max_wating_ms, u32 bndy_cnt);



void rtw_hal_notch_filter(struct adapter *adapter, bool enable);



void indicate_wx_scan_complete_event(struct adapter *padapter);

u8 rtw_do_join(struct adapter *padapter);