staging: r8188eu: rename rtl8188eu_inirp_init to rtw_hal_inirp_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 cd2869d..88c380a 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/hal_intf.c
+++ b/drivers/staging/rtl8188eu/hal/hal_intf.c
@@ -93,17 +93,6 @@ void rtw_hal_set_odm_var(struct adapter *adapt,
                                                      val1, set);
 }
 
-u32 rtw_hal_inirp_init(struct adapter *adapt)
-{
-       u32 rst = _FAIL;
-
-       if (adapt->HalFunc.inirp_init)
-               rst = adapt->HalFunc.inirp_init(adapt);
-       else
-               DBG_88E(" %s HalFunc.inirp_init is NULL!!!\n", __func__);
-       return rst;
-}
-
 void rtw_hal_update_ra_mask(struct adapter *adapt, u32 mac_id, u8 rssi_level)
 {
        struct mlme_priv *pmlmepriv = &(adapt->mlmepriv);

diff --git a/drivers/staging/rtl8188eu/hal/usb_halinit.c b/drivers/staging/rtl8188eu/hal/usb_halinit.c
index acb0628..3cfa5c2 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/usb_halinit.c
+++ b/drivers/staging/rtl8188eu/hal/usb_halinit.c
@@ -994,7 +994,7 @@ static u32 rtl8188eu_hal_deinit(struct adapter *Adapter)
        return _SUCCESS;
 }
 
-static unsigned int rtl8188eu_inirp_init(struct adapter *Adapter)
+u32 rtw_hal_inirp_init(struct adapter *Adapter)
 {
        u8 i;
        struct recv_buf *precvbuf;
@@ -2054,7 +2054,5 @@ void rtl8188eu_set_hal_ops(struct adapter *adapt)
        halfunc->hal_init = &rtl8188eu_hal_init;
        halfunc->hal_deinit = &rtl8188eu_hal_deinit;
 
-       halfunc->inirp_init = &rtl8188eu_inirp_init;
-
        rtl8188e_set_hal_ops(halfunc);
 }

diff --git a/drivers/staging/rtl8188eu/include/hal_intf.h b/drivers/staging/rtl8188eu/include/hal_intf.h
index c07f7f1..c94a377 100644 (file)
--- a/drivers/staging/rtl8188eu/include/hal_intf.h
+++ b/drivers/staging/rtl8188eu/include/hal_intf.h
@@ -146,8 +146,6 @@ struct hal_ops {
 
        void    (*free_hal_data)(struct adapter *padapter);
 
-       u32     (*inirp_init)(struct adapter *padapter);
-
        void    (*dm_init)(struct adapter *padapter);
        void    (*read_chip_version)(struct adapter *padapter);