diff options
| author | Jes Sorensen <Jes.Sorensen@redhat.com> | 2014-05-16 10:04:06 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-05-16 11:34:24 -0700 |
| commit | db20a02baf6bb95bdb6e0b048f4fb28e830edc8b (patch) | |
| tree | c110143c11e56a5b0accc3563026272a14205c5b | |
| parent | 1aaa37613ff34f2a2828aee3d9dfb9e83c6b340f (diff) | |
staging: rtl8723au: We love wrappers!
Get rid of pointless wrapper around a simple kfree()
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/rtl8723au/hal/hal_intf.c | 5 | ||||
| -rw-r--r-- | drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c | 10 | ||||
| -rw-r--r-- | drivers/staging/rtl8723au/include/hal_intf.h | 4 | ||||
| -rw-r--r-- | drivers/staging/rtl8723au/os_dep/os_intfs.c | 3 |
4 files changed, 2 insertions, 20 deletions
diff --git a/drivers/staging/rtl8723au/hal/hal_intf.c b/drivers/staging/rtl8723au/hal/hal_intf.c index b462fc53aa92..ad8c430657d1 100644 --- a/drivers/staging/rtl8723au/hal/hal_intf.c +++ b/drivers/staging/rtl8723au/hal/hal_intf.c @@ -28,11 +28,6 @@ void rtw_hal_chip_configure23a(struct rtw_adapter *padapter) padapter->HalFunc.intf_chip_configure(padapter); } -void rtw_hal_free_data23a(struct rtw_adapter *padapter) -{ - if (padapter->HalFunc.free_hal_data) - padapter->HalFunc.free_hal_data(padapter); -} void rtw_hal_sw_led_init23a(struct rtw_adapter *padapter) { if (padapter->HalFunc.InitSwLeds) diff --git a/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c b/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c index b2e2734f26c4..8764172faaa4 100644 --- a/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c +++ b/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c @@ -427,14 +427,6 @@ void rtl8723a_InitializeFirmwareVars(struct rtw_adapter *padapter) pHalData->LastHMEBoxNum = 0; } -static void rtl8723a_free_hal_data(struct rtw_adapter *padapter) -{ - - kfree(padapter->HalData); - padapter->HalData = NULL; - -} - /* */ /* Efuse related code */ /* */ @@ -1714,8 +1706,6 @@ exit: void rtl8723a_set_hal_ops(struct hal_ops *pHalFunc) { - pHalFunc->free_hal_data = &rtl8723a_free_hal_data; - pHalFunc->set_bwmode_handler = &PHY_SetBWMode23a8723A; pHalFunc->set_channel_handler = &PHY_SwChnl8723A; diff --git a/drivers/staging/rtl8723au/include/hal_intf.h b/drivers/staging/rtl8723au/include/hal_intf.h index f56d7578b74e..5009c7d73b65 100644 --- a/drivers/staging/rtl8723au/include/hal_intf.h +++ b/drivers/staging/rtl8723au/include/hal_intf.h @@ -65,8 +65,6 @@ struct hal_ops { u32 (*hal_init)(struct rtw_adapter *padapter); u32 (*hal_deinit)(struct rtw_adapter *padapter); - void (*free_hal_data)(struct rtw_adapter *padapter); - s32 (*init_xmit_priv)(struct rtw_adapter *padapter); s32 (*init_recv_priv)(struct rtw_adapter *padapter); @@ -173,8 +171,6 @@ void rtw_hal_def_value_init23a(struct rtw_adapter *padapter); int pm_netdev_open23a(struct net_device *pnetdev, u8 bnormal); int rtw_resume_process23a(struct rtw_adapter *padapter); -void rtw_hal_free_data23a(struct rtw_adapter *padapter); - void rtw_hal_sw_led_init23a(struct rtw_adapter *padapter); void rtw_hal_sw_led_deinit23a(struct rtw_adapter *padapter); diff --git a/drivers/staging/rtl8723au/os_dep/os_intfs.c b/drivers/staging/rtl8723au/os_dep/os_intfs.c index 38ad4ab45206..3a455d111a33 100644 --- a/drivers/staging/rtl8723au/os_dep/os_intfs.c +++ b/drivers/staging/rtl8723au/os_dep/os_intfs.c @@ -584,7 +584,8 @@ u8 rtw_free_drv_sw23a(struct rtw_adapter *padapter) rtw_free_pwrctrl_priv(padapter); - rtw_hal_free_data23a(padapter); + kfree(padapter->HalData); + padapter->HalData = NULL; RT_TRACE(_module_os_intfs_c_, _drv_info_, ("<== rtw_free_drv_sw23a\n")); |