Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 655266d5 authored by Ivan Safonov's avatar Ivan Safonov Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: rename SetHwReg8188EU to rtw_hal_set_hwreg 



And remove two one-line wrappers.

Signed-off-by: default avatarIvan Safonov <insafonov@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 385b452c

drivers/staging/rtl8188eu/core/rtw_wlan_util.c

+1 −1
Original line number Diff line number Diff line
@@ -1508,7 +1508,7 @@ void update_wireless_mode(struct adapter *padapter) 
	SIFS_Timer = 0x0a0a0808;/* 0x0808 -> for CCK, 0x0a0a -> for OFDM */

				/* change this value if having IOT issues. */



	padapter->HalFunc.SetHwRegHandler(padapter, HW_VAR_RESP_SIFS,  (u8 *)&SIFS_Timer);

	rtw_hal_set_hwreg(padapter, HW_VAR_RESP_SIFS,  (u8 *)&SIFS_Timer);



	if (pmlmeext->cur_wireless_mode & WIRELESS_11B)

		update_mgnt_tx_rate(padapter, IEEE80211_CCK_RATE_1MB);

drivers/staging/rtl8188eu/hal/hal_intf.c

+0 −6
Original line number Diff line number Diff line
@@ -114,12 +114,6 @@ uint rtw_hal_deinit(struct adapter *adapt) 
	return status;

}



void rtw_hal_set_hwreg(struct adapter *adapt, u8 variable, u8 *val)

{

	if (adapt->HalFunc.SetHwRegHandler)

		adapt->HalFunc.SetHwRegHandler(adapt, variable, val);

}



void rtw_hal_set_odm_var(struct adapter *adapt,

			 enum hal_odm_variable var, void *val1,

			 bool set)

drivers/staging/rtl8188eu/hal/usb_halinit.c

+1 −3
Original line number Diff line number Diff line
@@ -1276,7 +1276,7 @@ static void hw_var_set_bcn_func(struct adapter *Adapter, u8 variable, u8 *val) 
		usb_write8(Adapter, bcn_ctrl_reg, usb_read8(Adapter, bcn_ctrl_reg)&(~(EN_BCN_FUNCTION | EN_TXBCN_RPT)));

}



static void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8 *val)

void rtw_hal_set_hwreg(struct adapter *Adapter, u8 variable, u8 *val)

{

	struct hal_data_8188e	*haldata = GET_HAL_DATA(Adapter);

	struct dm_priv	*pdmpriv = &haldata->dmpriv;
@@ -2079,7 +2079,5 @@ void rtl8188eu_set_hal_ops(struct adapter *adapt) 
	halfunc->intf_chip_configure = &rtl8188eu_interface_configure;

	halfunc->read_adapter_info = &_ReadAdapterInfo8188EU;



	halfunc->SetHwRegHandler = &SetHwReg8188EU;



	rtl8188e_set_hal_ops(halfunc);

}

drivers/staging/rtl8188eu/include/hal_intf.h

+0 −3
Original line number Diff line number Diff line
@@ -175,9 +175,6 @@ struct hal_ops { 


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



	void	(*SetHwRegHandler)(struct adapter *padapter, u8	variable,

				   u8 *val);



	void	(*SetHalODMVarHandler)(struct adapter *padapter,

				       enum hal_odm_variable eVariable,

				       void *pValue1, bool bSet);