staging: rtl8723au: Remove unused usb_read_mem/usb_write_mem stubs

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

diff --git a/drivers/staging/rtl8723au/core/rtw_io.c b/drivers/staging/rtl8723au/core/rtw_io.c
index 0dc0cf7534621084ffc9779a60e8f3e14f15e7f1..0f26ea8de21660db504bc5a7c44ed519f7ab6736 100644 (file)
--- a/drivers/staging/rtl8723au/core/rtw_io.c
+++ b/drivers/staging/rtl8723au/core/rtw_io.c
@@ -27,8 +27,6 @@ Compiler Flag Option:
 1. For USB:
    a. USE_ASYNC_IRP: Both sync/async operations are provided.
 
-Only sync read/rtw_write_mem operations are provided.
-
 jackson@realtek.com.tw
 
 */
@@ -116,28 +114,6 @@ int _rtw_writeN23a(struct rtw_adapter *adapter, u32 addr , u32 length , u8 *pdat
        else
                return _SUCCESS;
 }
-void _rtw_read_mem23a(struct rtw_adapter *adapter, u32 addr, u32 cnt, u8 *pmem)
-{
-       struct _io_ops *io_ops = &adapter->io_ops;
-
-       if ((adapter->bDriverStopped == true) ||
-           (adapter->bSurpriseRemoved == true)) {
-            RT_TRACE(_module_rtl871x_io_c_, _drv_info_,
-                     ("rtw_read_mem:bDriverStopped(%d) OR "
-                      "bSurpriseRemoved(%d)", adapter->bDriverStopped,
-                      adapter->bSurpriseRemoved));
-            return;
-       }
-
-       io_ops->_read_mem(adapter, addr, cnt, pmem);
-}
-
-void _rtw_write_mem23a(struct rtw_adapter *adapter, u32 addr, u32 cnt, u8 *pmem)
-{
-       struct _io_ops *io_ops = &adapter->io_ops;
-
-       io_ops->_write_mem(adapter, addr, cnt, pmem);
-}
 
 int _rtw_read_port23a(struct rtw_adapter *adapter, u32 addr, u32 cnt,
                       struct recv_buf *rbuf)

diff --git a/drivers/staging/rtl8723au/hal/usb_ops_linux.c b/drivers/staging/rtl8723au/hal/usb_ops_linux.c
index 4a83b138a8f5629792710cda26731db946c99858..0a7fa0a9c9afbed90ab97f098605050ce835920d 100644 (file)
--- a/drivers/staging/rtl8723au/hal/usb_ops_linux.c
+++ b/drivers/staging/rtl8723au/hal/usb_ops_linux.c
@@ -834,7 +834,6 @@ void rtl8723au_set_intf_ops(struct rtw_adapter *padapter)
        pops->_read8 = &usb_read8;
        pops->_read16 = &usb_read16;
        pops->_read32 = &usb_read32;
-       pops->_read_mem = &usb_read_mem23a;
        pops->_read_port = &usb_read_port;
 
        pops->_write8 = &usb_write8;
@@ -842,7 +841,6 @@ void rtl8723au_set_intf_ops(struct rtw_adapter *padapter)
        pops->_write32 = &usb_write32;
        pops->_writeN = &usb_writeN;
 
-       pops->_write_mem = &usb_write_mem23a;
        pops->_write_port = &usb_write_port23a;
 
        pops->_read_port_cancel = &usb_read_port_cancel23a;

diff --git a/drivers/staging/rtl8723au/include/rtw_io.h b/drivers/staging/rtl8723au/include/rtw_io.h
index 2919dcca3882678f66c911cc6584fbe6ef80e41c..f303213b42a7c65a0457e1f66241fea916172982 100644 (file)
--- a/drivers/staging/rtl8723au/include/rtw_io.h
+++ b/drivers/staging/rtl8723au/include/rtw_io.h
@@ -110,11 +110,6 @@ struct _io_ops
        int (*_writeN)(struct rtw_adapter *adapter, u32 addr, u32 length,
                       u8 *pdata);
 
