mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-06 04:19:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

staging: r8188eu: remove hal_ops

Browse Source 
Remove the last pointer hal_deinit from struct hal_ops and call
rtl8188eu_hal_deinit() directly. Remove the now empty struct
hal_ops.

Signed-off-by: Michael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20211007103943.8433-5-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Michael Straube
2021-10-07 12:39:42 +02:00
committed by Greg Kroah-Hartman
parent b66d42066f
commit 5c78a7583c
4 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/r8188eu/hal/hal_intf.c
View File

@@ -31,7 +31,7 @@ uint rtw_hal_deinit(struct adapter *adapt)
{
uint status = _SUCCESS;
status = adapt->HalFunc.hal_deinit(adapt);
status = rtl8188eu_hal_deinit(adapt);
if (status == _SUCCESS)
adapt->hw_init_completed = false;

6
drivers/staging/r8188eu/hal/usb_halinit.c
View File

@@ -938,7 +938,7 @@ static void CardDisableRTL8188EU(struct adapter *Adapter)
Adapter->bFWReady = false;
}
static u32 rtl8188eu_hal_deinit(struct adapter *Adapter)
u32 rtl8188eu_hal_deinit(struct adapter *Adapter)
{
DBG_88E("==> %s\n", __func__);
@@ -2093,12 +2093,8 @@ void rtl8188eu_init_default_value(struct adapter *adapt)
void rtl8188eu_set_hal_ops(struct adapter *adapt)
{
struct hal_ops *halfunc = &adapt->HalFunc;
adapt->HalData = kzalloc(sizeof(struct hal_data_8188e), GFP_KERNEL);
if (!adapt->HalData)
DBG_88E("cant not alloc memory for HAL DATA\n");
adapt->hal_data_sz = sizeof(struct hal_data_8188e);
halfunc->hal_deinit = &rtl8188eu_hal_deinit;
}

1
drivers/staging/r8188eu/include/drv_types.h
View File

@@ -225,7 +225,6 @@ struct adapter {
void *HalData;
u32 hal_data_sz;
struct hal_ops HalFunc;
s32 bDriverStopped;
s32 bSurpriseRemoved;

5
drivers/staging/r8188eu/include/hal_intf.h
View File

@@ -104,10 +104,6 @@ enum hal_odm_variable {
typedef s32 (*c2h_id_filter)(u8 id);
struct hal_ops {
u32 (*hal_deinit)(struct adapter *padapter);
};
#define RF_CHANGE_BY_INIT 0
#define RF_CHANGE_BY_IPS BIT(28)
#define RF_CHANGE_BY_PS BIT(29)
@@ -156,6 +152,7 @@ uint rtw_hal_deinit(struct adapter *padapter);
void rtw_hal_stop(struct adapter *padapter);
u32 rtl8188eu_hal_init(struct adapter *Adapter);
u32 rtl8188eu_hal_deinit(struct adapter *Adapter);
void rtw_hal_update_ra_mask(struct adapter *padapter, u32 mac_id, u8 level);
void rtw_hal_clone_data(struct adapter *dst_adapt,