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

Commit 385b452c authored by Ivan Safonov's avatar Ivan Safonov Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: rename GetHwReg8188EU to rtw_hal_get_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 359d9612

drivers/staging/rtl8188eu/core/rtw_mlme.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -2019,7 +2019,7 @@ void rtw_update_ht_cap(struct adapter *padapter, u8 *pie, uint ie_len) 
		int i;

		int i;

		u8	rf_type;

		u8	rf_type;





		padapter->HalFunc.GetHwRegHandler(padapter, HW_VAR_RF_TYPE, (u8 *)(&rf_type));

		rtw_hal_get_hwreg(padapter, HW_VAR_RF_TYPE, (u8 *)(&rf_type));





		/* update the MCS rates */

		/* update the MCS rates */

		for (i = 0; i < 16; i++) {

		for (i = 0; i < 16; i++) {

drivers/staging/rtl8188eu/hal/hal_intf.c

+0 −6
Original line number Original line Diff line number Diff line
@@ -120,12 +120,6 @@ void rtw_hal_set_hwreg(struct adapter *adapt, u8 variable, u8 *val) 
		adapt->HalFunc.SetHwRegHandler(adapt, variable, val);

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

}

}





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

{

	if (adapt->HalFunc.GetHwRegHandler)

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

}



void rtw_hal_set_odm_var(struct adapter *adapt,

void rtw_hal_set_odm_var(struct adapter *adapt,

			 enum hal_odm_variable var, void *val1,

			 enum hal_odm_variable var, void *val1,

			 bool set)

			 bool set)

drivers/staging/rtl8188eu/hal/usb_halinit.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -1778,7 +1778,7 @@ static void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8 *val) 
	}

	}

}

}





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

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

{

{

	struct hal_data_8188e	*haldata = GET_HAL_DATA(Adapter);

	struct hal_data_8188e	*haldata = GET_HAL_DATA(Adapter);

	struct odm_dm_struct *podmpriv = &haldata->odmpriv;

	struct odm_dm_struct *podmpriv = &haldata->odmpriv;
@@ -2080,7 +2080,6 @@ void rtl8188eu_set_hal_ops(struct adapter *adapt) 
	halfunc->read_adapter_info = &_ReadAdapterInfo8188EU;

	halfunc->read_adapter_info = &_ReadAdapterInfo8188EU;





	halfunc->SetHwRegHandler = &SetHwReg8188EU;

	halfunc->SetHwRegHandler = &SetHwReg8188EU;

	halfunc->GetHwRegHandler = &GetHwReg8188EU;





	rtl8188e_set_hal_ops(halfunc);

	rtl8188e_set_hal_ops(halfunc);

}
 
}

drivers/staging/rtl8188eu/include/hal_intf.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -177,8 +177,6 @@ struct hal_ops { 




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

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

				   u8 *val);

				   u8 *val);

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

				   u8 *val);





	void	(*SetHalODMVarHandler)(struct adapter *padapter,

	void	(*SetHalODMVarHandler)(struct adapter *padapter,

				       enum hal_odm_variable eVariable,

				       enum hal_odm_variable eVariable,