staging: r8188eu: rename rtl8188eu_interface_configure to rtw_hal_chip_configure

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 fc34f6e99c8d4d7540034ce2081da0d3fe1f82bf..214b978102149406ff7b22d1596f807c5881460b 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_chip_configure(struct adapter *adapt)
-{
-       if (adapt->HalFunc.intf_chip_configure)
-               adapt->HalFunc.intf_chip_configure(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 8968df74e9ba78040138b860d31db33de7b720fd..ff4e95d32dde9ee13997895fdb53ebfcd8251825 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/usb_halinit.c
+++ b/drivers/staging/rtl8188eu/hal/usb_halinit.c
@@ -69,7 +69,7 @@ static bool HalUsbSetQueuePipeMapping8188EUsb(struct adapter *adapt, u8 NumInPip
        return result;
 }
 
-static void rtl8188eu_interface_configure(struct adapter *adapt)
+void rtw_hal_chip_configure(struct adapter *adapt)
 {
        struct hal_data_8188e   *haldata        = GET_HAL_DATA(adapt);
        struct dvobj_priv       *pdvobjpriv = adapter_to_dvobj(adapt);
@@ -2076,7 +2076,6 @@ void rtl8188eu_set_hal_ops(struct adapter *adapt)
        halfunc->DeInitSwLeds = &rtl8188eu_DeInitSwLeds;
 
        halfunc->init_default_value = &rtl8188eu_init_default_value;
-       halfunc->intf_chip_configure = &rtl8188eu_interface_configure;
 
        rtl8188e_set_hal_ops(halfunc);
 }

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