staging: r8188eu: rename rtl8188eu_InitSwLeds to rtw_hal_sw_led_init

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 f03da1c..afab835 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/hal_intf.c
+++ b/drivers/staging/rtl8188eu/hal/hal_intf.c
@@ -37,12 +37,6 @@ void rtw_hal_dm_init(struct adapter *adapt)
                adapt->HalFunc.dm_init(adapt);
 }
 
-void rtw_hal_sw_led_init(struct adapter *adapt)
-{
-       if (adapt->HalFunc.InitSwLeds)
-               adapt->HalFunc.InitSwLeds(adapt);
-}
-
 u32 rtw_hal_power_on(struct adapter *adapt)
 {
        if (adapt->HalFunc.hal_power_on)

diff --git a/drivers/staging/rtl8188eu/hal/rtl8188eu_led.c b/drivers/staging/rtl8188eu/hal/rtl8188eu_led.c
index 694ce59..becf5b5 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/rtl8188eu_led.c
+++ b/drivers/staging/rtl8188eu/hal/rtl8188eu_led.c
@@ -66,7 +66,7 @@ exit:
 
 /*     Description: */
 /*             Initialize all LED_871x objects. */
-void rtl8188eu_InitSwLeds(struct adapter *padapter)
+void rtw_hal_sw_led_init(struct adapter *padapter)
 {
        struct led_priv *pledpriv = &(padapter->ledpriv);
        struct hal_data_8188e   *haldata = GET_HAL_DATA(padapter);

diff --git a/drivers/staging/rtl8188eu/hal/usb_halinit.c b/drivers/staging/rtl8188eu/hal/usb_halinit.c
index a4c6f06..662281d 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/usb_halinit.c
+++ b/drivers/staging/rtl8188eu/hal/usb_halinit.c
@@ -2072,7 +2072,6 @@ void rtl8188eu_set_hal_ops(struct adapter *adapt)
 
        halfunc->init_recv_priv = &rtl8188eu_init_recv_priv;
        halfunc->free_recv_priv = &rtl8188eu_free_recv_priv;
-       halfunc->InitSwLeds = &rtl8188eu_InitSwLeds;
 
        rtl8188e_set_hal_ops(halfunc);
 }

diff --git a/drivers/staging/rtl8188eu/include/hal_intf.h b/drivers/staging/rtl8188eu/include/hal_intf.h
index cc8fadd..6cddfd4 100644 (file)
--- a/drivers/staging/rtl8188eu/include/hal_intf.h
+++ b/drivers/staging/rtl8188eu/include/hal_intf.h
@@ -154,8 +154,6 @@ struct hal_ops {
        s32     (*init_recv_priv)(struct adapter *padapter);
        void    (*free_recv_priv)(struct adapter *padapter);
 
-       void    (*InitSwLeds)(struct adapter *padapter);
-
        void    (*dm_init)(struct adapter *padapter);
        void    (*read_chip_version)(struct adapter *padapter);
 

diff --git a/drivers/staging/rtl8188eu/include/rtl8188e_led.h b/drivers/staging/rtl8188eu/include/rtl8188e_led.h
index ca71a0f..d1ad6aa 100644 (file)
--- a/drivers/staging/rtl8188eu/include/rtl8188e_led.h
+++ b/drivers/staging/rtl8188eu/include/rtl8188e_led.h
@@ -22,7 +22,6 @@
 /*  */
 /*  Interface to manipulate LED objects. */
 /*  */
-void rtl8188eu_InitSwLeds(struct adapter *padapter);
 void SwLedOn(struct adapter *padapter, struct LED_871x *pLed);
 void SwLedOff(struct adapter *padapter, struct LED_871x *pLed);