staging: r8188eu: remove inirp_deinit from struct hal_ops

Remove inirp_deinit from struct hal_ops and remove the wrappers
rtw_hal_inirp_deinit() and rtl8188eu_inirp_deinit(). Call
rtw_read_port_cancel() directly instead.

Signed-off-by: Michael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20210929192657.9569-8-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/r8188eu/hal/hal_intf.c b/drivers/staging/r8188eu/hal/hal_intf.c
index ca7f0bcdb4d5fae475dad5d1e29d31051485da1a..2e72848079e2efccbb2791d12bdc28bef0a1fe5b 100644 (file)
--- a/drivers/staging/r8188eu/hal/hal_intf.c
+++ b/drivers/staging/r8188eu/hal/hal_intf.c
@@ -53,14 +53,6 @@ void rtw_hal_get_hwreg(struct adapter *adapt, u8 variable, u8 *val)
                adapt->HalFunc.GetHwRegHandler(adapt, variable, val);
 }
 
-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/r8188eu/hal/usb_halinit.c b/drivers/staging/r8188eu/hal/usb_halinit.c
index 6211589009189c9d9a1983355858183f7dc93ff9..83813388de24fa0ca9b765a36b66f381a249662e 100644 (file)
--- a/drivers/staging/r8188eu/hal/usb_halinit.c
+++ b/drivers/staging/r8188eu/hal/usb_halinit.c
@@ -1024,13 +1024,6 @@ exit:
        return status;
 }
 
-static unsigned int rtl8188eu_inirp_deinit(struct adapter *Adapter)
-{
-       rtw_read_port_cancel(Adapter);
-
-       return _SUCCESS;
-}
-
 /*  */
 /*  */
 /*     EEPROM/EFUSE Content Parsing */
@@ -2150,8 +2143,6 @@ void rtl8188eu_set_hal_ops(struct adapter *adapt)
        halfunc->hal_init = &rtl8188eu_hal_init;
        halfunc->hal_deinit = &rtl8188eu_hal_deinit;
 
-       halfunc->inirp_deinit = &rtl8188eu_inirp_deinit;
-
        halfunc->SetHwRegHandler = &SetHwReg8188EU;
        halfunc->GetHwRegHandler = &GetHwReg8188EU;
 }

diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r8188eu/include/hal_intf.h
index 4eb9fb81f1685070d191a01a13b59185608b563f..29ca90a86844d289fbcaf735d00dedeb4675a8fd 100644 (file)
--- a/drivers/staging/r8188eu/include/hal_intf.h
+++ b/drivers/staging/r8188eu/include/hal_intf.h
@@ -125,8 +125,6 @@ struct hal_ops {
        u32     (*hal_init)(struct adapter *padapter);
        u32     (*hal_deinit)(struct adapter *padapter);
 
-       u32     (*inirp_deinit)(struct adapter *padapter);
-
        void    (*SetHwRegHandler)(struct adapter *padapter, u8 variable,
                                   u8 *val);
        void    (*GetHwRegHandler)(struct adapter *padapter, u8 variable,
@@ -181,8 +179,6 @@ void rtw_hal_stop(struct adapter *padapter);
 void rtw_hal_set_hwreg(struct adapter *padapter, u8 variable, u8 *val);
 void rtw_hal_get_hwreg(struct adapter *padapter, u8 variable, u8 *val);
 
-u32    rtw_hal_inirp_deinit(struct adapter *padapter);
-
 void rtw_hal_update_ra_mask(struct adapter *padapter, u32 mac_id, u8 level);
 void   rtw_hal_clone_data(struct adapter *dst_adapt,
                           struct adapter *src_adapt);

diff --git a/drivers/staging/r8188eu/os_dep/usb_intf.c b/drivers/staging/r8188eu/os_dep/usb_intf.c
index a36398774ee5c9061ce3810fecf1193c23ff919b..b5e0c6561108c61505cf9eefaf729a6f39e9b7b2 100644 (file)
--- a/drivers/staging/r8188eu/os_dep/usb_intf.c
+++ b/drivers/staging/r8188eu/os_dep/usb_intf.c
@@ -186,7 +186,7 @@ static void usb_intf_start(struct adapter *padapter)
 static void usb_intf_stop(struct adapter *padapter)
 {
        /* cancel in irp */
-       rtw_hal_inirp_deinit(padapter);
+       rtw_read_port_cancel(padapter);
 
        /* cancel out irp */
        rtw_write_port_cancel(padapter);