diff options
| author |   Michael Straube <straube.linux@gmail.com> | 2021-09-06 21:01:47 +0200 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-09-13 08:49:50 +0200 |
| commit | aa21a7e4366d0b2bf1b241254b42e208b483ab77 (patch) | |
| tree | 5d8ec7b41b1e9b551f952cb81484a6146cf8f3ed /drivers | |
| parent | staging: r8188eu: remove dm_init from hal_ops (diff) | |
staging: r8188eu: remove dm_deinit from hal_ops
Remove dm_deinit from hal_ops and remove its wrapper
rtw_hal_dm_deinit(). Call rtl8188e_deinit_dm_priv() directly instead.
Signed-off-by: Michael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20210906190223.11396-5-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/r8188eu/hal/hal_intf.c | 7 | ||||
| -rw-r--r-- | drivers/staging/r8188eu/hal/rtl8188e_hal_init.c | 2 | ||||
| -rw-r--r-- | drivers/staging/r8188eu/include/hal_intf.h | 4 | ||||
| -rw-r--r-- | drivers/staging/r8188eu/os_dep/os_intfs.c | 2 |
4 files changed, 1 insertions, 14 deletions
diff --git a/drivers/staging/r8188eu/hal/hal_intf.c b/drivers/staging/r8188eu/hal/hal_intf.c index a3b3dd11ba6e..d467e734a699 100644 --- a/drivers/staging/r8188eu/hal/hal_intf.c +++ b/drivers/staging/r8188eu/hal/hal_intf.c @@ -12,13 +12,6 @@ void rtw_hal_free_data(struct adapter *adapt) adapt->HalFunc.free_hal_data(adapt); } -void rtw_hal_dm_deinit(struct adapter *adapt) -{ - /* cancel dm timer */ - if (adapt->HalFunc.dm_deinit) - adapt->HalFunc.dm_deinit(adapt); -} - u32 rtw_hal_power_on(struct adapter *adapt) { if (adapt->HalFunc.hal_power_on) diff --git a/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c b/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c index 765c8c4321f1..355878ec270d 100644 --- a/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c +++ b/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c @@ -1784,8 +1784,6 @@ void rtl8188e_set_hal_ops(struct hal_ops *pHalFunc) { pHalFunc->free_hal_data = &rtl8188e_free_hal_data; - pHalFunc->dm_deinit = &rtl8188e_deinit_dm_priv; - pHalFunc->set_bwmode_handler = &PHY_SetBWMode8188E; pHalFunc->set_channel_handler = &PHY_SwChnl8188E; diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r8188eu/include/hal_intf.h index 7d502701be27..61f4a6bcb7dc 100644 --- a/drivers/staging/r8188eu/include/hal_intf.h +++ b/drivers/staging/r8188eu/include/hal_intf.h @@ -143,8 +143,6 @@ struct hal_ops { s32 (*init_recv_priv)(struct adapter *padapter); void (*free_recv_priv)(struct adapter *padapter); - void (*dm_deinit)(struct adapter *padapter); - void (*set_bwmode_handler)(struct adapter *padapter, enum ht_channel_width Bandwidth, u8 Offset); @@ -250,8 +248,6 @@ void rtl8188eu_init_default_value(struct adapter *adapt); void rtw_hal_free_data(struct adapter *padapter); -void rtw_hal_dm_deinit(struct adapter *padapter); - u32 rtw_hal_power_on(struct adapter *padapter); uint rtw_hal_init(struct adapter *padapter); uint rtw_hal_deinit(struct adapter *padapter); diff --git a/drivers/staging/r8188eu/os_dep/os_intfs.c b/drivers/staging/r8188eu/os_dep/os_intfs.c index 8458144fc555..3dd0aa3924e6 100644 --- a/drivers/staging/r8188eu/os_dep/os_intfs.c +++ b/drivers/staging/r8188eu/os_dep/os_intfs.c @@ -913,7 +913,7 @@ void rtw_cancel_all_timer(struct adapter *padapter) _cancel_timer_ex(&padapter->recvpriv.signal_stat_timer); /* cancel dm timer */ - rtw_hal_dm_deinit(padapter); + rtl8188e_deinit_dm_priv(padapter); } u8 rtw_free_drv_sw(struct adapter *padapter) |