Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/staging/rtl8188eu/include/drv_types.h

+0 −1
Original line number Diff line number Diff line
@@ -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;

drivers/staging/rtl8188eu/include/hal_intf.h

+1 −0
Original line number Diff line number Diff line
@@ -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,

drivers/staging/rtl8188eu/os_dep/os_intfs.c

+1 −2
Original line number Diff line number Diff line
@@ -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)

drivers/staging/rtl8188eu/os_dep/usb_intf.c

+2 −5
Original line number Diff line number Diff line
@@ -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);