openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Ivan Safonov 2016-10-08 01:01:27 +07:00 committed by Greg Kroah-Hartman
parent 94b6a662c3
commit fd5d86d2f3
4 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/staging/rtl8188eu/include/drv_types.h
View File

@ -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;

1
drivers/staging/rtl8188eu/include/hal_intf.h
View File

@ -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,

3
drivers/staging/rtl8188eu/os_dep/os_intfs.c
View File

@ -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)

7
drivers/staging/rtl8188eu/os_dep/usb_intf.c
View File

@ -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);