From ecee4947a206f97a18a90a0a2c9e90bb89c8a23c Mon Sep 17 00:00:00 2001 From: Ivan Safonov Date: Sat, 3 Sep 2016 22:32:47 +0700 Subject: [PATCH] staging: r8188eu: rename rtl8188eu_InitPowerOn to rtw_hal_power_on And remove many one-line wrappers. Signed-off-by: Ivan Safonov Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8188eu/hal/hal_intf.c | 7 ------- drivers/staging/rtl8188eu/hal/usb_halinit.c | 6 ++---- drivers/staging/rtl8188eu/include/hal_intf.h | 2 -- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/drivers/staging/rtl8188eu/hal/hal_intf.c b/drivers/staging/rtl8188eu/hal/hal_intf.c index b239ffcc26df..c8cfb5ba4be1 100644 --- a/drivers/staging/rtl8188eu/hal/hal_intf.c +++ b/drivers/staging/rtl8188eu/hal/hal_intf.c @@ -37,13 +37,6 @@ void rtw_hal_dm_init(struct adapter *adapt) adapt->HalFunc.dm_init(adapt); } -u32 rtw_hal_power_on(struct adapter *adapt) -{ - if (adapt->HalFunc.hal_power_on) - return adapt->HalFunc.hal_power_on(adapt); - return _FAIL; -} - uint rtw_hal_init(struct adapter *adapt) { uint status = _SUCCESS; diff --git a/drivers/staging/rtl8188eu/hal/usb_halinit.c b/drivers/staging/rtl8188eu/hal/usb_halinit.c index c5ea85290870..36abe9f210c1 100644 --- a/drivers/staging/rtl8188eu/hal/usb_halinit.c +++ b/drivers/staging/rtl8188eu/hal/usb_halinit.c @@ -94,7 +94,7 @@ void rtw_hal_chip_configure(struct adapter *adapt) pdvobjpriv->RtNumInPipes, pdvobjpriv->RtNumOutPipes); } -static u32 rtl8188eu_InitPowerOn(struct adapter *adapt) +u32 rtw_hal_power_on(struct adapter *adapt) { u16 value16; /* HW Power on sequence */ @@ -702,7 +702,7 @@ u32 rtl8188eu_hal_init(struct adapter *Adapter) } HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_INIT_PW_ON); - status = rtl8188eu_InitPowerOn(Adapter); + status = rtw_hal_power_on(Adapter); if (status == _FAIL) { RT_TRACE(_module_hci_hal_init_c_, _drv_err_, ("Failed to init power on!\n")); goto exit; @@ -2050,7 +2050,5 @@ void rtl8188eu_set_hal_ops(struct adapter *adapt) if (!adapt->HalData) DBG_88E("cant not alloc memory for HAL DATA\n"); - halfunc->hal_power_on = rtl8188eu_InitPowerOn; - rtl8188e_set_hal_ops(halfunc); } diff --git a/drivers/staging/rtl8188eu/include/hal_intf.h b/drivers/staging/rtl8188eu/include/hal_intf.h index c4b28958c241..4d779845bb30 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 { - u32 (*hal_power_on)(struct adapter *padapter); - void (*free_hal_data)(struct adapter *padapter); void (*dm_init)(struct adapter *padapter); -- 2.30.2