-       void (*_read_mem)(struct rtw_adapter *adapter, u32 addr, u32 cnt,
-                         u8 *pmem);
-       void (*_write_mem)(struct rtw_adapter *adapter, u32 addr, u32 cnt,
-                          u8 *pmem);
-
        int (*_read_interrupt)(struct rtw_adapter *adapter, u32 addr);
 
        int (*_read_port)(struct rtw_adapter *adapter, u32 addr, u32 cnt,
@@ -258,7 +253,6 @@ void _rtw_attrib_write(struct rtw_adapter *adapter, u32 addr, u32 cnt, u8 *pmem)
 u8 _rtw_read823a(struct rtw_adapter *adapter, u32 addr);
 u16 _rtw_read1623a(struct rtw_adapter *adapter, u32 addr);
 u32 _rtw_read3223a(struct rtw_adapter *adapter, u32 addr);
-void _rtw_read_mem23a(struct rtw_adapter *adapter, u32 addr, u32 cnt, u8 *pmem);
 int _rtw_read_port23a(struct rtw_adapter *adapter, u32 addr, u32 cnt, struct recv_buf *rbuf);
 void _rtw_read_port23a_cancel(struct rtw_adapter *adapter);
 
@@ -267,7 +261,6 @@ int _rtw_write1623a(struct rtw_adapter *adapter, u32 addr, u16 val);
 int _rtw_write3223a(struct rtw_adapter *adapter, u32 addr, u32 val);
 int _rtw_writeN23a(struct rtw_adapter *adapter, u32 addr, u32 length, u8 *pdata);
 
-void _rtw_write_mem23a(struct rtw_adapter *adapter, u32 addr, u32 cnt, u8 *pmem);
 int _rtw_write_port23a(struct rtw_adapter *adapter, u32 addr, u32 cnt, struct xmit_buf *pmem);
 void _rtw_write_port23a_cancel(struct rtw_adapter *adapter);
 
@@ -287,7 +280,6 @@ int dbg_rtw_writeN23a(struct rtw_adapter *adapter, u32 addr ,u32 length , u8 *da
 #define rtw_read8(adapter, addr) dbg_rtw_read823a((adapter), (addr), __FUNCTION__, __LINE__)
 #define rtw_read16(adapter, addr) dbg_rtw_read1623a((adapter), (addr), __FUNCTION__, __LINE__)
 #define rtw_read32(adapter, addr) dbg_rtw_read3223a((adapter), (addr), __FUNCTION__, __LINE__)
-#define rtw_read_mem(adapter, addr, cnt, mem) _rtw_read_mem23a((adapter), (addr), (cnt), (mem))
 #define rtw_read_port(adapter, addr, cnt, mem) _rtw_read_port23a((adapter), (addr), (cnt), (mem))
 #define rtw_read_port_cancel(adapter) _rtw_read_port23a_cancel((adapter))
 
@@ -296,14 +288,12 @@ int dbg_rtw_writeN23a(struct rtw_adapter *adapter, u32 addr ,u32 length , u8 *da
 #define  rtw_write32(adapter, addr, val) dbg_rtw_write3223a((adapter), (addr), (val), __FUNCTION__, __LINE__)
 #define  rtw_writeN(adapter, addr, length, data) dbg_rtw_writeN23a((adapter), (addr), (length), (data), __FUNCTION__, __LINE__)
 
-#define rtw_write_mem(adapter, addr, cnt, mem) _rtw_write_mem23a((adapter), addr, cnt, mem)
 #define rtw_write_port(adapter, addr, cnt, mem) _rtw_write_port23a(adapter, addr, cnt, mem)
 #define rtw_write_port_cancel(adapter) _rtw_write_port23a_cancel(adapter)
 #else /* DBG_IO */
 #define rtw_read8(adapter, addr) _rtw_read823a((adapter), (addr))
 #define rtw_read16(adapter, addr) _rtw_read1623a((adapter), (addr))
 #define rtw_read32(adapter, addr) _rtw_read3223a((adapter), (addr))
-#define rtw_read_mem(adapter, addr, cnt, mem) _rtw_read_mem23a((adapter), (addr), (cnt), (mem))
 #define rtw_read_port(adapter, addr, cnt, mem) _rtw_read_port23a((adapter), (addr), (cnt), (mem))
 #define rtw_read_port_cancel(adapter) _rtw_read_port23a_cancel((adapter))
 
@@ -312,7 +302,6 @@ int dbg_rtw_writeN23a(struct rtw_adapter *adapter, u32 addr ,u32 length , u8 *da
 #define  rtw_write32(adapter, addr, val) _rtw_write3223a((adapter), (addr), (val))
 #define  rtw_writeN(adapter, addr, length, data) _rtw_writeN23a((adapter), (addr), (length), (data))
 
-#define rtw_write_mem(adapter, addr, cnt, mem) _rtw_write_mem23a((adapter), (addr), (cnt), (mem))
 #define rtw_write_port(adapter, addr, cnt, mem) _rtw_write_port23a((adapter), (addr), (cnt), (mem))
 #define rtw_write_port_cancel(adapter) _rtw_write_port23a_cancel((adapter))
 #endif /* DBG_IO */

diff --git a/drivers/staging/rtl8723au/include/usb_ops_linux.h b/drivers/staging/rtl8723au/include/usb_ops_linux.h
index 92d5eb550c63a0c79a7da2fbf13b9d08c40b5ceb..814bc2005c0563b55692de6d2b940c4f86df489a 100644 (file)
--- a/drivers/staging/rtl8723au/include/usb_ops_linux.h
+++ b/drivers/staging/rtl8723au/include/usb_ops_linux.h
@@ -26,7 +26,6 @@
 
 #define _usbctrl_vendorreq_async_callback(urb, regs)           \
        _usbctrl_vendorreq_async_callback(urb)
-#define usb_write_mem23a_complete(purb, regs)  usb_write_mem23a_complete(purb)
 #define usb_write_port23a_complete(purb, regs) usb_write_port23a_complete(purb)
 #define usb_read_port_complete(purb, regs)     usb_read_port_complete(purb)
 #define usb_read_interrupt_complete(purb, regs)                        \
@@ -34,9 +33,6 @@
 
 unsigned int ffaddr2pipehdl23a(struct dvobj_priv *pdvobj, u32 addr);
 
-void usb_read_mem23a(struct rtw_adapter *adapter, u32 addr, u32 cnt, u8 *rmem);
-void usb_write_mem23a(struct rtw_adapter *adapter, u32 addr, u32 cnt, u8 *wmem);
-
 void usb_read_port_cancel23a(struct rtw_adapter *adapter);
 
 int usb_write_port23a(struct rtw_adapter *adapter, u32 addr, u32 cnt,

diff --git a/drivers/staging/rtl8723au/os_dep/usb_ops_linux.c b/drivers/staging/rtl8723au/os_dep/usb_ops_linux.c
index b82dd89de8863e82051b699b3af56cbbde306d11..cd38c78e28684003c0228c58d742ac230f8fb014 100644 (file)
--- a/drivers/staging/rtl8723au/os_dep/usb_ops_linux.c
+++ b/drivers/staging/rtl8723au/os_dep/usb_ops_linux.c
@@ -41,14 +41,6 @@ struct zero_bulkout_context {
        void *padapter;
 };
 
-void usb_read_mem23a(struct rtw_adapter *adapter, u32 addr, u32 cnt, u8 *rmem)
-{
-}
-
-void usb_write_mem23a(struct rtw_adapter *adapter, u32 addr, u32 cnt, u8 *wmem)
-{
-}
-
 void usb_read_port_cancel23a(struct rtw_adapter *padapter)
 {
        struct recv_buf *precvbuf;