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

staging: r8188eu: remove init_recv_priv from struct hal_ops 



Remove init_recv_priv from struct hal_ops and remove its wrapper
rtw_hal_init_recv_priv(). Call rtl8188eu_init_recv_priv() directly
instead.

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


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

drivers/staging/r8188eu/core/rtw_recv.c

+2 −1
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#include "../include/mlme_osdep.h"

#include "../include/usb_ops.h"

#include "../include/wifi.h"

#include "../include/rtl8188e_recv.h"



static u8 SNAP_ETH_TYPE_IPX[2] = {0x81, 0x37};

static u8 SNAP_ETH_TYPE_APPLETALK_AARP[2] = {0x80, 0xf3};
@@ -82,7 +83,7 @@ int _rtw_init_recv_priv(struct recv_priv *precvpriv, struct adapter *padapter) 


	sema_init(&precvpriv->allrxreturnevt, 0);



	res = rtw_hal_init_recv_priv(padapter);

	res = rtl8188eu_init_recv_priv(padapter);



	timer_setup(&precvpriv->signal_stat_timer, rtw_signal_stat_timer_hdl, 0);

	precvpriv->signal_stat_sampling_interval = 1000; /* ms */

drivers/staging/r8188eu/hal/hal_intf.c

+0 −8
Original line number Diff line number Diff line
@@ -72,14 +72,6 @@ u32 rtw_hal_inirp_deinit(struct adapter *adapt) 
	return _FAIL;

}



s32 rtw_hal_init_recv_priv(struct adapter *adapt)

{

	if (adapt->HalFunc.init_recv_priv)

		return adapt->HalFunc.init_recv_priv(adapt);



	return _FAIL;

}



void rtw_hal_free_recv_priv(struct adapter *adapt)

{

	if (adapt->HalFunc.free_recv_priv)

drivers/staging/r8188eu/hal/usb_halinit.c

+0 −1
Original line number Diff line number Diff line
@@ -2153,7 +2153,6 @@ void rtl8188eu_set_hal_ops(struct adapter *adapt) 
	halfunc->inirp_init = &rtl8188eu_inirp_init;

	halfunc->inirp_deinit = &rtl8188eu_inirp_deinit;



	halfunc->init_recv_priv = &rtl8188eu_init_recv_priv;

	halfunc->free_recv_priv = &rtl8188eu_free_recv_priv;



	halfunc->SetHwRegHandler = &SetHwReg8188EU;

drivers/staging/r8188eu/include/hal_intf.h

+0 −2
Original line number Diff line number Diff line
@@ -128,7 +128,6 @@ struct hal_ops { 
	u32	(*inirp_init)(struct adapter *padapter);

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



	s32	(*init_recv_priv)(struct adapter *padapter);

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



	void	(*SetHwRegHandler)(struct adapter *padapter, u8	variable,
@@ -186,7 +185,6 @@ void rtw_hal_get_hwreg(struct adapter *padapter, u8 variable, u8 *val); 
u32	rtw_hal_inirp_init(struct adapter *padapter);

u32	rtw_hal_inirp_deinit(struct adapter *padapter);



s32	rtw_hal_init_recv_priv(struct adapter *padapter);

void	rtw_hal_free_recv_priv(struct adapter *padapter);



void rtw_hal_update_ra_mask(struct adapter *padapter, u32 mac_id, u8 level);