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

staging: r8188eu: remove inirp_deinit from struct hal_ops 



Remove inirp_deinit from struct hal_ops and remove the wrappers
rtw_hal_inirp_deinit() and rtl8188eu_inirp_deinit(). Call
rtw_read_port_cancel() directly instead.

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


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

drivers/staging/r8188eu/hal/hal_intf.c

+0 −8
Original line number Diff line number Diff line
@@ -53,14 +53,6 @@ void rtw_hal_get_hwreg(struct adapter *adapt, u8 variable, u8 *val) 
		adapt->HalFunc.GetHwRegHandler(adapt, variable, val);

}



u32 rtw_hal_inirp_deinit(struct adapter *adapt)

{

	if (adapt->HalFunc.inirp_deinit)

		return adapt->HalFunc.inirp_deinit(adapt);



	return _FAIL;

}



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

{

	struct mlme_priv *pmlmepriv = &adapt->mlmepriv;

drivers/staging/r8188eu/hal/usb_halinit.c

+0 −9
Original line number Diff line number Diff line
@@ -1024,13 +1024,6 @@ unsigned int rtl8188eu_inirp_init(struct adapter *Adapter) 
	return status;

}



static unsigned int rtl8188eu_inirp_deinit(struct adapter *Adapter)

{

	rtw_read_port_cancel(Adapter);



	return _SUCCESS;

}



/*  */

/*  */

/*	EEPROM/EFUSE Content Parsing */
@@ -2150,8 +2143,6 @@ void rtl8188eu_set_hal_ops(struct adapter *adapt) 
	halfunc->hal_init = &rtl8188eu_hal_init;

	halfunc->hal_deinit = &rtl8188eu_hal_deinit;



	halfunc->inirp_deinit = &rtl8188eu_inirp_deinit;



	halfunc->SetHwRegHandler = &SetHwReg8188EU;

	halfunc->GetHwRegHandler = &GetHwReg8188EU;

}

drivers/staging/r8188eu/include/hal_intf.h

+0 −4
Original line number Diff line number Diff line
@@ -125,8 +125,6 @@ struct hal_ops { 
	u32	(*hal_init)(struct adapter *padapter);

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



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



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

				   u8 *val);

	void	(*GetHwRegHandler)(struct adapter *padapter, u8	variable,
@@ -181,8 +179,6 @@ void rtw_hal_stop(struct adapter *padapter); 
void rtw_hal_set_hwreg(struct adapter *padapter, u8 variable, u8 *val);

void rtw_hal_get_hwreg(struct adapter *padapter, u8 variable, u8 *val);



u32	rtw_hal_inirp_deinit(struct adapter *padapter);



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);

drivers/staging/r8188eu/os_dep/usb_intf.c

+1 −1
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ static void usb_intf_start(struct adapter *padapter) 
static void usb_intf_stop(struct adapter *padapter)

{

	/* cancel in irp */

	rtw_hal_inirp_deinit(padapter);

	rtw_read_port_cancel(padapter);



	/* cancel out irp */

	rtw_write_port_cancel(padapter);