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

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

staging: r8188eu: remove hal_deinit member of hal_ops structure 



It is unnecessary wrapper for rtl8188eu_hal_deinit function.

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

drivers/staging/rtl8188eu/hal/hal_intf.c

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ uint rtw_hal_deinit(struct adapter *adapt) 
{

	uint	status = _SUCCESS;



	status = adapt->HalFunc.hal_deinit(adapt);

	status = rtl8188eu_hal_deinit(adapt);



	if (status == _SUCCESS)

		adapt->hw_init_completed = false;

drivers/staging/rtl8188eu/hal/usb_halinit.c

+1 −2
Original line number Diff line number Diff line
@@ -972,7 +972,7 @@ static void rtl8192cu_hw_power_down(struct adapter *adapt) 
	usb_write16(adapt, REG_APS_FSMCO, 0x8812);

}



static u32 rtl8188eu_hal_deinit(struct adapter *Adapter)

u32 rtl8188eu_hal_deinit(struct adapter *Adapter)

{

	DBG_88E("==> %s\n", __func__);
@@ -2052,7 +2052,6 @@ void rtl8188eu_set_hal_ops(struct adapter *adapt) 


	halfunc->hal_power_on = rtl8188eu_InitPowerOn;

	halfunc->hal_init = &rtl8188eu_hal_init;

	halfunc->hal_deinit = &rtl8188eu_hal_deinit;



	rtl8188e_set_hal_ops(halfunc);

}

drivers/staging/rtl8188eu/include/hal_intf.h

+1 −1
Original line number Diff line number Diff line
@@ -142,7 +142,6 @@ enum hal_intf_ps_func { 
struct hal_ops {

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

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

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



	void	(*free_hal_data)(struct adapter *padapter);
@@ -202,6 +201,7 @@ enum hardware_type { 
#define is_boot_from_eeprom(adapter) (adapter->eeprompriv.EepromOrEfuse)



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

u32 rtl8188eu_hal_deinit(struct adapter *Adapter);

void rtw_hal_def_value_init(struct adapter *padapter);



void	rtw_hal_free_data(struct adapter *padapter);