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

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

staging: r8188eu: rename rtl8188eu_init_recv_priv to rtw_hal_init_recv_priv 



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 67f7ada8

drivers/staging/rtl8188eu/hal/hal_intf.c

+0 −8
Original line number Diff line number Diff line
@@ -119,14 +119,6 @@ s32 rtw_hal_init_xmit_priv(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_update_ra_mask(struct adapter *adapt, u32 mac_id, u8 rssi_level)

{

	struct mlme_priv *pmlmepriv = &(adapt->mlmepriv);

drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 


#include <rtl8188e_hal.h>



int	rtl8188eu_init_recv_priv(struct adapter *padapter)

int	rtw_hal_init_recv_priv(struct adapter *padapter)

{

	struct recv_priv	*precvpriv = &padapter->recvpriv;

	int	i, res = _SUCCESS;

drivers/staging/rtl8188eu/hal/usb_halinit.c

+0 −2
Original line number Diff line number Diff line
@@ -2070,7 +2070,5 @@ void rtl8188eu_set_hal_ops(struct adapter *adapt) 


	halfunc->init_xmit_priv = &rtl8188eu_init_xmit_priv;



	halfunc->init_recv_priv = &rtl8188eu_init_recv_priv;



	rtl8188e_set_hal_ops(halfunc);

}

drivers/staging/rtl8188eu/include/hal_intf.h

+1 −3
Original line number Diff line number Diff line
@@ -151,8 +151,6 @@ struct hal_ops { 


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



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



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

	void	(*read_chip_version)(struct adapter *padapter);
@@ -244,7 +242,7 @@ s32 rtw_hal_mgnt_xmit(struct adapter *padapter, 


s32	rtw_hal_init_xmit_priv(struct adapter *padapter);



s32	rtw_hal_init_recv_priv(struct adapter *padapter);

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

drivers/staging/rtl8188eu/include/rtl8188e_recv.h

+0 −1
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ enum rx_packet_type { 
};



#define INTERRUPT_MSG_FORMAT_LEN 60

s32 rtl8188eu_init_recv_priv(struct adapter *padapter);

void rtl8188eu_recv_hdl(struct adapter *padapter, struct recv_buf *precvbuf);

void rtl8188eu_recv_tasklet(void *priv);

void rtl8188e_query_rx_phy_status(struct recv_frame *fr, struct phy_stat *phy);