Commit b1f43bd3 authored by Jes Sorensen's avatar Jes Sorensen Committed by Greg Kroah-Hartman
Browse files

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

parent 4405ef40
Loading
Loading
Loading
Loading
+1 −2
Original line number Diff line number Diff line
@@ -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;
+8 −11
Original line number Diff line number Diff line
@@ -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_,
+0 −1
Original line number Diff line number Diff line
@@ -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
+1 −1
Original line number Diff line number Diff line
@@ -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,