staging: r8188eu: rename ReadChipVersion8188E to rtw_hal_read_chip_version

And remove two one-line wrappers.

Signed-off-by: Ivan Safonov <insafonov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8188eu/hal/hal_intf.c b/drivers/staging/rtl8188eu/hal/hal_intf.c
index daed450cf880e7606f690f02d0bf6360c2ca0133..bc253f402d9afad35ff5aa3b73953c0efb36ab19 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/hal_intf.c
+++ b/drivers/staging/rtl8188eu/hal/hal_intf.c
@@ -19,12 +19,6 @@
 #include <hal_intf.h>
 #include <usb_hal.h>
 
-void rtw_hal_read_chip_version(struct adapter *adapt)
-{
-       if (adapt->HalFunc.read_chip_version)
-               adapt->HalFunc.read_chip_version(adapt);
-}
-
 void rtw_hal_free_data(struct adapter *adapt)
 {
        if (adapt->HalFunc.free_hal_data)

diff --git a/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c b/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
index 75eda92306a5c64bc940032f0a422177e7aa38ea..8c9fdfbc66b5887c8e6c007bb45739a4d5246625 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
+++ b/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
@@ -123,7 +123,7 @@ static void rtl8188e_free_hal_data(struct adapter *padapter)
        padapter->HalData = NULL;
 }
 
-static void ReadChipVersion8188E(struct adapter *padapter)
+void rtw_hal_read_chip_version(struct adapter *padapter)
 {
        u32                             value32;
        struct HAL_VERSION              ChipVersion;
@@ -190,8 +190,6 @@ void rtl8188e_set_hal_ops(struct hal_ops *pHalFunc)
        pHalFunc->free_hal_data = &rtl8188e_free_hal_data;
 
        pHalFunc->dm_init = &rtl8188e_init_dm_priv;
-
-       pHalFunc->read_chip_version = &ReadChipVersion8188E;
 }
 
 /*  */

diff --git a/drivers/staging/rtl8188eu/include/hal_intf.h b/drivers/staging/rtl8188eu/include/hal_intf.h
index d3243efd0a60fc1df4627722317d0843f6f11379..b0ade594975c060e190c9d2417daa9f4eae2e968 100644 (file)
--- a/drivers/staging/rtl8188eu/include/hal_intf.h
+++ b/drivers/staging/rtl8188eu/include/hal_intf.h
@@ -143,7 +143,6 @@ struct hal_ops {
        void    (*free_hal_data)(struct adapter *padapter);
 
        void    (*dm_init)(struct adapter *padapter);
-       void    (*read_chip_version)(struct adapter *padapter);
 
        s32     (*interrupt_handler)(struct adapter *padapter);