From: Jes Sorensen <Jes.Sorensen@redhat.com>
Date: Fri, 16 May 2014 08:03:57 +0000 (+0200)
Subject: staging: rtl8723au: Call rtl8723a_init_default_value_directly()
X-Git-Tag: next-20140519~19^2~145
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=03722621d2d2313a068aa06b21bcc32fafa4b527;p=karo-tx-linux.git

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: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/rtl8723au/hal/hal_intf.c b/drivers/staging/rtl8723au/hal/hal_intf.c
index afd4e1f9b079..dff5f02b537c 100644
--- a/drivers/staging/rtl8723au/hal/hal_intf.c
+++ b/drivers/staging/rtl8723au/hal/hal_intf.c
@@ -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)
diff --git a/drivers/staging/rtl8723au/hal/usb_halinit.c b/drivers/staging/rtl8723au/hal/usb_halinit.c
index ebdfcb7602d2..98abf549d3ab 100644
--- a/drivers/staging/rtl8723au/hal/usb_halinit.c
+++ b/drivers/staging/rtl8723au/hal/usb_halinit.c
@@ -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;
diff --git a/drivers/staging/rtl8723au/include/hal_intf.h b/drivers/staging/rtl8723au/include/hal_intf.h
index bf13a6a7b556..8a8f7931b04e 100644
--- a/drivers/staging/rtl8723au/include/hal_intf.h
+++ b/drivers/staging/rtl8723au/include/hal_intf.h
@@ -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);
diff --git a/drivers/staging/rtl8723au/os_dep/os_intfs.c b/drivers/staging/rtl8723au/os_dep/os_intfs.c
index ca95bd32c808..98c203dd3efd 100644
--- a/drivers/staging/rtl8723au/os_dep/os_intfs.c
+++ b/drivers/staging/rtl8723au/os_dep/os_intfs.c
@@ -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 */