tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

authored by

Ivan Safonov and committed by
Greg Kroah-Hartman fd5d86d2 94b6a662

+4 -8
-1
drivers/staging/rtl8188eu/include/drv_types.h
··· 156 156 u8 hw_init_completed; 157 157 158 158 void *cmdThread; 159 - void (*intf_stop)(struct adapter *adapter); 160 159 struct net_device *pnetdev; 161 160 struct net_device *pmondev; 162 161
+1
drivers/staging/rtl8188eu/include/hal_intf.h
··· 190 190 191 191 u32 rtw_hal_inirp_init(struct adapter *padapter); 192 192 void rtw_hal_inirp_deinit(struct adapter *padapter); 193 + void usb_intf_stop(struct adapter *padapter); 193 194 194 195 s32 rtw_hal_xmit(struct adapter *padapter, struct xmit_frame *pxmitframe); 195 196 s32 rtw_hal_mgnt_xmit(struct adapter *padapter,
+1 -2
drivers/staging/rtl8188eu/os_dep/os_intfs.c
··· 709 709 710 710 rtw_hal_set_hwreg(padapter, HW_VAR_FIFO_CLEARN_UP, NULL); 711 711 712 - if (padapter->intf_stop) 713 - padapter->intf_stop(padapter); 712 + usb_intf_stop(padapter); 714 713 715 714 /* s5. */ 716 715 if (!padapter->bSurpriseRemoved)
+2 -5
drivers/staging/rtl8188eu/os_dep/usb_intf.c
··· 141 141 142 142 } 143 143 144 - static void usb_intf_stop(struct adapter *padapter) 144 + void usb_intf_stop(struct adapter *padapter) 145 145 { 146 146 RT_TRACE(_module_hci_intfs_c_, _drv_err_, ("+usb_intf_stop\n")); 147 147 ··· 174 174 if (padapter->xmitpriv.ack_tx) 175 175 rtw_ack_tx_done(&padapter->xmitpriv, RTW_SCTX_DONE_DRV_STOP); 176 176 /* s3. */ 177 - if (padapter->intf_stop) 178 - padapter->intf_stop(padapter); 177 + usb_intf_stop(padapter); 179 178 /* s4. */ 180 179 if (!padapter->pwrctrlpriv.bInternalAutoSuspend) 181 180 rtw_stop_drv_threads(padapter); ··· 355 356 padapter->HalData = kzalloc(sizeof(struct hal_data_8188e), GFP_KERNEL); 356 357 if (!padapter->HalData) 357 358 DBG_88E("cant not alloc memory for HAL DATA\n"); 358 - 359 - padapter->intf_stop = &usb_intf_stop; 360 359 361 360 /* step read_chip_version */ 362 361 rtw_hal_read_chip_version(padapter);