staging: rtl8723au: Remove some more HAL clutter

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 dff5f02..77d38e8 100644 (file)
--- a/drivers/staging/rtl8723au/hal/hal_intf.c
+++ b/drivers/staging/rtl8723au/hal/hal_intf.c
@@ -27,12 +27,6 @@ void rtw_hal_chip_configure23a(struct rtw_adapter *padapter)
                padapter->HalFunc.intf_chip_configure(padapter);
 }
 
-void rtw_hal_read_chip_info23a(struct rtw_adapter *padapter)
-{
-       if (padapter->HalFunc.read_adapter_info)
-               padapter->HalFunc.read_adapter_info(padapter);
-}
-
 void rtw_hal_read_chip_version23a(struct rtw_adapter *padapter)
 {
        if (padapter->HalFunc.read_chip_version)

diff --git a/drivers/staging/rtl8723au/hal/usb_halinit.c b/drivers/staging/rtl8723au/hal/usb_halinit.c
index 98abf54..96be426 100644 (file)
--- a/drivers/staging/rtl8723au/hal/usb_halinit.c
+++ b/drivers/staging/rtl8723au/hal/usb_halinit.c
@@ -1462,11 +1462,13 @@ static void hal_EfuseCellSel(struct rtw_adapter *Adapter)
        rtw_write32(Adapter, EFUSE_TEST, value32);
 }
 
-static int _ReadAdapterInfo8723AU(struct rtw_adapter *Adapter)
+void rtl8723a_read_adapter_info(struct rtw_adapter *Adapter)
 {
-       /* struct hal_data_8723a        *pHalData = GET_HAL_DATA(Adapter); */
        unsigned long start = jiffies;
 
+       /*  Read EEPROM size before call any EEPROM function */
+       Adapter->EepromAddressSize = GetEEPROMSize8723A(Adapter);
+
        MSG_8723A("====> _ReadAdapterInfo8723AU\n");
 
        hal_EfuseCellSel(Adapter);
@@ -1483,16 +1485,6 @@ static int _ReadAdapterInfo8723AU(struct rtw_adapter *Adapter)
 
        MSG_8723A("<==== _ReadAdapterInfo8723AU in %d ms\n",
                  jiffies_to_msecs(jiffies - start));
-
-       return _SUCCESS;
-}
-
-static void ReadAdapterInfo8723AU(struct rtw_adapter *Adapter)
-{
-       /*  Read EEPROM size before call any EEPROM function */
-       Adapter->EepromAddressSize = GetEEPROMSize8723A(Adapter);
-
-       _ReadAdapterInfo8723AU(Adapter);
 }
 
 /*  */
@@ -1757,7 +1749,6 @@ int rtl8723au_set_hal_ops(struct rtw_adapter *padapter)
        pHalFunc->DeInitSwLeds = NULL;
 
        pHalFunc->intf_chip_configure = &rtl8723au_interface_configure;
-       pHalFunc->read_adapter_info = &ReadAdapterInfo8723AU;
        pHalFunc->GetHalDefVarHandler = &GetHalDefVar8192CUsb;
        pHalFunc->SetHalDefVarHandler = &SetHalDefVar8192CUsb;
        pHalFunc->UpdateRAMaskHandler = &UpdateHalRAMask8192CUsb;

diff --git a/drivers/staging/rtl8723au/include/hal_intf.h b/drivers/staging/rtl8723au/include/hal_intf.h
index 8a8f793..681e8f7 100644 (file)
--- a/drivers/staging/rtl8723au/include/hal_intf.h
+++ b/drivers/staging/rtl8723au/include/hal_intf.h
@@ -84,8 +84,6 @@ struct hal_ops {
 
        void (*intf_chip_configure)(struct rtw_adapter *padapter);
 
-       void (*read_adapter_info)(struct rtw_adapter *padapter);
-
        void (*enable_interrupt)(struct rtw_adapter *padapter);
        void (*disable_interrupt)(struct rtw_adapter *padapter);
        s32 (*interrupt_handler)(struct rtw_adapter *padapter);

diff --git a/drivers/staging/rtl8723au/include/rtl8723a_hal.h b/drivers/staging/rtl8723au/include/rtl8723a_hal.h
index 9eff12a..14cc238 100644 (file)
--- a/drivers/staging/rtl8723au/include/rtl8723a_hal.h
+++ b/drivers/staging/rtl8723au/include/rtl8723a_hal.h
@@ -546,4 +546,6 @@ void rtl8723a_stop_thread(struct rtw_adapter *padapter);
 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);
+
 #endif

diff --git a/drivers/staging/rtl8723au/os_dep/usb_intf.c b/drivers/staging/rtl8723au/os_dep/usb_intf.c
index c6cc335..09d0892 100644 (file)
--- a/drivers/staging/rtl8723au/os_dep/usb_intf.c
+++ b/drivers/staging/rtl8723au/os_dep/usb_intf.c
@@ -25,6 +25,7 @@
 #include <usb_ops.h>
 #include <usb_osintf.h>
 #include <usb_hal.h>
+#include <rtl8723a_hal.h>
 
 static int rtw_suspend(struct usb_interface *intf, pm_message_t message);
 static int rtw_resume(struct usb_interface *intf);
@@ -631,7 +632,7 @@ static struct rtw_adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj,
        rtw_hal_chip_configure23a(padapter);
 
        /* step read efuse/eeprom data and get mac_addr */
-       rtw_hal_read_chip_info23a(padapter);
+       rtl8723a_read_adapter_info(padapter);
 
        /* step 5. */
        if (rtw_init_drv_sw23a(padapter) == _FAIL) {