mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH 58/63] staging: r8188eu: rename rtl8188e_free_hal_data to rtw_hal_free_data
@ 2016-09-03 15:33 Ivan Safonov
  0 siblings, 0 replies; only message in thread
From: Ivan Safonov @ 2016-09-03 15:33 UTC (permalink / raw)
  To: Greg Kroah-Hartman, Bhaktipriya Shridhar, Binoy Jayan,
	Arnd Bergmann, Shraddha Barke, devel, linux-kernel
  Cc: Ivan Safonov

And remove two one-line wrappers.

Signed-off-by: Ivan Safonov <insafonov@gmail.com>
---
 drivers/staging/rtl8188eu/hal/hal_intf.c          | 6 ------
 drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 3 +--
 drivers/staging/rtl8188eu/include/hal_intf.h      | 2 --
 3 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/drivers/staging/rtl8188eu/hal/hal_intf.c b/drivers/staging/rtl8188eu/hal/hal_intf.c
index 094c454..d76ccd0 100644
--- a/drivers/staging/rtl8188eu/hal/hal_intf.c
+++ b/drivers/staging/rtl8188eu/hal/hal_intf.c
@@ -19,12 +19,6 @@
 #include <hal_intf.h>
 #include <usb_hal.h>
 
-void rtw_hal_free_data(struct adapter *adapt)
-{
-	if (adapt->HalFunc.free_hal_data)
-		adapt->HalFunc.free_hal_data(adapt);
-}
-
 uint	 rtw_hal_init(struct adapter *adapt)
 {
 	uint	status = _SUCCESS;
diff --git a/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c b/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
index d1f89f8..85794cb 100644
--- a/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
+++ b/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
@@ -117,7 +117,7 @@ void rtl8188e_InitializeFirmwareVars(struct adapter *padapter)
 	pHalData->LastHMEBoxNum = 0;
 }
 
-static void rtl8188e_free_hal_data(struct adapter *padapter)
+void rtw_hal_free_data(struct adapter *padapter)
 {
 	kfree(padapter->HalData);
 	padapter->HalData = NULL;
@@ -187,7 +187,6 @@ void rtw_hal_notch_filter(struct adapter *adapter, bool enable)
 }
 void rtl8188e_set_hal_ops(struct hal_ops *pHalFunc)
 {
-	pHalFunc->free_hal_data = &rtl8188e_free_hal_data;
 }
 
 /*  */
diff --git a/drivers/staging/rtl8188eu/include/hal_intf.h b/drivers/staging/rtl8188eu/include/hal_intf.h
index 0228c374..9b3528a 100644
--- a/drivers/staging/rtl8188eu/include/hal_intf.h
+++ b/drivers/staging/rtl8188eu/include/hal_intf.h
@@ -140,8 +140,6 @@ enum hal_intf_ps_func {
 };
 
 struct hal_ops {
-	void	(*free_hal_data)(struct adapter *padapter);
-
 	s32	(*interrupt_handler)(struct adapter *padapter);
 
 	void (*hal_reset_security_engine)(struct adapter *adapter);
-- 
2.7.3

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2016-09-03 15:41 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-09-03 15:33 [PATCH 58/63] staging: r8188eu: rename rtl8188e_free_hal_data to rtw_hal_free_data Ivan Safonov

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®