staging: rtl8723au: Name port vs register access functions consistently

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/rtl8723au_xmit.c b/drivers/staging/rtl8723au/hal/rtl8723au_xmit.c
index 45bd67e..d2caafa 100644 (file)
--- a/drivers/staging/rtl8723au/hal/rtl8723au_xmit.c
+++ b/drivers/staging/rtl8723au/hal/rtl8723au_xmit.c
@@ -345,8 +345,8 @@ static int rtw_dump_xframe(struct rtw_adapter *padapter,
                }
 
                ff_hwaddr = rtw_get_ff_hwaddr23a(pxmitframe);
-               inner_ret = rtl8723a_usb_write_port(padapter, ff_hwaddr,
-                                                   w_sz, pxmitbuf);
+               inner_ret = rtl8723au_write_port(padapter, ff_hwaddr,
+                                                w_sz, pxmitbuf);
                rtw_count_tx_stats23a(padapter, pxmitframe, sz);
 
                RT_TRACE(_module_rtl871x_xmit_c_, _drv_info_,

diff --git a/drivers/staging/rtl8723au/hal/usb_halinit.c b/drivers/staging/rtl8723au/hal/usb_halinit.c
index 95906d4..e0d2d6e 100644 (file)
--- a/drivers/staging/rtl8723au/hal/usb_halinit.c
+++ b/drivers/staging/rtl8723au/hal/usb_halinit.c
@@ -1235,8 +1235,8 @@ 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 (rtl8723a_usb_read_port(Adapter, RECV_BULK_IN_ADDR, 0,
-                                          precvbuf) == _FAIL) {
+               if (rtl8723au_read_port(Adapter, RECV_BULK_IN_ADDR, 0,
+                                       precvbuf) == _FAIL) {
                        RT_TRACE(_module_hci_hal_init_c_, _drv_err_,
                                 ("usb_rx_init: usb_read_port error\n"));
                        status = _FAIL;
@@ -1244,7 +1244,7 @@ int rtl8723au_inirp_init(struct rtw_adapter *Adapter)
                }
                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_,
                         ("usb_rx_init: usb_read_interrupt error\n"));
                status = _FAIL;
@@ -1265,7 +1265,7 @@ int rtl8723au_inirp_deinit(struct rtw_adapter *Adapter)
 
        RT_TRACE(_module_hci_hal_init_c_, _drv_info_,
                 ("\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);
        MSG_8723A("%s pHalData->IntrMask = 0x%04x\n", __func__,
                  pHalData->IntrMask[0]);

diff --git a/drivers/staging/rtl8723au/hal/usb_ops_linux.c b/drivers/staging/rtl8723au/hal/usb_ops_linux.c
index 52792e0..73b49ac 100644 (file)
--- a/drivers/staging/rtl8723au/hal/usb_ops_linux.c
+++ b/drivers/staging/rtl8723au/hal/usb_ops_linux.c
@@ -447,7 +447,7 @@ urb_submit:
        }
 }
 
-int rtl8723a_usb_read_interrupt(struct rtw_adapter *adapter, u32 addr)
+int rtl8723au_read_interrupt(struct rtw_adapter *adapter, u32 addr)
 {
        int err;
        unsigned int pipe;
@@ -676,8 +676,8 @@ 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"));
-                       rtl8723a_usb_read_port(padapter, RECV_BULK_IN_ADDR, 0,
-                                              precvbuf);
+                       rtl8723au_read_port(padapter, RECV_BULK_IN_ADDR, 0,
+                                           precvbuf);
                        DBG_8723A("%s()-%d: RX Warning!\n",
                                  __FUNCTION__, __LINE__);
                } else {
@@ -692,8 +692,8 @@ static void usb_read_port_complete(struct urb *purb)
                                tasklet_schedule(&precvpriv->recv_tasklet);
 
                        precvbuf->pskb = NULL;
-                       rtl8723a_usb_read_port(padapter, RECV_BULK_IN_ADDR, 0,
-                                              precvbuf);
+                       rtl8723au_read_port(padapter, RECV_BULK_IN_ADDR, 0,
+                                           precvbuf);
                }
        } else {
                RT_TRACE(_module_hci_ops_os_c_, _drv_err_,
@@ -730,8 +730,8 @@ static void usb_read_port_complete(struct urb *purb)
                        pHalData = GET_HAL_DATA(padapter);
                        pHalData->srestpriv.Wifi_Error_Status =
                                USB_READ_PORT_FAIL;
-                       rtl8723a_usb_read_port(padapter, RECV_BULK_IN_ADDR, 0,
-                                              precvbuf);
+                       rtl8723au_read_port(padapter, RECV_BULK_IN_ADDR, 0,
+                                           precvbuf);
                        break;
                case -EINPROGRESS:
                        DBG_8723A("ERROR: URB IS IN PROGRESS!/n");
@@ -742,8 +742,8 @@ static void usb_read_port_complete(struct urb *purb)
        }
 }
 
