staging: rtl8723au: Fold rtw_init_io_priv23a() into rtl8723au_set_intf_ops()

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 e53179f..ef859fb 100644 (file)
--- a/drivers/staging/rtl8723au/core/rtw_io.c
+++ b/drivers/staging/rtl8723au/core/rtw_io.c
@@ -213,21 +213,3 @@ void _rtw_write_port23a_cancel(struct rtw_adapter *adapter)
        if (_write_port_cancel)
                _write_port_cancel(pintfhdl);
 }
-
-int rtw_init_io_priv23a(struct rtw_adapter *padapter,
-                    void (*set_intf_ops)(struct _io_ops *pops))
-{
-       struct io_priv  *piopriv = &padapter->iopriv;
-       struct intf_hdl *pintf = &piopriv->intf;
-
-       if (set_intf_ops == NULL)
-               return _FAIL;
-
-       piopriv->padapter = padapter;
-       pintf->padapter = padapter;
-       pintf->pintf_dev = adapter_to_dvobj(padapter);
-
-       set_intf_ops(&pintf->io_ops);
-
-       return _SUCCESS;
-}

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.h
Simple merge

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