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

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

staging: r8188eu: rename rtl8188e_HalDmWatchDog to rtw_hal_dm_watchdog 



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 c8059764

drivers/staging/rtl8188eu/hal/hal_intf.c

+0 −6
Original line number Diff line number Diff line
@@ -110,12 +110,6 @@ void rtw_hal_set_chan(struct adapter *adapt, u8 channel) 
		adapt->HalFunc.set_channel_handler(adapt, channel);

}



void rtw_hal_dm_watchdog(struct adapter *adapt)

{

	if (adapt->HalFunc.hal_dm_watchdog)

		adapt->HalFunc.hal_dm_watchdog(adapt);

}



void rtw_hal_reset_security_engine(struct adapter *adapter)

{

	if (adapter->HalFunc.hal_reset_security_engine)

drivers/staging/rtl8188eu/hal/rtl8188e_dm.c

+1 −1
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ void rtl8188e_InitHalDm(struct adapter *Adapter) 
	ODM_DMInit(dm_odm);

}



void rtl8188e_HalDmWatchDog(struct adapter *Adapter)

void rtw_hal_dm_watchdog(struct adapter *Adapter)

{

	u8 hw_init_completed = false;

	struct hal_data_8188e *hal_data = GET_HAL_DATA(Adapter);

drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c

+0 −2
Original line number Diff line number Diff line
@@ -195,8 +195,6 @@ void rtl8188e_set_hal_ops(struct hal_ops *pHalFunc) 


	pHalFunc->set_bwmode_handler = &phy_set_bw_mode;

	pHalFunc->set_channel_handler = &phy_sw_chnl;



	pHalFunc->hal_dm_watchdog = &rtl8188e_HalDmWatchDog;

}



/*  */

drivers/staging/rtl8188eu/include/hal_intf.h

+0 −2
Original line number Diff line number Diff line
@@ -152,8 +152,6 @@ struct hal_ops { 
				      u8 Offset);

	void	(*set_channel_handler)(struct adapter *padapter, u8 channel);



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



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

};

drivers/staging/rtl8188eu/include/rtl8188e_dm.h

+0 −1
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ struct dm_priv { 


void rtl8188e_init_dm_priv(struct adapter *adapt);

void rtl8188e_InitHalDm(struct adapter *adapt);

void rtl8188e_HalDmWatchDog(struct adapter *adapt);



void AntDivCompare8188E(struct adapter *adapt, struct wlan_bssid_ex *dst,

			struct wlan_bssid_ex *src);