-int rtl8723a_usb_read_port(struct rtw_adapter *adapter, u32 addr, u32 cnt,
-                          struct recv_buf *precvbuf)
+int rtl8723au_read_port(struct rtw_adapter *adapter, u32 addr, u32 cnt,
+                       struct recv_buf *precvbuf)
 {
        int err;
        unsigned int pipe;

diff --git a/drivers/staging/rtl8723au/include/usb_ops_linux.h b/drivers/staging/rtl8723au/include/usb_ops_linux.h
index 4b5b10c..e540a4b 100644 (file)
--- a/drivers/staging/rtl8723au/include/usb_ops_linux.h
+++ b/drivers/staging/rtl8723au/include/usb_ops_linux.h
@@ -21,13 +21,13 @@
 
 #define MAX_USBCTRL_VENDORREQ_TIMES    10
 
-int rtl8723a_usb_read_port(struct rtw_adapter *adapter, u32 addr, u32 cnt,
-                          struct recv_buf *precvbuf);
-void rtl8723a_usb_read_port_cancel(struct rtw_adapter *padapter);
-int rtl8723a_usb_write_port(struct rtw_adapter *padapter, u32 addr, u32 cnt,
-                           struct xmit_buf *pxmitbuf);
-void rtl8723a_usb_write_port_cancel(struct rtw_adapter *padapter);
-int rtl8723a_usb_read_interrupt(struct rtw_adapter *adapter, u32 addr);
+int rtl8723au_read_port(struct rtw_adapter *adapter, u32 addr, 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,
+                        struct xmit_buf *pxmitbuf);
+void rtl8723au_write_port_cancel(struct rtw_adapter *padapter);
+int rtl8723au_read_interrupt(struct rtw_adapter *adapter, u32 addr);
 
 u8 rtl8723au_read8(struct rtw_adapter *padapter, u32 addr);
 u16 rtl8723au_read16(struct rtw_adapter *padapter, u32 addr);

diff --git a/drivers/staging/rtl8723au/os_dep/usb_intf.c b/drivers/staging/rtl8723au/os_dep/usb_intf.c
index cc5188b..d00ccdc 100644 (file)
--- a/drivers/staging/rtl8723au/os_dep/usb_intf.c
+++ b/drivers/staging/rtl8723au/os_dep/usb_intf.c
@@ -292,7 +292,7 @@ void rtl8723a_usb_intf_stop(struct rtw_adapter *padapter)
        rtl8723au_inirp_deinit(padapter);
 
        /* cancel out irp */
-       rtl8723a_usb_write_port_cancel(padapter);
+       rtl8723au_write_port_cancel(padapter);
 
        /* todo:cancel other irps */
        RT_TRACE(_module_hci_intfs_c_, _drv_err_, ("-usb_intf_stop\n"));

diff --git a/drivers/staging/rtl8723au/os_dep/usb_ops_linux.c b/drivers/staging/rtl8723au/os_dep/usb_ops_linux.c
index a41d824..d081449 100644 (file)
--- a/drivers/staging/rtl8723au/os_dep/usb_ops_linux.c
+++ b/drivers/staging/rtl8723au/os_dep/usb_ops_linux.c
@@ -25,7 +25,7 @@ struct zero_bulkout_context {
        void *padapter;
 };
 
-void rtl8723a_usb_read_port_cancel(struct rtw_adapter *padapter)
+void rtl8723au_read_port_cancel(struct rtw_adapter *padapter)
 {
        struct recv_buf *precvbuf;
        int i;
@@ -140,8 +140,8 @@ check_completion:
        tasklet_hi_schedule(&pxmitpriv->xmit_tasklet);
 }
 
-int rtl8723a_usb_write_port(struct rtw_adapter *padapter, u32 addr, u32 cnt,
-                           struct xmit_buf *pxmitbuf)
+int rtl8723au_write_port(struct rtw_adapter *padapter, u32 addr, u32 cnt,
+                        struct xmit_buf *pxmitbuf)
 {
        struct urb *purb = NULL;
        struct dvobj_priv *pdvobj = adapter_to_dvobj(padapter);
@@ -237,7 +237,7 @@ exit:
        return ret;
 }
 
-void rtl8723a_usb_write_port_cancel(struct rtw_adapter *padapter)
+void rtl8723au_write_port_cancel(struct rtw_adapter *padapter)
 {
        struct xmit_buf *pxmitbuf;
        struct list_head *plist;