staging:r8188eu: remove intf_stop member of adapter structure

call usb_intf_stop directly.

Signed-off-by: Ivan Safonov <insafonov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8188eu/include/drv_types.h b/drivers/staging/rtl8188eu/include/drv_types.h
index 5eb56b1281d23dfcbf7b23efd5bdcd7e9619c8c0..e86419e525d869133be39cf5786984c61053b4c7 100644 (file)
--- a/drivers/staging/rtl8188eu/include/drv_types.h
+++ b/drivers/staging/rtl8188eu/include/drv_types.h
@@ -156,7 +156,6 @@ struct adapter {
        u8      hw_init_completed;
 
        void *cmdThread;
-       void (*intf_stop)(struct adapter *adapter);
        struct  net_device *pnetdev;
        struct  net_device *pmondev;
 

diff --git a/drivers/staging/rtl8188eu/include/hal_intf.h b/drivers/staging/rtl8188eu/include/hal_intf.h
index fa032b0c12ffe8704d73b8ff9c5fb2a537e78e21..e1114a95d442b4bc5a8d3afe2b1be6c5da350898 100644 (file)
--- a/drivers/staging/rtl8188eu/include/hal_intf.h
+++ b/drivers/staging/rtl8188eu/include/hal_intf.h
@@ -190,6 +190,7 @@ void rtw_hal_set_odm_var(struct adapter *padapter,
 
 u32    rtw_hal_inirp_init(struct adapter *padapter);
 void   rtw_hal_inirp_deinit(struct adapter *padapter);
+void usb_intf_stop(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/os_intfs.c b/drivers/staging/rtl8188eu/os_dep/os_intfs.c
index c933883ed2256b766c594272ff2135cde18cbcb4..8fc3fadf065f91183ab897b501c990d5024f96f7 100644 (file)
--- a/drivers/staging/rtl8188eu/os_dep/os_intfs.c
+++ b/drivers/staging/rtl8188eu/os_dep/os_intfs.c
@@ -709,8 +709,7 @@ void rtw_ips_dev_unload(struct adapter *padapter)
 
        rtw_hal_set_hwreg(padapter, HW_VAR_FIFO_CLEARN_UP, NULL);
 
-       if (padapter->intf_stop)
-               padapter->intf_stop(padapter);
+       usb_intf_stop(padapter);
 
        /* s5. */
        if (!padapter->bSurpriseRemoved)

diff --git a/drivers/staging/rtl8188eu/os_dep/usb_intf.c b/drivers/staging/rtl8188eu/os_dep/usb_intf.c
index 94dac53a48b79612e4d23e21689e0f3aabcfa958..c6316ffa64d38398f11ee400929b4db7a711a786 100644 (file)
--- a/drivers/staging/rtl8188eu/os_dep/usb_intf.c
+++ b/drivers/staging/rtl8188eu/os_dep/usb_intf.c
@@ -141,7 +141,7 @@ static void usb_dvobj_deinit(struct usb_interface *usb_intf)
 
 }
 
-static void usb_intf_stop(struct adapter *padapter)
+void usb_intf_stop(struct adapter *padapter)
 {
        RT_TRACE(_module_hci_intfs_c_, _drv_err_, ("+usb_intf_stop\n"));
 
@@ -174,8 +174,7 @@ static void rtw_dev_unload(struct adapter *padapter)
                if (padapter->xmitpriv.ack_tx)
                        rtw_ack_tx_done(&padapter->xmitpriv, RTW_SCTX_DONE_DRV_STOP);
                /* s3. */
-               if (padapter->intf_stop)
-                       padapter->intf_stop(padapter);
+               usb_intf_stop(padapter);
                /* s4. */
                if (!padapter->pwrctrlpriv.bInternalAutoSuspend)
                        rtw_stop_drv_threads(padapter);
@@ -357,8 +356,6 @@ static struct adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj,
        if (!padapter->HalData)
                DBG_88E("cant not alloc memory for HAL DATA\n");
 
-       padapter->intf_stop = &usb_intf_stop;
-
        /* step read_chip_version */
        rtw_hal_read_chip_version(padapter);