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

Remove inirp_init from struct hal_ops and remove its wrapper
rtw_hal_inirp_init(). Call rtl8188eu_inirp_init() directly instead.

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

authored by

Michael Straube and committed by
Greg Kroah-Hartman 3a587ff6 5d444526

+4 -16
-11
drivers/staging/r8188eu/hal/hal_intf.c
··· 53 53 adapt->HalFunc.GetHwRegHandler(adapt, variable, val); 54 54 } 55 55 56 - u32 rtw_hal_inirp_init(struct adapter *adapt) 57 - { 58 - u32 rst = _FAIL; 59 - 60 - if (adapt->HalFunc.inirp_init) 61 - rst = adapt->HalFunc.inirp_init(adapt); 62 - else 63 - DBG_88E(" %s HalFunc.inirp_init is NULL!!!\n", __func__); 64 - return rst; 65 - } 66 - 67 56 u32 rtw_hal_inirp_deinit(struct adapter *adapt) 68 57 { 69 58 if (adapt->HalFunc.inirp_deinit)
+1 -2
drivers/staging/r8188eu/hal/usb_halinit.c
··· 997 997 return _SUCCESS; 998 998 } 999 999 1000 - static unsigned int rtl8188eu_inirp_init(struct adapter *Adapter) 1000 + unsigned int rtl8188eu_inirp_init(struct adapter *Adapter) 1001 1001 { 1002 1002 u8 i; 1003 1003 struct recv_buf *precvbuf; ··· 2150 2150 halfunc->hal_init = &rtl8188eu_hal_init; 2151 2151 halfunc->hal_deinit = &rtl8188eu_hal_deinit; 2152 2152 2153 - halfunc->inirp_init = &rtl8188eu_inirp_init; 2154 2153 halfunc->inirp_deinit = &rtl8188eu_inirp_deinit; 2155 2154 2156 2155 halfunc->SetHwRegHandler = &SetHwReg8188EU;
+2 -2
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_init)(struct adapter *padapter); 129 128 u32 (*inirp_deinit)(struct adapter *padapter); 130 129 131 130 void (*SetHwRegHandler)(struct adapter *padapter, u8 variable, ··· 173 174 u8 SetHalDefVar8188EUsb(struct adapter *Adapter, enum hal_def_variable eVariable, void *pValue); 174 175 u8 GetHalDefVar8188EUsb(struct adapter *Adapter, enum hal_def_variable eVariable, void *pValue); 175 176 177 + unsigned int rtl8188eu_inirp_init(struct adapter *Adapter); 178 + 176 179 uint rtw_hal_init(struct adapter *padapter); 177 180 uint rtw_hal_deinit(struct adapter *padapter); 178 181 void rtw_hal_stop(struct adapter *padapter); 179 182 void rtw_hal_set_hwreg(struct adapter *padapter, u8 variable, u8 *val); 180 183 void rtw_hal_get_hwreg(struct adapter *padapter, u8 variable, u8 *val); 181 184 182 - u32 rtw_hal_inirp_init(struct adapter *padapter); 183 185 u32 rtw_hal_inirp_deinit(struct adapter *padapter); 184 186 185 187 void rtw_hal_update_ra_mask(struct adapter *padapter, u32 mac_id, u8 level);
+1 -1
drivers/staging/r8188eu/os_dep/usb_intf.c
··· 180 180 181 181 static void usb_intf_start(struct adapter *padapter) 182 182 { 183 - rtw_hal_inirp_init(padapter); 183 + rtl8188eu_inirp_init(padapter); 184 184 } 185 185 186 186 static void usb_intf_stop(struct adapter *padapter)