From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754418AbcICPln (ORCPT ); Sat, 3 Sep 2016 11:41:43 -0400 Received: from mail-lf0-f66.google.com ([209.85.215.66]:35948 "EHLO mail-lf0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754356AbcICPle (ORCPT ); Sat, 3 Sep 2016 11:41:34 -0400 Date: Sat, 3 Sep 2016 22:33:40 +0700 From: Ivan Safonov To: Greg Kroah-Hartman , Bhaktipriya Shridhar , Binoy Jayan , Arnd Bergmann , Shraddha Barke , devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Cc: Ivan Safonov Subject: [PATCH 58/63] staging: r8188eu: rename rtl8188e_free_hal_data to rtw_hal_free_data Message-ID: <20160903153340.GA17243@alpha.sfu-kras.ru> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org And remove two one-line wrappers. Signed-off-by: Ivan Safonov --- 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 #include -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