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

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

staging: r8188eu: rename sreset_init_value to rtw_hal_sreset_init 



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 35e224f3

drivers/staging/rtl8188eu/core/rtw_sreset.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -16,7 +16,7 @@ 
#include <rtw_sreset.h>

#include <rtw_sreset.h>

#include <usb_ops_linux.h>

#include <usb_ops_linux.h>





void sreset_init_value(struct adapter *padapter)

void rtw_hal_sreset_init(struct adapter *padapter)

{

{

	struct hal_data_8188e	*pHalData = GET_HAL_DATA(padapter);

	struct hal_data_8188e	*pHalData = GET_HAL_DATA(padapter);

	struct sreset_priv *psrtpriv = &pHalData->srestpriv;

	struct sreset_priv *psrtpriv = &pHalData->srestpriv;

drivers/staging/rtl8188eu/hal/hal_intf.c

+0 −6
Original line number Original line Diff line number Diff line
@@ -150,12 +150,6 @@ void rtw_hal_antdiv_rssi_compared(struct adapter *adapt, 
		adapt->HalFunc.AntDivCompareHandler(adapt, dst, src);

		adapt->HalFunc.AntDivCompareHandler(adapt, dst, src);

}

}





void rtw_hal_sreset_init(struct adapter *adapt)

{

	if (adapt->HalFunc.sreset_init_value)

		adapt->HalFunc.sreset_init_value(adapt);

}



void rtw_hal_reset_security_engine(struct adapter *adapter)

void rtw_hal_reset_security_engine(struct adapter *adapter)

{

{

	if (adapter->HalFunc.hal_reset_security_engine)

	if (adapter->HalFunc.hal_reset_security_engine)

drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -203,8 +203,6 @@ void rtl8188e_set_hal_ops(struct hal_ops *pHalFunc) 
	pHalFunc->AntDivBeforeLinkHandler = &AntDivBeforeLink8188E;

	pHalFunc->AntDivBeforeLinkHandler = &AntDivBeforeLink8188E;

	pHalFunc->AntDivCompareHandler = &AntDivCompare8188E;

	pHalFunc->AntDivCompareHandler = &AntDivCompare8188E;

	pHalFunc->read_rfreg = &phy_query_rf_reg;

	pHalFunc->read_rfreg = &phy_query_rf_reg;



	pHalFunc->sreset_init_value = &sreset_init_value;

}

}





/*  */

/*  */

drivers/staging/rtl8188eu/include/hal_intf.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -165,8 +165,6 @@ struct hal_ops { 
			      enum rf_radio_path eRFPath, u32 RegAddr,

			      enum rf_radio_path eRFPath, u32 RegAddr,

			      u32 BitMask);

			      u32 BitMask);





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



	void (*hal_reset_security_engine)(struct adapter *adapter);

	void (*hal_reset_security_engine)(struct adapter *adapter);

};

};

drivers/staging/rtl8188eu/include/rtw_sreset.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -33,7 +33,6 @@ struct sreset_priv { 
#define	WIFI_RX_HANG			BIT(5)

#define	WIFI_RX_HANG			BIT(5)

#define		WIFI_IF_NOT_EXIST	BIT(6)

#define		WIFI_IF_NOT_EXIST	BIT(6)





void sreset_init_value(struct adapter *padapter);

u8 sreset_get_wifi_status(struct adapter *padapter);

u8 sreset_get_wifi_status(struct adapter *padapter);

void sreset_set_wifi_error_status(struct adapter *padapter, u32 status);

void sreset_set_wifi_error_status(struct adapter *padapter, u32 status);