staging: r8188eu: rename usb_read_port_cancel to rtw_hal_inirp_deinit

And remove three 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 b1ab8e8..cd2869d 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/hal_intf.c
+++ b/drivers/staging/rtl8188eu/hal/hal_intf.c
@@ -104,14 +104,6 @@ u32 rtw_hal_inirp_init(struct adapter *adapt)
        return rst;
 }
 
-u32 rtw_hal_inirp_deinit(struct adapter *adapt)
-{
-       if (adapt->HalFunc.inirp_deinit)
-               return adapt->HalFunc.inirp_deinit(adapt);
-
-       return _FAIL;
-}
-
 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 d73f560..acb0628 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/usb_halinit.c
+++ b/drivers/staging/rtl8188eu/hal/usb_halinit.c
@@ -1029,17 +1029,6 @@ exit:
        return status;
 }
 
-static unsigned int rtl8188eu_inirp_deinit(struct adapter *Adapter)
-{
-       RT_TRACE(_module_hci_hal_init_c_, _drv_info_, ("\n ===> usb_rx_deinit\n"));
-
-       usb_read_port_cancel(Adapter);
-
-       RT_TRACE(_module_hci_hal_init_c_, _drv_info_, ("\n <=== usb_rx_deinit\n"));
-
-       return _SUCCESS;
-}
-
 /*  */
 /*  */
 /*     EEPROM/EFUSE Content Parsing */
@@ -2066,7 +2055,6 @@ void rtl8188eu_set_hal_ops(struct adapter *adapt)
        halfunc->hal_deinit = &rtl8188eu_hal_deinit;
 
        halfunc->inirp_init = &rtl8188eu_inirp_init;
-       halfunc->inirp_deinit = &rtl8188eu_inirp_deinit;
 
        rtl8188e_set_hal_ops(halfunc);
 }

diff --git a/drivers/staging/rtl8188eu/include/hal_intf.h b/drivers/staging/rtl8188eu/include/hal_intf.h
index f3c7e4c..c07f7f1 100644 (file)
--- a/drivers/staging/rtl8188eu/include/hal_intf.h
+++ b/drivers/staging/rtl8188eu/include/hal_intf.h
@@ -147,7 +147,6 @@ struct hal_ops {
        void    (*free_hal_data)(struct adapter *padapter);
 
        u32     (*inirp_init)(struct adapter *padapter);
-       u32     (*inirp_deinit)(struct adapter *padapter);
 
        void    (*dm_init)(struct adapter *padapter);
        void    (*read_chip_version)(struct adapter *padapter);
@@ -232,7 +231,7 @@ void rtw_hal_set_odm_var(struct adapter *padapter,
                         bool bSet);
 
 u32    rtw_hal_inirp_init(struct adapter *padapter);
-u32    rtw_hal_inirp_deinit(struct adapter *padapter);
+void   rtw_hal_inirp_deinit(struct adapter *padapter);
 
 s32    rtw_hal_xmit(struct adapter *padapter, struct xmit_frame *pxmitframe);
 s32    rtw_hal_mgnt_xmit(struct adapter *padapter,

diff --git a/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c b/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c
index 7f9fbe9..9359cc7 100644 (file)
--- a/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c
+++ b/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c
@@ -527,7 +527,7 @@ u32 usb_read_port(struct adapter *adapter, u32 addr, u32 cnt, u8 *rmem)
        return ret;
 }
 
-void usb_read_port_cancel(struct adapter *padapter)
+void rtw_hal_inirp_deinit(struct adapter *padapter)
 {
        int i;
        struct recv_buf *precvbuf;