staging: r8188eu: remove pxmitbuf parameter of rtl8188eu_xmitframe_complete function

pxmitbuf always is NULL.

Signed-off-by: Ivan Safonov <insafonov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c b/drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c
index ec21d8c..88d1dad 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c
+++ b/drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c
@@ -424,11 +424,12 @@ static u32 xmitframe_need_length(struct xmit_frame *pxmitframe)
        return len;
 }
 
-s32 rtl8188eu_xmitframe_complete(struct adapter *adapt, struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf)
+s32 rtl8188eu_xmitframe_complete(struct adapter *adapt, struct xmit_priv *pxmitpriv)
 {
        struct hal_data_8188e   *haldata = GET_HAL_DATA(adapt);
        struct xmit_frame *pxmitframe = NULL;
        struct xmit_frame *pfirstframe = NULL;
+       struct xmit_buf *pxmitbuf;
 
        /*  aggregate variable */
        struct hw_xmit *phwxmit;
@@ -450,12 +451,9 @@ s32 rtl8188eu_xmitframe_complete(struct adapter *adapt, struct xmit_priv *pxmitp
 
        RT_TRACE(_module_rtl8192c_xmit_c_, _drv_info_, ("+xmitframe_complete\n"));
 
-       /*  check xmitbuffer is ok */
-       if (pxmitbuf == NULL) {
-               pxmitbuf = rtw_alloc_xmitbuf(pxmitpriv);
-               if (pxmitbuf == NULL)
-                       return false;
-       }
+       pxmitbuf = rtw_alloc_xmitbuf(pxmitpriv);
+       if (pxmitbuf == NULL)
+               return false;
 
        /* 3 1. pick up first frame */
        rtw_free_xmitframe(pxmitpriv, pxmitframe);

diff --git a/drivers/staging/rtl8188eu/include/rtl8188e_xmit.h b/drivers/staging/rtl8188eu/include/rtl8188e_xmit.h
index 65a63df..97942c5 100644 (file)
--- a/drivers/staging/rtl8188eu/include/rtl8188e_xmit.h
+++ b/drivers/staging/rtl8188eu/include/rtl8188e_xmit.h
@@ -160,8 +160,7 @@ s32 rtl8188eu_xmit_buf_handler(struct adapter *padapter);
 #define hal_xmit_handler rtl8188eu_xmit_buf_handler
 void rtl8188eu_xmit_tasklet(void *priv);
 s32 rtl8188eu_xmitframe_complete(struct adapter *padapter,
-                                struct xmit_priv *pxmitpriv,
-                                struct xmit_buf *pxmitbuf);
+                                struct xmit_priv *pxmitpriv);
 
 void dump_txrpt_ccx_88e(void *buf);
 void handle_txrpt_ccx_88e(struct adapter *adapter, u8 *buf);

diff --git a/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c b/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c
index abb476b..7f9fbe9 100644 (file)
--- a/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c
+++ b/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c
@@ -848,7 +848,7 @@ void rtl8188eu_xmit_tasklet(void *priv)
                        break;
                }
 
-               ret = rtl8188eu_xmitframe_complete(adapt, pxmitpriv, NULL);
+               ret = rtl8188eu_xmitframe_complete(adapt, pxmitpriv);
 
                if (!ret)
                        break;