staging: rtl8723au: rtl8723au_read_port() addr argument wasn't used

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723au/hal/usb_halinit.c b/drivers/staging/rtl8723au/hal/usb_halinit.c
index c23bd48f11e17af8765235f0ebea8cec6229f866..b1daf7b1a50412ef9f64869aa6a2b2e5e56d2bd7 100644 (file)
--- a/drivers/staging/rtl8723au/hal/usb_halinit.c
+++ b/drivers/staging/rtl8723au/hal/usb_halinit.c
@@ -952,8 +952,7 @@ int rtl8723au_inirp_init(struct rtw_adapter *Adapter)
        /* issue Rx irp to receive data */
        precvbuf = (struct recv_buf *)precvpriv->precv_buf;
        for (i = 0; i < NR_RECVBUFF; i++) {
-               if (rtl8723au_read_port(Adapter, RECV_BULK_IN_ADDR, 0,
-                                       precvbuf) == _FAIL) {
+               if (rtl8723au_read_port(Adapter, 0, precvbuf) == _FAIL) {
                        RT_TRACE(_module_hci_hal_init_c_, _drv_err_,
                                 ("usb_rx_init: usb_read_port error\n"));
                        status = _FAIL;

diff --git a/drivers/staging/rtl8723au/hal/usb_ops_linux.c b/drivers/staging/rtl8723au/hal/usb_ops_linux.c
index c1b04c13c3924635ded0b6b3a34254e3749925e7..6a23b931443d69ea4d57ac7dc7125e40105a9283 100644 (file)
--- a/drivers/staging/rtl8723au/hal/usb_ops_linux.c
+++ b/drivers/staging/rtl8723au/hal/usb_ops_linux.c
@@ -545,8 +545,7 @@ static void usb_read_port_complete(struct urb *purb)
                                 ("usb_read_port_complete: (purb->actual_"
                                  "length > MAX_RECVBUF_SZ) || (purb->actual_"
                                  "length < RXDESC_SIZE)\n"));
-                       rtl8723au_read_port(padapter, RECV_BULK_IN_ADDR, 0,
-                                           precvbuf);
+                       rtl8723au_read_port(padapter, 0, precvbuf);
                        DBG_8723A("%s()-%d: RX Warning!\n",
                                  __func__, __LINE__);
                } else {
@@ -561,8 +560,7 @@ static void usb_read_port_complete(struct urb *purb)
                                tasklet_schedule(&precvpriv->recv_tasklet);
 
                        precvbuf->pskb = NULL;
-                       rtl8723au_read_port(padapter, RECV_BULK_IN_ADDR, 0,
-                                           precvbuf);
+                       rtl8723au_read_port(padapter, 0, precvbuf);
                }
        } else {
                RT_TRACE(_module_hci_ops_os_c_, _drv_err_,
@@ -596,8 +594,7 @@ static void usb_read_port_complete(struct urb *purb)
                        break;
                case -EPROTO:
                case -EOVERFLOW:
-                       rtl8723au_read_port(padapter, RECV_BULK_IN_ADDR, 0,
-                                           precvbuf);
+                       rtl8723au_read_port(padapter, 0, precvbuf);
                        break;
                case -EINPROGRESS:
                        DBG_8723A("ERROR: URB IS IN PROGRESS!\n");
@@ -608,18 +605,18 @@ static void usb_read_port_complete(struct urb *purb)
        }
 }
 
-int rtl8723au_read_port(struct rtw_adapter *adapter, u32 addr, u32 cnt,
+int rtl8723au_read_port(struct rtw_adapter *adapter, u32 cnt,
                        struct recv_buf *precvbuf)
 {
+       struct urb *purb;
+       struct dvobj_priv *pdvobj = adapter_to_dvobj(adapter);
+       struct recv_priv *precvpriv = &adapter->recvpriv;
+       struct usb_device *pusbd = pdvobj->pusbdev;
        int err;
        unsigned int pipe;
        unsigned long tmpaddr;
        unsigned long alignment;
        int ret = _SUCCESS;
-       struct urb *purb;
-       struct dvobj_priv *pdvobj = adapter_to_dvobj(adapter);
-       struct recv_priv *precvpriv = &adapter->recvpriv;
-       struct usb_device *pusbd = pdvobj->pusbdev;
 
        if (adapter->bDriverStopped || adapter->bSurpriseRemoved) {
                RT_TRACE(_module_hci_ops_os_c_, _drv_err_,

diff --git a/drivers/staging/rtl8723au/include/rtl8723a_recv.h b/drivers/staging/rtl8723au/include/rtl8723a_recv.h
index 0109052a4fbbb0dc23137a711a6d5e14f7d24f0e..cff9b4b111d0a1a306827b83482bdd24d63b4c74 100644 (file)
--- a/drivers/staging/rtl8723au/include/rtl8723a_recv.h
+++ b/drivers/staging/rtl8723au/include/rtl8723a_recv.h
@@ -28,7 +28,6 @@
 
 #define MAX_RECVBUF_SZ                 15360 /*  15k < 16k */
 
-#define RECV_BULK_IN_ADDR              0x80
 #define RECV_INT_IN_ADDR               0x81
 
 #define PHY_RSSI_SLID_WIN_MAX          100

diff --git a/drivers/staging/rtl8723au/include/usb_ops_linux.h b/drivers/staging/rtl8723au/include/usb_ops_linux.h
index bf68bbb41f9c253c90b0fb97ca2088d35d5efd69..0494087cff5af6e1bad4a244f1a6b26ee5069737 100644 (file)
--- a/drivers/staging/rtl8723au/include/usb_ops_linux.h
+++ b/drivers/staging/rtl8723au/include/usb_ops_linux.h
@@ -21,7 +21,7 @@
 
 #define MAX_USBCTRL_VENDORREQ_TIMES    10
 
-int rtl8723au_read_port(struct rtw_adapter *adapter, u32 addr, u32 cnt,
+int rtl8723au_read_port(struct rtw_adapter *adapter, u32 cnt,
                        struct recv_buf *precvbuf);
 void rtl8723au_read_port_cancel(struct rtw_adapter *padapter);
 int rtl8723au_write_port(struct rtw_adapter *padapter, u32 addr, u32 cnt,