From: Jes Sorensen <Jes.Sorensen@redhat.com>
Date: Sat, 26 Apr 2014 16:55:21 +0000 (+0200)
Subject: staging: rtl8723au: Fold rtw_init_io_priv23a() into rtl8723au_set_intf_ops()
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5827c6555ce5edfba003deedc00cc30efca600f7;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

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 e53179fa505c..ef859fbcdd9e 100644
--- 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 --git a/drivers/staging/rtl8723au/hal/usb_ops_linux.c b/drivers/staging/rtl8723au/hal/usb_ops_linux.c
index 0311cdf77ff1..a785bb5c2183 100644
--- a/drivers/staging/rtl8723au/hal/usb_ops_linux.c
+++ b/drivers/staging/rtl8723au/hal/usb_ops_linux.c
@@ -815,8 +815,15 @@ void rtl8723au_xmit_tasklet(void *priv)
 	}
 }
 
-void rtl8723au_set_intf_ops(struct _io_ops *pops)
+void rtl8723au_set_intf_ops(struct rtw_adapter *padapter)
 {
+	struct io_priv	*piopriv = &padapter->iopriv;
+	struct intf_hdl *pintf = &piopriv->intf;
+	struct _io_ops *pops = &pintf->io_ops;
+
+	piopriv->padapter = padapter;
+	pintf->padapter = padapter;
+	pintf->pintf_dev = adapter_to_dvobj(padapter);
 
 	memset((u8 *)pops, 0, sizeof(struct _io_ops));
 
diff --git a/drivers/staging/rtl8723au/include/rtw_io.h b/drivers/staging/rtl8723au/include/rtw_io.h
index eea6dc27c105..0072b810ea51 100644
--- a/drivers/staging/rtl8723au/include/rtw_io.h
+++ b/drivers/staging/rtl8723au/include/rtw_io.h
@@ -373,8 +373,6 @@ void ioreq_write8(struct rtw_adapter *adapter, u32 addr, u8 val);
 void ioreq_write16(struct rtw_adapter *adapter, u32 addr, u16 val);
 void ioreq_write32(struct rtw_adapter *adapter, u32 addr, u32 val);
 
-int rtw_init_io_priv23a(struct rtw_adapter *padapter, void (*set_intf_ops)(struct _io_ops *pops));
-
 uint alloc_io_queue(struct rtw_adapter *adapter);
 void free_io_queue(struct rtw_adapter *adapter);
 void async_bus_io(struct io_queue *pio_q);
diff --git a/drivers/staging/rtl8723au/include/usb_ops.h b/drivers/staging/rtl8723au/include/usb_ops.h
index 21950541a2f1..1013406c9c77 100644
--- a/drivers/staging/rtl8723au/include/usb_ops.h
+++ b/drivers/staging/rtl8723au/include/usb_ops.h
@@ -45,7 +45,7 @@ enum {
 void rtl8723au_set_hw_type(struct rtw_adapter *padapter);
 #define hal_set_hw_type rtl8723au_set_hw_type
 
-void rtl8723au_set_intf_ops(struct _io_ops *pops);
+void rtl8723au_set_intf_ops(struct rtw_adapter *padapter);
 
 void rtl8723au_recv_tasklet(void *priv);
 
diff --git a/drivers/staging/rtl8723au/os_dep/usb_intf.c b/drivers/staging/rtl8723au/os_dep/usb_intf.c
index 9f819ea8e53c..87ba2073ede4 100644
--- a/drivers/staging/rtl8723au/os_dep/usb_intf.c
+++ b/drivers/staging/rtl8723au/os_dep/usb_intf.c
@@ -623,7 +623,7 @@ static struct rtw_adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj,
 	padapter->intf_stop = &usb_intf_stop;
 
 	/* step init_io_priv */
-	rtw_init_io_priv23a(padapter, rtl8723au_set_intf_ops);
+	rtl8723au_set_intf_ops(padapter);
 
 	/* step read_chip_version */
 	rtw_hal_read_chip_version23a(padapter);