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 inirp_deinit from struct hal_ops

Remove inirp_deinit from struct hal_ops and remove the wrappers
rtw_hal_inirp_deinit() and rtl8188eu_inirp_deinit(). Call
rtw_read_port_cancel() directly instead.

Signed-off-by: Michael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20210929192657.9569-8-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Michael Straube and committed by
Greg Kroah-Hartman b9ba6875 3a587ff6

+1 -22
-8
drivers/staging/r8188eu/hal/hal_intf.c
··· 53 53 adapt->HalFunc.GetHwRegHandler(adapt, variable, val); 54 54 } 55 55 56 - u32 rtw_hal_inirp_deinit(struct adapter *adapt) 57 - { 58 - if (adapt->HalFunc.inirp_deinit) 59 - return adapt->HalFunc.inirp_deinit(adapt); 60 - 61 - return _FAIL; 62 - } 63 - 64 56 void rtw_hal_update_ra_mask(struct adapter *adapt, u32 mac_id, u8 rssi_level) 65 57 { 66 58 struct mlme_priv *pmlmepriv = &adapt->mlmepriv;
-9
drivers/staging/r8188eu/hal/usb_halinit.c
··· 1024 1024 return status; 1025 1025 } 1026 1026 1027 - static unsigned int rtl8188eu_inirp_deinit(struct adapter *Adapter) 1028 - { 1029 - rtw_read_port_cancel(Adapter); 1030 - 1031 - return _SUCCESS; 1032 - } 1033 - 1034 1027 /* */ 1035 1028 /* */ 1036 1029 /* EEPROM/EFUSE Content Parsing */ ··· 2142 2149 2143 2150 halfunc->hal_init = &rtl8188eu_hal_init; 2144 2151 halfunc->hal_deinit = &rtl8188eu_hal_deinit; 2145 - 2146 - halfunc->inirp_deinit = &rtl8188eu_inirp_deinit; 2147 2152 2148 2153 halfunc->SetHwRegHandler = &SetHwReg8188EU; 2149 2154 halfunc->GetHwRegHandler = &GetHwReg8188EU;
-4
drivers/staging/r8188eu/include/hal_intf.h
··· 125 125 u32 (*hal_init)(struct adapter *padapter); 126 126 u32 (*hal_deinit)(struct adapter *padapter); 127 127 128 - u32 (*inirp_deinit)(struct adapter *padapter); 129 - 130 128 void (*SetHwRegHandler)(struct adapter *padapter, u8 variable, 131 129 u8 *val); 132 130 void (*GetHwRegHandler)(struct adapter *padapter, u8 variable, ··· 178 180 void rtw_hal_stop(struct adapter *padapter); 179 181 void rtw_hal_set_hwreg(struct adapter *padapter, u8 variable, u8 *val); 180 182 void rtw_hal_get_hwreg(struct adapter *padapter, u8 variable, u8 *val); 181 - 182 - u32 rtw_hal_inirp_deinit(struct adapter *padapter); 183 183 184 184 void rtw_hal_update_ra_mask(struct adapter *padapter, u32 mac_id, u8 level); 185 185 void rtw_hal_clone_data(struct adapter *dst_adapt,
+1 -1
drivers/staging/r8188eu/os_dep/usb_intf.c
··· 186 186 static void usb_intf_stop(struct adapter *padapter) 187 187 { 188 188 /* cancel in irp */ 189 - rtw_hal_inirp_deinit(padapter); 189 + rtw_read_port_cancel(padapter); 190 190 191 191 /* cancel out irp */ 192 192 rtw_write_port_cancel(padapter);