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

staging: r8188eu: remove SetBeaconRelatedRegistersHandler from hal_ops 



Remove SetBeaconRelatedRegistersHandler from hal_ops and remove its
wrapper rtw_hal_bcn_related_reg_setting().
Call SetBeaconRelatedRegisters8188EUsb() directly instead.

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


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

drivers/staging/r8188eu/core/rtw_wlan_util.c

+1 −1
Original line number Diff line number Diff line
@@ -1525,7 +1525,7 @@ void correct_TSF(struct adapter *padapter, struct mlme_ext_priv *pmlmeext) 


void beacon_timing_control(struct adapter *padapter)

{

	rtw_hal_bcn_related_reg_setting(padapter);

	SetBeaconRelatedRegisters8188EUsb(padapter);

}



static struct adapter *pbuddy_padapter;

drivers/staging/r8188eu/hal/hal_intf.c

+0 −6
Original line number Diff line number Diff line
@@ -180,12 +180,6 @@ void rtw_hal_write_rfreg(struct adapter *adapt, enum rf_radio_path rfpath, 
					      bitmask, data);

}



void rtw_hal_bcn_related_reg_setting(struct adapter *adapt)

{

	if (adapt->HalFunc.SetBeaconRelatedRegistersHandler)

		adapt->HalFunc.SetBeaconRelatedRegistersHandler(adapt);

}



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

		    u32 max_wating_ms, u32 bndy_cnt)

{

drivers/staging/r8188eu/hal/usb_halinit.c

+1 −2
Original line number Diff line number Diff line
@@ -2147,7 +2147,7 @@ static void UpdateHalRAMask8188EUsb(struct adapter *adapt, u32 mac_id, u8 rssi_l 
	psta->init_rate = init_rate;

}



static void SetBeaconRelatedRegisters8188EUsb(struct adapter *adapt)

void SetBeaconRelatedRegisters8188EUsb(struct adapter *adapt)

{

	u32 value32;

	struct mlme_ext_priv	*pmlmeext = &adapt->mlmeextpriv;
@@ -2231,7 +2231,6 @@ void rtl8188eu_set_hal_ops(struct adapter *adapt) 
	halfunc->SetHalDefVarHandler = &SetHalDefVar8188EUsb;



	halfunc->UpdateRAMaskHandler = &UpdateHalRAMask8188EUsb;

	halfunc->SetBeaconRelatedRegistersHandler = &SetBeaconRelatedRegisters8188EUsb;



	halfunc->hal_xmit = &rtl8188eu_hal_xmit;

	halfunc->mgnt_xmit = &rtl8188eu_mgnt_xmit;

drivers/staging/r8188eu/include/hal_intf.h

+2 −3
Original line number Diff line number Diff line
@@ -149,7 +149,6 @@ struct hal_ops { 


	void	(*UpdateRAMaskHandler)(struct adapter *padapter,

				       u32 mac_id, u8 rssi_level);

	void	(*SetBeaconRelatedRegistersHandler)(struct adapter *padapter);



	s32	(*hal_xmit)(struct adapter *padapter,

			    struct xmit_frame *pxmitframe);
@@ -205,6 +204,8 @@ int rtl8188e_Efuse_PgPacketWrite(struct adapter *pAdapter, u8 offset, u8 word_en 


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



void SetBeaconRelatedRegisters8188EUsb(struct adapter *adapt);



uint rtw_hal_init(struct adapter *padapter);

uint rtw_hal_deinit(struct adapter *padapter);

void rtw_hal_stop(struct adapter *padapter);
@@ -232,8 +233,6 @@ void rtw_hal_update_ra_mask(struct adapter *padapter, u32 mac_id, u8 level); 
void	rtw_hal_clone_data(struct adapter *dst_adapt,

			   struct adapter *src_adapt);



void rtw_hal_bcn_related_reg_setting(struct adapter *padapter);



u32	rtw_hal_read_bbreg(struct adapter *padapter, u32 RegAddr, u32 BitMask);

void	rtw_hal_write_bbreg(struct adapter *padapter, u32 RegAddr, u32 BitMask,

			    u32 Data);