Commit 03722621 authored by Jes Sorensen's avatar Jes Sorensen Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723au: Call rtl8723a_init_default_value_directly() 



We really don't need two layers of silly indirection to call this
function.

Signed-off-by: default avatarJes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d87283ff

drivers/staging/rtl8723au/hal/hal_intf.c

+0 −5
Original line number Original line Diff line number Diff line
@@ -39,11 +39,6 @@ void rtw_hal_read_chip_version23a(struct rtw_adapter *padapter) 
		padapter->HalFunc.read_chip_version(padapter);

		padapter->HalFunc.read_chip_version(padapter);

}

}





void rtw_hal_def_value_init23a(struct rtw_adapter *padapter)

{

	if (padapter->HalFunc.init_default_value)

		padapter->HalFunc.init_default_value(padapter);

}

void	rtw_hal_free_data23a(struct rtw_adapter *padapter)

void	rtw_hal_free_data23a(struct rtw_adapter *padapter)

{

{

	if (padapter->HalFunc.free_hal_data)

	if (padapter->HalFunc.free_hal_data)

drivers/staging/rtl8723au/hal/usb_halinit.c

+0 −6
Original line number Original line Diff line number Diff line
@@ -1733,11 +1733,6 @@ static void UpdateHalRAMask8192CUsb(struct rtw_adapter *padapter, 
	pdmpriv->INIDATA_RATE[mac_id] = init_rate;

	pdmpriv->INIDATA_RATE[mac_id] = init_rate;

}

}





static void rtl8723au_init_default_value(struct rtw_adapter *padapter)

{

	rtl8723a_init_default_value(padapter);

}



int rtl8723au_set_hal_ops(struct rtw_adapter *padapter)

int rtl8723au_set_hal_ops(struct rtw_adapter *padapter)

{

{

	struct hal_ops	*pHalFunc = &padapter->HalFunc;

	struct hal_ops	*pHalFunc = &padapter->HalFunc;
@@ -1761,7 +1756,6 @@ int rtl8723au_set_hal_ops(struct rtw_adapter *padapter) 
	pHalFunc->InitSwLeds = NULL;

	pHalFunc->InitSwLeds = NULL;

	pHalFunc->DeInitSwLeds = NULL;

	pHalFunc->DeInitSwLeds = NULL;





	pHalFunc->init_default_value = &rtl8723au_init_default_value;

	pHalFunc->intf_chip_configure = &rtl8723au_interface_configure;

	pHalFunc->intf_chip_configure = &rtl8723au_interface_configure;

	pHalFunc->read_adapter_info = &ReadAdapterInfo8723AU;

	pHalFunc->read_adapter_info = &ReadAdapterInfo8723AU;

	pHalFunc->GetHalDefVarHandler = &GetHalDefVar8192CUsb;

	pHalFunc->GetHalDefVarHandler = &GetHalDefVar8192CUsb;

drivers/staging/rtl8723au/include/hal_intf.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -82,8 +82,6 @@ struct hal_ops { 
	void (*dm_deinit)(struct rtw_adapter *padapter);

	void (*dm_deinit)(struct rtw_adapter *padapter);

	void (*read_chip_version)(struct rtw_adapter *padapter);

	void (*read_chip_version)(struct rtw_adapter *padapter);





	void (*init_default_value)(struct rtw_adapter *padapter);



	void (*intf_chip_configure)(struct rtw_adapter *padapter);

	void (*intf_chip_configure)(struct rtw_adapter *padapter);





	void (*read_adapter_info)(struct rtw_adapter *padapter);

	void (*read_adapter_info)(struct rtw_adapter *padapter);

drivers/staging/rtl8723au/os_dep/os_intfs.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -22,6 +22,8 @@ 
#include <rtw_version.h>

#include <rtw_version.h>





#include <usb_osintf.h>

#include <usb_osintf.h>

#include <rtl8723a_hal.h>



#include <linux/version.h>

#include <linux/version.h>





MODULE_LICENSE("GPL");

MODULE_LICENSE("GPL");
@@ -419,7 +421,7 @@ static u8 rtw_init_default_value(struct rtw_adapter *padapter) 
	rtw_update_registrypriv_dev_network23a(padapter);

	rtw_update_registrypriv_dev_network23a(padapter);





	/* hal_priv */

	/* hal_priv */

	rtw_hal_def_value_init23a(padapter);

	rtl8723a_init_default_value(padapter);





	/* misc. */

	/* misc. */

	padapter->bReadPortCancel = false;

	padapter->bReadPortCancel = false;
@@ -435,7 +437,7 @@ u8 rtw_reset_drv_sw23a(struct rtw_adapter *padapter) 
	u8 ret8 = _SUCCESS;

	u8 ret8 = _SUCCESS;





	/* hal_priv */

	/* hal_priv */

	rtw_hal_def_value_init23a(padapter);

	rtl8723a_init_default_value(padapter);

	padapter->bReadPortCancel = false;

	padapter->bReadPortCancel = false;

	padapter->bWritePortCancel = false;

	padapter->bWritePortCancel = false;

	pmlmepriv->scan_interval = SCAN_INTERVAL;/*  30*2 sec = 60sec */

	pmlmepriv->scan_interval = SCAN_INTERVAL;/*  30*2 sec = 60sec */