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

staging: rtl8723au: Fold _rtw_init_evt_priv23a() into rtw_init_evt_priv23a()

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_cmd.c b/drivers/staging/rtl8723au/core/rtw_cmd.c
index d3b2ea1cd48b..4f9988d794a9 100644
--- a/drivers/staging/rtl8723au/core/rtw_cmd.c
+++ b/drivers/staging/rtl8723au/core/rtw_cmd.c
@@ -215,10 +215,9 @@ exit:
 /* forward definition */
 
 static void c2h_wk_callback(struct work_struct *work);
-int _rtw_init_evt_priv23a(struct evt_priv *pevtpriv)
-{
-	int res = _SUCCESS;
 
+u32 rtw_init_evt_priv23a(struct evt_priv *pevtpriv)
+{
 	/* allocate DMA-able/Non-Page memory for cmd_buf and rsp_buf */
 	atomic_set(&pevtpriv->event_seq, 0);
 	pevtpriv->evt_done_cnt = 0;
@@ -227,16 +226,7 @@ int _rtw_init_evt_priv23a(struct evt_priv *pevtpriv)
 	pevtpriv->c2h_wk_alive = false;
 	pevtpriv->c2h_queue = rtw_cbuf_alloc23a(C2H_QUEUE_MAX_LEN + 1);
 
-	return res;
-}
-
-u32 rtw_init_evt_priv23a(struct evt_priv *pevtpriv)
-{
-	int res;
-
-	res = _rtw_init_evt_priv23a(pevtpriv);
-
-	return res;
+	return _SUCCESS;
 }
 
 void rtw_free_evt_priv23a(struct evt_priv *pevtpriv)
diff --git a/drivers/staging/rtl8723au/include/cmd_osdep.h b/drivers/staging/rtl8723au/include/cmd_osdep.h
index fd7ac4d67dc9..d21382ec506e 100644
--- a/drivers/staging/rtl8723au/include/cmd_osdep.h
+++ b/drivers/staging/rtl8723au/include/cmd_osdep.h
@@ -18,7 +18,6 @@
 #include <osdep_service.h>
 #include <drv_types.h>
 
-int _rtw_init_evt_priv23a(struct evt_priv *pevtpriv);
 int _rtw_enqueue_cmd23a(struct rtw_queue *queue, struct cmd_obj *obj);
 
 #endif