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

staging: r8188eu: remove hal_power_on from hal_ops 



Remove hal_power_on from hal_ops and remove its wrapper
rtw_hal_power_on(). Call rtl8188eu_InitPowerOn() directly instead.

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


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

drivers/staging/r8188eu/hal/hal_intf.c

+0 −7
Original line number Diff line number Diff line
@@ -12,13 +12,6 @@ void rtw_hal_free_data(struct adapter *adapt) 
		adapt->HalFunc.free_hal_data(adapt);

}



u32 rtw_hal_power_on(struct adapter *adapt)

{

	if (adapt->HalFunc.hal_power_on)

		return adapt->HalFunc.hal_power_on(adapt);

	return _FAIL;

}



uint	 rtw_hal_init(struct adapter *adapt)

{

	uint	status = _SUCCESS;

drivers/staging/r8188eu/hal/rtl8188e_hal_init.c

+1 −1
Original line number Diff line number Diff line
@@ -904,7 +904,7 @@ static void ReadEFuseByIC(struct adapter *Adapter, u8 efuseType, u16 _offset, u1 
	if (!bPseudoTest) {

		int ret = _FAIL;

		if (rtw_IOL_applied(Adapter)) {

			rtw_hal_power_on(Adapter);

			rtl8188eu_InitPowerOn(Adapter);



			iol_mode_enable(Adapter, 1);

			ret = iol_read_efuse(Adapter, 0, _offset, _size_byte, pbuf);

drivers/staging/r8188eu/hal/usb_halinit.c

+1 −2
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ void rtl8188eu_interface_configure(struct adapter *adapt) 
				pdvobjpriv->RtNumInPipes, pdvobjpriv->RtNumOutPipes);

}



static u32 rtl8188eu_InitPowerOn(struct adapter *adapt)

u32 rtl8188eu_InitPowerOn(struct adapter *adapt)

{

	u16 value16;

	/*  HW Power on sequence */
@@ -2214,7 +2214,6 @@ void rtl8188eu_set_hal_ops(struct adapter *adapt) 
		DBG_88E("cant not alloc memory for HAL DATA\n");

	adapt->hal_data_sz = sizeof(struct hal_data_8188e);



	halfunc->hal_power_on = rtl8188eu_InitPowerOn;

	halfunc->hal_init = &rtl8188eu_hal_init;

	halfunc->hal_deinit = &rtl8188eu_hal_deinit;

drivers/staging/r8188eu/include/hal_intf.h

+1 −3
Original line number Diff line number Diff line
@@ -124,7 +124,6 @@ enum hal_odm_variable { 
typedef s32 (*c2h_id_filter)(u8 id);



struct hal_ops {

	u32	(*hal_power_on)(struct adapter *padapter);

	u32	(*hal_init)(struct adapter *padapter);

	u32	(*hal_deinit)(struct adapter *padapter);
@@ -227,10 +226,9 @@ void ReadAdapterInfo8188EU(struct adapter *Adapter); 
void rtl8188eu_init_default_value(struct adapter *adapt);

void rtl8188e_SetHalODMVar(struct adapter *Adapter,

			   enum hal_odm_variable eVariable, void *pValue1, bool bSet);

u32 rtl8188eu_InitPowerOn(struct adapter *adapt);



void	rtw_hal_free_data(struct adapter *padapter);



u32 rtw_hal_power_on(struct adapter *padapter);

uint rtw_hal_init(struct adapter *padapter);

uint rtw_hal_deinit(struct adapter *padapter);

void rtw_hal_stop(struct adapter *padapter);