diff options
| author | Ivan Safonov | 2016-09-03 17:33:40 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2016-09-12 11:30:03 +0200 |
| commit | 2490fbf7b600237c508cef698945b2e3f4dbaf22 (patch) | |
| tree | 9e80c4f14eb449cbbfbe7145daedb28c85b48d9d | |
| parent | staging: r8188eu: rename rtl8188e_init_dm_priv to rtw_hal_dm_init (diff) | |
| download | kernel-qcow2-linux-2490fbf7b600237c508cef698945b2e3f4dbaf22.tar.gz kernel-qcow2-linux-2490fbf7b600237c508cef698945b2e3f4dbaf22.tar.xz kernel-qcow2-linux-2490fbf7b600237c508cef698945b2e3f4dbaf22.zip | |
staging: r8188eu: rename rtl8188e_free_hal_data to rtw_hal_free_data
And remove two one-line wrappers.
Signed-off-by: Ivan Safonov <insafonov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/rtl8188eu/hal/hal_intf.c | 6 | ||||
| -rw-r--r-- | drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 3 | ||||
| -rw-r--r-- | drivers/staging/rtl8188eu/include/hal_intf.h | 2 |
3 files changed, 1 insertions, 10 deletions
diff --git a/drivers/staging/rtl8188eu/hal/hal_intf.c b/drivers/staging/rtl8188eu/hal/hal_intf.c index 094c4542a682..d76ccd0eb1e5 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 d1f89f867732..85794cbdb8bf 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 0228c374c667..9b3528a48e95 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); |