From: Jes Sorensen <Jes.Sorensen@redhat.com>
Date: Fri, 16 May 2014 08:04:02 +0000 (+0200)
Subject: staging: rtl8723au: Remove HAL notch_filter wrappers
X-Git-Tag: android-x86-4.4-r2~703^2~39^2~822
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=369074f07163291e35252a7b8657b639acd9a8f9;p=android-x86%2Fkernel.git

staging: rtl8723au: Remove HAL notch_filter wrappers

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 24a39e6fbd1e..2b74fb7be6d9 100644
--- a/drivers/staging/rtl8723au/hal/hal_intf.c
+++ b/drivers/staging/rtl8723au/hal/hal_intf.c
@@ -20,6 +20,7 @@
 #include <hal_intf.h>
 
 #include <usb_hal.h>
+#include <rtl8723a_hal.h>
 
 void rtw_hal_chip_configure23a(struct rtw_adapter *padapter)
 {
@@ -69,7 +70,7 @@ uint	 rtw_hal_init23a(struct rtw_adapter *padapter)
 		padapter->hw_init_completed = true;
 
 		if (padapter->registrypriv.notch_filter == 1)
-			rtw_hal_notch_filter23a(padapter, 1);
+			rtl8723a_notch_filter(padapter, 1);
 	} else {
 		padapter->hw_init_completed = false;
 		DBG_8723A("rtw_hal_init23a: hal__init fail\n");
@@ -265,9 +266,3 @@ void rtw_hal_bcn_related_reg_setting23a(struct rtw_adapter *padapter)
 	if (padapter->HalFunc.SetBeaconRelatedRegistersHandler)
 		padapter->HalFunc.SetBeaconRelatedRegistersHandler(padapter);
 }
-
-void rtw_hal_notch_filter23a(struct rtw_adapter *adapter, bool enable)
-{
-	if (adapter->HalFunc.hal_notch_filter)
-		adapter->HalFunc.hal_notch_filter(adapter, enable);
-}
diff --git a/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c b/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
index 71cf14320956..758ee178c7e9 100644
--- a/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
+++ b/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
@@ -1639,7 +1639,7 @@ static void rtl8723a_SetHalODMVar(struct rtw_adapter *Adapter,
 	}
 }
 
-static void hal_notch_filter_8723a(struct rtw_adapter *adapter, bool enable)
+void rtl8723a_notch_filter(struct rtw_adapter *adapter, bool enable)
 {
 	if (enable) {
 		DBG_8723A("Enable notch filter\n");
@@ -1748,8 +1748,6 @@ void rtl8723a_set_hal_ops(struct hal_ops *pHalFunc)
 
 	pHalFunc->GetHalODMVarHandler = &rtl8723a_GetHalODMVar;
 	pHalFunc->SetHalODMVarHandler = &rtl8723a_SetHalODMVar;
-
-	pHalFunc->hal_notch_filter = &hal_notch_filter_8723a;
 }
 
 void rtl8723a_InitAntenna_Selection(struct rtw_adapter *padapter)
diff --git a/drivers/staging/rtl8723au/include/hal_intf.h b/drivers/staging/rtl8723au/include/hal_intf.h
index 31d9a7515805..2645b649a9e0 100644
--- a/drivers/staging/rtl8723au/include/hal_intf.h
+++ b/drivers/staging/rtl8723au/include/hal_intf.h
@@ -138,8 +138,6 @@ struct hal_ops {
 					   u8 *data);
 	bool (*Efuse_PgPacketWrite23a_BT)(struct rtw_adapter *padapter,
 					  u8 offset, u8 word_en, u8 *data);
-
-	void (*hal_notch_filter)(struct rtw_adapter *adapter, bool enable);
 };
 
 enum rt_eeprom_type {
@@ -246,8 +244,6 @@ void	rtw_hal_set_bwmode23a(struct rtw_adapter *padapter,
 			   enum ht_channel_width Bandwidth, u8 Offset);
 void	rtw_hal_set_chan23a(struct rtw_adapter *padapter, u8 channel);
 
-void rtw_hal_notch_filter23a(struct rtw_adapter *adapter, bool enable);
-
 void hw_var_set_correct_tsf(struct rtw_adapter *padapter);
 void hw_var_set_mlme_disconnect(struct rtw_adapter *padapter);
 void hw_var_set_opmode(struct rtw_adapter *padapter, u8 mode);
diff --git a/drivers/staging/rtl8723au/include/rtl8723a_hal.h b/drivers/staging/rtl8723au/include/rtl8723a_hal.h
index 14cc238882fa..88a79dfb87c5 100644
--- a/drivers/staging/rtl8723au/include/rtl8723a_hal.h
+++ b/drivers/staging/rtl8723au/include/rtl8723a_hal.h
@@ -547,5 +547,6 @@ s32 c2h_id_filter_ccx_8723a(u8 id);
 s32 c2h_handler_8723a(struct rtw_adapter *padapter, struct c2h_evt_hdr *c2h_evt);
 
 void rtl8723a_read_adapter_info(struct rtw_adapter *Adapter);
+void rtl8723a_notch_filter(struct rtw_adapter *adapter, bool enable);
 
 #endif