Commit fd5d86d2 authored by Ivan Safonov's avatar Ivan Safonov Committed by Greg Kroah-Hartman

staging:r8188eu: remove intf_stop member of adapter structure

call usb_intf_stop directly.
Signed-off-by: default avatarIvan Safonov <insafonov@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 94b6a662
...@@ -156,7 +156,6 @@ struct adapter { ...@@ -156,7 +156,6 @@ struct adapter {
u8 hw_init_completed; u8 hw_init_completed;
void *cmdThread; void *cmdThread;
void (*intf_stop)(struct adapter *adapter);
struct net_device *pnetdev; struct net_device *pnetdev;
struct net_device *pmondev; struct net_device *pmondev;
......
...@@ -190,6 +190,7 @@ void rtw_hal_set_odm_var(struct adapter *padapter, ...@@ -190,6 +190,7 @@ void rtw_hal_set_odm_var(struct adapter *padapter,
u32 rtw_hal_inirp_init(struct adapter *padapter); u32 rtw_hal_inirp_init(struct adapter *padapter);
void rtw_hal_inirp_deinit(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_xmit(struct adapter *padapter, struct xmit_frame *pxmitframe);
s32 rtw_hal_mgnt_xmit(struct adapter *padapter, s32 rtw_hal_mgnt_xmit(struct adapter *padapter,
......
...@@ -709,8 +709,7 @@ void rtw_ips_dev_unload(struct adapter *padapter) ...@@ -709,8 +709,7 @@ void rtw_ips_dev_unload(struct adapter *padapter)
rtw_hal_set_hwreg(padapter, HW_VAR_FIFO_CLEARN_UP, NULL); rtw_hal_set_hwreg(padapter, HW_VAR_FIFO_CLEARN_UP, NULL);
if (padapter->intf_stop) usb_intf_stop(padapter);
padapter->intf_stop(padapter);
/* s5. */ /* s5. */
if (!padapter->bSurpriseRemoved) if (!padapter->bSurpriseRemoved)
......
...@@ -141,7 +141,7 @@ static void usb_dvobj_deinit(struct usb_interface *usb_intf) ...@@ -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")); RT_TRACE(_module_hci_intfs_c_, _drv_err_, ("+usb_intf_stop\n"));
...@@ -174,8 +174,7 @@ static void rtw_dev_unload(struct adapter *padapter) ...@@ -174,8 +174,7 @@ static void rtw_dev_unload(struct adapter *padapter)
if (padapter->xmitpriv.ack_tx) if (padapter->xmitpriv.ack_tx)
rtw_ack_tx_done(&padapter->xmitpriv, RTW_SCTX_DONE_DRV_STOP); rtw_ack_tx_done(&padapter->xmitpriv, RTW_SCTX_DONE_DRV_STOP);
/* s3. */ /* s3. */
if (padapter->intf_stop) usb_intf_stop(padapter);
padapter->intf_stop(padapter);
/* s4. */ /* s4. */
if (!padapter->pwrctrlpriv.bInternalAutoSuspend) if (!padapter->pwrctrlpriv.bInternalAutoSuspend)
rtw_stop_drv_threads(padapter); rtw_stop_drv_threads(padapter);
...@@ -357,8 +356,6 @@ static struct adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj, ...@@ -357,8 +356,6 @@ static struct adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj,
if (!padapter->HalData) if (!padapter->HalData)
DBG_88E("cant not alloc memory for HAL DATA\n"); DBG_88E("cant not alloc memory for HAL DATA\n");
padapter->intf_stop = &usb_intf_stop;
/* step read_chip_version */ /* step read_chip_version */
rtw_hal_read_chip_version(padapter); rtw_hal_read_chip_version(padapter);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment