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

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
......@@ -39,11 +39,6 @@ void rtw_hal_read_chip_version23a(struct rtw_adapter *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)
{
if (padapter->HalFunc.free_hal_data)
......
......@@ -1733,11 +1733,6 @@ static void UpdateHalRAMask8192CUsb(struct rtw_adapter *padapter,
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)
{
struct hal_ops *pHalFunc = &padapter->HalFunc;
......@@ -1761,7 +1756,6 @@ int rtl8723au_set_hal_ops(struct rtw_adapter *padapter)
pHalFunc->InitSwLeds = NULL;
pHalFunc->DeInitSwLeds = NULL;
pHalFunc->init_default_value = &rtl8723au_init_default_value;
pHalFunc->intf_chip_configure = &rtl8723au_interface_configure;
pHalFunc->read_adapter_info = &ReadAdapterInfo8723AU;
pHalFunc->GetHalDefVarHandler = &GetHalDefVar8192CUsb;
......
......@@ -82,8 +82,6 @@ struct hal_ops {
void (*dm_deinit)(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 (*read_adapter_info)(struct rtw_adapter *padapter);
......
......@@ -22,6 +22,8 @@
#include <rtw_version.h>
#include <usb_osintf.h>
#include <rtl8723a_hal.h>
#include <linux/version.h>
MODULE_LICENSE("GPL");
......@@ -419,7 +421,7 @@ static u8 rtw_init_default_value(struct rtw_adapter *padapter)
rtw_update_registrypriv_dev_network23a(padapter);
/* hal_priv */
rtw_hal_def_value_init23a(padapter);
rtl8723a_init_default_value(padapter);
/* misc. */
padapter->bReadPortCancel = false;
......@@ -435,7 +437,7 @@ u8 rtw_reset_drv_sw23a(struct rtw_adapter *padapter)
u8 ret8 = _SUCCESS;
/* hal_priv */
rtw_hal_def_value_init23a(padapter);
rtl8723a_init_default_value(padapter);
padapter->bReadPortCancel = false;
padapter->bWritePortCancel = false;
pmlmepriv->scan_interval = SCAN_INTERVAL;/* 30*2 sec = 60sec */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment