staging: r8188eu: rename _ReadAdapterInfo8188EU to rtw_hal_read_chip_info

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 373d788eff796689352996fb1e859dffad251f27..fc34f6e99c8d4d7540034ce2081da0d3fe1f82bf 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/hal_intf.c
+++ b/drivers/staging/rtl8188eu/hal/hal_intf.c
@@ -25,12 +25,6 @@ void rtw_hal_chip_configure(struct adapter *adapt)
                adapt->HalFunc.intf_chip_configure(adapt);
 }
 
-void rtw_hal_read_chip_info(struct adapter *adapt)
-{
-       if (adapt->HalFunc.read_adapter_info)
-               adapt->HalFunc.read_adapter_info(adapt);
-}
-
 void rtw_hal_read_chip_version(struct adapter *adapt)
 {
        if (adapt->HalFunc.read_chip_version)

diff --git a/drivers/staging/rtl8188eu/hal/usb_halinit.c b/drivers/staging/rtl8188eu/hal/usb_halinit.c
index 40654161087947de7f43bb46ae9bdcd66ef80214..8968df74e9ba78040138b860d31db33de7b720fd 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/usb_halinit.c
+++ b/drivers/staging/rtl8188eu/hal/usb_halinit.c
@@ -1137,7 +1137,7 @@ static void _ReadRFType(struct adapter *Adapter)
        haldata->rf_chip = RF_6052;
 }
 
-static void _ReadAdapterInfo8188EU(struct adapter *Adapter)
+void rtw_hal_read_chip_info(struct adapter *Adapter)
 {
        unsigned long start = jiffies;
 
@@ -2077,7 +2077,6 @@ void rtl8188eu_set_hal_ops(struct adapter *adapt)
 
        halfunc->init_default_value = &rtl8188eu_init_default_value;
        halfunc->intf_chip_configure = &rtl8188eu_interface_configure;
-       halfunc->read_adapter_info = &_ReadAdapterInfo8188EU;
 
        rtl8188e_set_hal_ops(halfunc);
 }

diff --git a/drivers/staging/rtl8188eu/include/hal_intf.h b/drivers/staging/rtl8188eu/include/hal_intf.h
index 5ab50ab91d84c4ee8c9915ce4e3af51399cc1eb1..a95f3e7a24e1a80409ac58b9e26cfb194965d2ae 100644 (file)
--- a/drivers/staging/rtl8188eu/include/hal_intf.h
+++ b/drivers/staging/rtl8188eu/include/hal_intf.h
@@ -164,8 +164,6 @@ struct hal_ops {
 
        void    (*intf_chip_configure)(struct adapter *padapter);
 
-       void    (*read_adapter_info)(struct adapter *padapter);
-
        s32     (*interrupt_handler)(struct adapter *padapter);
 
        void    (*set_bwmode_handler)(struct adapter *padapter,