staging: rtl8723au: Call usb_{read,write}_port() functions directly

Get rid of more HAL layer obfuscations

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 532ad75..45866d7 100644 (file)
--- a/drivers/staging/rtl8723au/core/rtw_io.c
+++ b/drivers/staging/rtl8723au/core/rtw_io.c
@@ -114,25 +114,3 @@ int _rtw_writeN23a(struct rtw_adapter *adapter, u32 addr , u32 length , u8 *pdat
        else
                return _SUCCESS;
 }
-
-void _rtw_read_port23a_cancel(struct rtw_adapter *adapter)
-{
-       void (*_read_port_cancel)(struct rtw_adapter *adapter);
-       struct _io_ops *io_ops = &adapter->io_ops;
-
-       _read_port_cancel = io_ops->_read_port_cancel;
-
-       if (_read_port_cancel)
-               _read_port_cancel(adapter);
-}
-
-void _rtw_write_port23a_cancel(struct rtw_adapter *adapter)
-{
-       void (*_write_port_cancel)(struct rtw_adapter *adapter);
-       struct _io_ops *io_ops = &adapter->io_ops;
-
-       _write_port_cancel = io_ops->_write_port_cancel;
-
-       if (_write_port_cancel)
-               _write_port_cancel(adapter);
-}

diff --cc drivers/staging/rtl8723au/hal/usb_halinit.c
Simple merge

diff --cc drivers/staging/rtl8723au/hal/usb_ops_linux.c
Simple merge

diff --cc drivers/staging/rtl8723au/include/rtw_io.h
Simple merge

diff --cc drivers/staging/rtl8723au/include/usb_ops_linux.h
Simple merge

diff --cc drivers/staging/rtl8723au/os_dep/usb_intf.c
Simple merge

diff --cc drivers/staging/rtl8723au/os_dep/usb_ops_linux.c
Simple merge