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

staging: r8188eu: rename pre_xmitframe to rtw_hal_xmit

And remove many one-line wrappers.

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
b3a4942f 61a30f36

+1 -24
-8
drivers/staging/rtl8188eu/hal/hal_intf.c
··· 162 162 return _FAIL; 163 163 } 164 164 165 - s32 rtw_hal_xmit(struct adapter *adapt, struct xmit_frame *pxmitframe) 166 - { 167 - if (adapt->HalFunc.hal_xmit) 168 - return adapt->HalFunc.hal_xmit(adapt, pxmitframe); 169 - 170 - return false; 171 - } 172 - 173 165 s32 rtw_hal_init_xmit_priv(struct adapter *adapt) 174 166 { 175 167 if (adapt->HalFunc.init_xmit_priv)
+1 -11
drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c
··· 622 622 * true dump packet directly 623 623 * false enqueue packet 624 624 */ 625 - static s32 pre_xmitframe(struct adapter *adapt, struct xmit_frame *pxmitframe) 625 + s32 rtw_hal_xmit(struct adapter *adapt, struct xmit_frame *pxmitframe) 626 626 { 627 627 s32 res; 628 628 struct xmit_buf *pxmitbuf = NULL; ··· 678 678 679 679 rtl88eu_mon_xmit_hook(adapt->pmondev, pmgntframe, xmitpriv->frag_len); 680 680 return rtw_dump_xframe(adapt, pmgntframe); 681 - } 682 - 683 - /* 684 - * Return 685 - * true dump packet directly ok 686 - * false temporary can't transmit packets to hardware 687 - */ 688 - s32 rtl8188eu_hal_xmit(struct adapter *adapt, struct xmit_frame *pxmitframe) 689 - { 690 - return pre_xmitframe(adapt, pxmitframe); 691 681 }
-2
drivers/staging/rtl8188eu/hal/usb_halinit.c
··· 2087 2087 halfunc->UpdateRAMaskHandler = &UpdateHalRAMask8188EUsb; 2088 2088 halfunc->SetBeaconRelatedRegistersHandler = &SetBeaconRelatedRegisters8188EUsb; 2089 2089 2090 - halfunc->hal_xmit = &rtl8188eu_hal_xmit; 2091 - 2092 2090 rtl8188e_set_hal_ops(halfunc); 2093 2091 }
-2
drivers/staging/rtl8188eu/include/hal_intf.h
··· 199 199 void (*AntDivCompareHandler)(struct adapter *adapter, 200 200 struct wlan_bssid_ex *dst, 201 201 struct wlan_bssid_ex *src); 202 - s32 (*hal_xmit)(struct adapter *padapter, 203 - struct xmit_frame *pxmitframe); 204 202 u32 (*read_rfreg)(struct adapter *padapter, 205 203 enum rf_radio_path eRFPath, u32 RegAddr, 206 204 u32 BitMask);
-1
drivers/staging/rtl8188eu/include/rtl8188e_xmit.h
··· 154 154 void rtl8188e_fill_fake_txdesc(struct adapter *padapter, u8 *pDesc, 155 155 u32 BufferLen, u8 IsPsPoll, u8 IsBTQosNull); 156 156 s32 rtl8188eu_init_xmit_priv(struct adapter *padapter); 157 - s32 rtl8188eu_hal_xmit(struct adapter *padapter, struct xmit_frame *frame); 158 157 s32 rtl8188eu_xmit_buf_handler(struct adapter *padapter); 159 158 #define hal_xmit_handler rtl8188eu_xmit_buf_handler 160 159 void rtl8188eu_xmit_tasklet(void *priv);