staging: r8188eu: remove UsbBulkOutSize from struct hal_data_8188e
PATCH 1/1 staging: r8188eu: remove UsbBulkOutSize from struct hal_data_8188e
UsbBulkOutSize in struct hal_data_8188e is only used to set a local variable in rtl8188eu_xmitframe_complete(). Set the local variable directly and remove UsbBulkOutSize from the hal_data_8188e structure.
Signed-off-by Michael Straube <[email protected]>
--- drivers/staging/r8188eu/hal/rtl8188eu_xmit.c | 9 +++++++-- drivers/staging/r8188eu/hal/usb_halinit.c | 8 +------- drivers/staging/r8188eu/include/rtl8188e_hal.h | 2 -- 3 files changed, 8 insertions(+), 11 deletions(-)
drivers/staging/r8188eu/hal/rtl8188eu_xmit.c +7 -2
@@ -382,7 +382,7 @@ static u32 xmitframe_need_length(struct xmit_frame *pxmitframe)s32 rtl8188eu_xmitframe_complete (struct adapter *adapt,struct xmit_priv *pxmitpriv,struct xmit_buf *pxmitbuf) { -struct hal_data_8188e *haldata = &adapt->haldata; +struct dvobj_priv *pdvobjpriv =adapter_to_dvobj (adapt);struct xmit_frame *pxmitframe =NULL ;struct xmit_frame *pfirstframe =NULL ;
@@ -396,13 +396,18 @@ s32 rtl8188eu_xmitframe_complete(struct adapter *adapt, struct xmit_priv *pxmitpu32 pbuf_tail;/* last pkt tail */ u32 len;/* packet length, except TXDESC_SIZE and PKT_OFFSET */ -u32 bulksize = haldata->UsbBulkOutSize; +u32 bulksize;u8 desc_cnt;u32 bulkptr;/* dump frame variable */ u32 ff_hwaddr; +if (pdvobjpriv->ishighspeed) + bulksize =USB_HIGH_SPEED_BULK_SIZE ; +else + bulksize =USB_FULL_SPEED_BULK_SIZE ; +/* check xmitbuffer is ok */ if (!pxmitbuf) { pxmitbuf =rtw_alloc_xmitbuf (pxmitpriv);
drivers/staging/r8188eu/hal/usb_halinit.c +1 -7
@@ -45,13 +45,7 @@ static bool HalUsbSetQueuePipeMapping8188EUsb(struct adapter *adapt, u8 NumOutPivoid rtl8188eu_interface_configure (struct adapter *adapt) { -struct hal_data_8188e *haldata = &adapt->haldata; -struct dvobj_priv *pdvobjpriv =adapter_to_dvobj (adapt); - -if (pdvobjpriv->ishighspeed) - haldata->UsbBulkOutSize =USB_HIGH_SPEED_BULK_SIZE ;/* 512 bytes */ -else - haldata->UsbBulkOutSize =USB_FULL_SPEED_BULK_SIZE ;/* 64 bytes */ +struct dvobj_priv *pdvobjpriv =adapter_to_dvobj (adapt);HalUsbSetQueuePipeMapping8188EUsb (adapt, pdvobjpriv->RtNumOutPipes); }
drivers/staging/r8188eu/include/rtl8188e_hal.h +0 -2
@@ -171,8 +171,6 @@ struct hal_data_8188e {/* Auto FSM to Turn On, include clock, isolation, power control * for MAC only */ u8 bMacPwrCtrlOn; - -u32 UsbBulkOutSize; };s32 InitLLTTable (struct adapter *padapter,u8 txpktbuf_bndy);
Signature · 1 line
2.34.1