Commit 7946b5d6 authored by Michael Straube's avatar Michael Straube Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: remove IOL_exec_cmds_sync() from struct hal_ops 



Remove IOL_exec_cmds_sync() from struct hal_ops and its wrapper
rtw_hal_iol_cmd(). Call rtl8188e_IOL_exec_cmds_sync() directly
instead.

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


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

drivers/staging/r8188eu/core/rtw_iol.c

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ bool rtw_IOL_applied(struct adapter *adapter) 


int rtw_IOL_exec_cmds_sync(struct adapter  *adapter, struct xmit_frame *xmit_frame, u32 max_wating_ms, u32 bndy_cnt)

{

	return rtw_hal_iol_cmd(adapter, xmit_frame, max_wating_ms, bndy_cnt);

	return rtl8188e_IOL_exec_cmds_sync(adapter, xmit_frame, max_wating_ms, bndy_cnt);

}



int rtw_IOL_append_LLT_cmd(struct xmit_frame *xmit_frame, u8 page_boundary)

drivers/staging/r8188eu/hal/hal_intf.c

+0 −10
Original line number Diff line number Diff line
@@ -175,13 +175,3 @@ void rtw_hal_write_rfreg(struct adapter *adapt, enum rf_radio_path rfpath, 
		adapt->HalFunc.write_rfreg(adapt, rfpath, regaddr,

					      bitmask, data);

}
 


int rtw_hal_iol_cmd(struct adapter  *adapter, struct xmit_frame *xmit_frame,

		    u32 max_wating_ms, u32 bndy_cnt)

{

	if (adapter->HalFunc.IOL_exec_cmds_sync)

		return adapter->HalFunc.IOL_exec_cmds_sync(adapter, xmit_frame,

							   max_wating_ms,

							   bndy_cnt);

	return _FAIL;

}

drivers/staging/r8188eu/hal/rtl8188e_hal_init.c

+1 −3
Original line number Diff line number Diff line
@@ -306,7 +306,7 @@ static s32 iol_ioconfig(struct adapter *padapter, u8 iocfg_bndy) 
	return rst;

}



static int rtl8188e_IOL_exec_cmds_sync(struct adapter *adapter, struct xmit_frame *xmit_frame, u32 max_wating_ms, u32 bndy_cnt)

int rtl8188e_IOL_exec_cmds_sync(struct adapter *adapter, struct xmit_frame *xmit_frame, u32 max_wating_ms, u32 bndy_cnt)

{

	struct pkt_attrib *pattrib = &xmit_frame->attrib;

	u8 i;
@@ -1754,8 +1754,6 @@ void rtl8188e_set_hal_ops(struct hal_ops *pHalFunc) 
	pHalFunc->write_bbreg = &rtl8188e_PHY_SetBBReg;

	pHalFunc->read_rfreg = &rtl8188e_PHY_QueryRFReg;

	pHalFunc->write_rfreg = &rtl8188e_PHY_SetRFReg;



	pHalFunc->IOL_exec_cmds_sync = &rtl8188e_IOL_exec_cmds_sync;

}



u8 GetEEPROMSize8188E(struct adapter *padapter)

drivers/staging/r8188eu/include/hal_intf.h

+3 −7
Original line number Diff line number Diff line
@@ -162,10 +162,6 @@ struct hal_ops { 
	void	(*write_rfreg)(struct adapter *padapter,

			       enum rf_radio_path eRFPath, u32 RegAddr,

			       u32 BitMask, u32 Data);



	int (*IOL_exec_cmds_sync)(struct adapter *padapter,

				  struct xmit_frame *frame, u32 max_wait,

				  u32 bndy_cnt);

};



#define RF_CHANGE_BY_INIT	0
@@ -204,6 +200,9 @@ void hal_notch_filter_8188e(struct adapter *adapter, bool enable); 
void SetBeaconRelatedRegisters8188EUsb(struct adapter *adapt);

void UpdateHalRAMask8188EUsb(struct adapter *adapt, u32 mac_id, u8 rssi_level);



int rtl8188e_IOL_exec_cmds_sync(struct adapter *adapter,

				struct xmit_frame *xmit_frame, u32 max_wating_ms, u32 bndy_cnt);



uint rtw_hal_init(struct adapter *padapter);

uint rtw_hal_deinit(struct adapter *padapter);

void rtw_hal_stop(struct adapter *padapter);
@@ -240,9 +239,6 @@ void rtw_hal_write_rfreg(struct adapter *padapter, 
			    enum rf_radio_path eRFPath, u32 RegAddr,

			    u32 BitMask, u32 Data);



int rtw_hal_iol_cmd(struct adapter  *adapter, struct xmit_frame *xmit_frame,

		    u32 max_wating_ms, u32 bndy_cnt);



void indicate_wx_scan_complete_event(struct adapter *padapter);

u8 rtw_do_join(struct adapter *padapter);