staging: rtl8723au: Name port vs register access functions consistently (68552a90) · Commits · jan.koester / Linux

drivers/staging/rtl8723au/hal/rtl8723au_xmit.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -345,7 +345,7 @@ static int rtw_dump_xframe(struct rtw_adapter *padapter,
	}		}

	ff_hwaddr = rtw_get_ff_hwaddr23a(pxmitframe);		ff_hwaddr = rtw_get_ff_hwaddr23a(pxmitframe);
	inner_ret = rtl8723a_usb_write_port(padapter, ff_hwaddr,		inner_ret = rtl8723au_write_port(padapter, ff_hwaddr,
	w_sz, pxmitbuf);		w_sz, pxmitbuf);
	rtw_count_tx_stats23a(padapter, pxmitframe, sz);		rtw_count_tx_stats23a(padapter, pxmitframe, sz);

drivers/staging/rtl8723au/hal/usb_halinit.c

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -1235,7 +1235,7 @@ int rtl8723au_inirp_init(struct rtw_adapter *Adapter)
	/* issue Rx irp to receive data */		/* issue Rx irp to receive data */
	precvbuf = (struct recv_buf *)precvpriv->precv_buf;		precvbuf = (struct recv_buf *)precvpriv->precv_buf;
	for (i = 0; i < NR_RECVBUFF; i++) {		for (i = 0; i < NR_RECVBUFF; i++) {
	if (rtl8723a_usb_read_port(Adapter, RECV_BULK_IN_ADDR, 0,		if (rtl8723au_read_port(Adapter, RECV_BULK_IN_ADDR, 0,
	precvbuf) == _FAIL) {		precvbuf) == _FAIL) {
	RT_TRACE(_module_hci_hal_init_c_, _drv_err_,		RT_TRACE(_module_hci_hal_init_c_, _drv_err_,
	("usb_rx_init: usb_read_port error\n"));		("usb_rx_init: usb_read_port error\n"));
	@@ -1244,7 +1244,7 @@ int rtl8723au_inirp_init(struct rtw_adapter *Adapter)
	}		}
	precvbuf++;		precvbuf++;
	}		}
	if (rtl8723a_usb_read_interrupt(Adapter, RECV_INT_IN_ADDR) == _FAIL) {		if (rtl8723au_read_interrupt(Adapter, RECV_INT_IN_ADDR) == _FAIL) {
	RT_TRACE(_module_hci_hal_init_c_, _drv_err_,		RT_TRACE(_module_hci_hal_init_c_, _drv_err_,
	("usb_rx_init: usb_read_interrupt error\n"));		("usb_rx_init: usb_read_interrupt error\n"));
	status = _FAIL;		status = _FAIL;
	@@ -1265,7 +1265,7 @@ int rtl8723au_inirp_deinit(struct rtw_adapter *Adapter)

	RT_TRACE(_module_hci_hal_init_c_, _drv_info_,		RT_TRACE(_module_hci_hal_init_c_, _drv_info_,
	("\n ===> usb_rx_deinit\n"));		("\n ===> usb_rx_deinit\n"));
	rtl8723a_usb_read_port_cancel(Adapter);		rtl8723au_read_port_cancel(Adapter);
	pHalData->IntrMask[0] = rtl8723au_read32(Adapter, REG_USB_HIMR);		pHalData->IntrMask[0] = rtl8723au_read32(Adapter, REG_USB_HIMR);
	MSG_8723A("%s pHalData->IntrMask = 0x%04x\n", __func__,		MSG_8723A("%s pHalData->IntrMask = 0x%04x\n", __func__,
	pHalData->IntrMask[0]);		pHalData->IntrMask[0]);

drivers/staging/rtl8723au/hal/usb_ops_linux.c

+9 −9

Original line number	Original line	Diff line number	Diff line
	@@ -447,7 +447,7 @@ static void usb_read_interrupt_complete(struct urb *purb)
	}		}
	}		}

	int rtl8723a_usb_read_interrupt(struct rtw_adapter *adapter, u32 addr)		int rtl8723au_read_interrupt(struct rtw_adapter *adapter, u32 addr)
	{		{
	int err;		int err;
	unsigned int pipe;		unsigned int pipe;
	@@ -676,7 +676,7 @@ static void usb_read_port_complete(struct urb *purb)
	("usb_read_port_complete: (purb->actual_"		("usb_read_port_complete: (purb->actual_"
	"length > MAX_RECVBUF_SZ) \|\| (purb->actual_"		"length > MAX_RECVBUF_SZ) \|\| (purb->actual_"
	"length < RXDESC_SIZE)\n"));		"length < RXDESC_SIZE)\n"));
	rtl8723a_usb_read_port(padapter, RECV_BULK_IN_ADDR, 0,		rtl8723au_read_port(padapter, RECV_BULK_IN_ADDR, 0,
	precvbuf);		precvbuf);
	DBG_8723A("%s()-%d: RX Warning!\n",		DBG_8723A("%s()-%d: RX Warning!\n",
	__FUNCTION__, __LINE__);		__FUNCTION__, __LINE__);
	@@ -692,7 +692,7 @@ static void usb_read_port_complete(struct urb *purb)
	tasklet_schedule(&precvpriv->recv_tasklet);		tasklet_schedule(&precvpriv->recv_tasklet);

	precvbuf->pskb = NULL;		precvbuf->pskb = NULL;
	rtl8723a_usb_read_port(padapter, RECV_BULK_IN_ADDR, 0,		rtl8723au_read_port(padapter, RECV_BULK_IN_ADDR, 0,
	precvbuf);		precvbuf);
	}		}
	} else {		} else {
	@@ -730,7 +730,7 @@ static void usb_read_port_complete(struct urb *purb)
	pHalData = GET_HAL_DATA(padapter);		pHalData = GET_HAL_DATA(padapter);
	pHalData->srestpriv.Wifi_Error_Status =		pHalData->srestpriv.Wifi_Error_Status =
	USB_READ_PORT_FAIL;		USB_READ_PORT_FAIL;
	rtl8723a_usb_read_port(padapter, RECV_BULK_IN_ADDR, 0,		rtl8723au_read_port(padapter, RECV_BULK_IN_ADDR, 0,
	precvbuf);		precvbuf);
	break;		break;
	case -EINPROGRESS:		case -EINPROGRESS:
	@@ -742,7 +742,7 @@ static void usb_read_port_complete(struct urb *purb)
	}		}
	}		}

	int rtl8723a_usb_read_port(struct rtw_adapter *adapter, u32 addr, u32 cnt,		int rtl8723au_read_port(struct rtw_adapter *adapter, u32 addr, u32 cnt,
	struct recv_buf *precvbuf)		struct recv_buf *precvbuf)
	{		{
	int err;		int err;

drivers/staging/rtl8723au/include/usb_ops_linux.h

+7 −7

Original line number	Original line	Diff line number	Diff line
	@@ -21,13 +21,13 @@

	#define MAX_USBCTRL_VENDORREQ_TIMES 10		#define MAX_USBCTRL_VENDORREQ_TIMES 10

	int rtl8723a_usb_read_port(struct rtw_adapter *adapter, u32 addr, u32 cnt,		int rtl8723au_read_port(struct rtw_adapter *adapter, u32 addr, u32 cnt,
	struct recv_buf *precvbuf);		struct recv_buf *precvbuf);
	void rtl8723a_usb_read_port_cancel(struct rtw_adapter *padapter);		void rtl8723au_read_port_cancel(struct rtw_adapter *padapter);
	int rtl8723a_usb_write_port(struct rtw_adapter *padapter, u32 addr, u32 cnt,		int rtl8723au_write_port(struct rtw_adapter *padapter, u32 addr, u32 cnt,
	struct xmit_buf *pxmitbuf);		struct xmit_buf *pxmitbuf);
	void rtl8723a_usb_write_port_cancel(struct rtw_adapter *padapter);		void rtl8723au_write_port_cancel(struct rtw_adapter *padapter);
	int rtl8723a_usb_read_interrupt(struct rtw_adapter *adapter, u32 addr);		int rtl8723au_read_interrupt(struct rtw_adapter *adapter, u32 addr);

	u8 rtl8723au_read8(struct rtw_adapter *padapter, u32 addr);		u8 rtl8723au_read8(struct rtw_adapter *padapter, u32 addr);
	u16 rtl8723au_read16(struct rtw_adapter *padapter, u32 addr);		u16 rtl8723au_read16(struct rtw_adapter *padapter, u32 addr);

drivers/staging/rtl8723au/os_dep/usb_intf.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -292,7 +292,7 @@ void rtl8723a_usb_intf_stop(struct rtw_adapter *padapter)
	rtl8723au_inirp_deinit(padapter);		rtl8723au_inirp_deinit(padapter);

	/* cancel out irp */		/* cancel out irp */
	rtl8723a_usb_write_port_cancel(padapter);		rtl8723au_write_port_cancel(padapter);

	/* todo:cancel other irps */		/* todo:cancel other irps */
	RT_TRACE(_module_hci_intfs_c_, _drv_err_, ("-usb_intf_stop\n"));		RT_TRACE(_module_hci_intfs_c_, _drv_err_, ("-usb_intf_stop\n"));