From: Michael Straube <straube.linux@gmail.com>
To: gregkh@linuxfoundation.org
Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk,
martin@kaiser.cx, fmdefrancesco@gmail.com,
linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org,
Michael Straube <straube.linux@gmail.com>
Subject: [PATCH v3 04/40] staging: r8188eu: remove dm_deinit from hal_ops
Date: Mon, 6 Sep 2021 21:01:47 +0200 [thread overview]
Message-ID: <20210906190223.11396-5-straube.linux@gmail.com> (raw)
In-Reply-To: <20210906190223.11396-1-straube.linux@gmail.com>
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>
---
drivers/staging/r8188eu/hal/hal_intf.c | 7 -------
drivers/staging/r8188eu/hal/rtl8188e_hal_init.c | 2 --
drivers/staging/r8188eu/include/hal_intf.h | 4 ----
drivers/staging/r8188eu/os_dep/os_intfs.c | 2 +-
4 files changed, 1 insertion(+), 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 c5dc02d30349..039c05ffbc57 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)
--
2.33.0
next prev parent reply other threads:[~2021-09-06 19:02 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-06 19:01 [PATCH v3 00/40] staging: r8188eu: remove function pointers from struct hal_ops Michael Straube
2021-09-06 19:01 ` [PATCH v3 01/40] staging: r8188eu: remove InitSwLeds from hal_ops Michael Straube
2021-09-06 19:01 ` [PATCH v3 02/40] staging: r8188eu: remove DeInitSwLeds " Michael Straube
2021-09-06 19:01 ` [PATCH v3 03/40] staging: r8188eu: remove dm_init " Michael Straube
2021-09-06 19:01 ` Michael Straube [this message]
2021-09-06 19:01 ` [PATCH v3 05/40] staging: r8188eu: remove SetHalODMVarHandler " Michael Straube
2021-09-06 19:01 ` [PATCH v3 06/40] staging: r8188eu: remove empty functions Michael Straube
2021-09-06 19:01 ` [PATCH v3 07/40] staging: r8188eu: remove unused function rtw_interface_ps_func() Michael Straube
2021-09-06 19:01 ` [PATCH v3 08/40] staging: r8188eu: remove interface_ps_func from hal_ops Michael Straube
2021-09-06 19:01 ` [PATCH v3 09/40] staging: r8188eu: remove hal_dm_watchdog " Michael Straube
2021-09-06 19:01 ` [PATCH v3 10/40] staging: r8188eu: remove set_bwmode_handler " Michael Straube
2021-09-06 19:01 ` [PATCH v3 11/40] staging: r8188eu: remove set_channel_handler " Michael Straube
2021-09-06 19:01 ` [PATCH v3 12/40] staging: r8188eu: remove unused enum hal_intf_ps_func Michael Straube
2021-09-06 19:01 ` [PATCH v3 13/40] staging: r8188eu: remove Add_RateATid from hal_ops Michael Straube
2021-09-06 19:01 ` [PATCH v3 14/40] staging: r8188eu: remove hal_power_on " Michael Straube
2021-09-06 19:01 ` [PATCH v3 15/40] staging: r8188eu: remove sreset_init_value " Michael Straube
2021-09-06 19:01 ` [PATCH v3 16/40] staging: r8188eu: remove sreset_reset_value " Michael Straube
2021-09-06 19:02 ` [PATCH v3 17/40] staging: r8188eu: remove silentreset " Michael Straube
2021-09-06 19:02 ` [PATCH v3 18/40] staging: r8188eu: remove sreset_xmit_status_check " Michael Straube
2021-09-06 19:02 ` [PATCH v3 19/40] staging: r8188eu: remove sreset_linked_status_check " Michael Straube
2021-09-06 19:02 ` [PATCH v3 20/40] staging: r8188eu: remove sreset_get_wifi_status " Michael Straube
2021-09-06 19:02 ` [PATCH v3 21/40] staging: r8188eu: remove EfusePowerSwitch " Michael Straube
2021-09-06 19:02 ` [PATCH v3 22/40] staging: r8188eu: rename hal_EfusePowerSwitch_RTL8188E() Michael Straube
2021-09-06 19:02 ` [PATCH v3 23/40] staging: r8188eu: remove wrapper Efuse_PowerSwitch() Michael Straube
2021-09-06 19:02 ` [PATCH v3 24/40] staging: r8188eu: remove ReadEFuse from hal_ops Michael Straube
2021-09-06 19:02 ` [PATCH v3 25/40] staging: r8188eu: remove EFUSEGetEfuseDefinition " Michael Straube
2021-09-06 19:02 ` [PATCH v3 26/40] staging: r8188eu: remove EfuseGetCurrentSize " Michael Straube
2021-09-06 19:02 ` [PATCH v3 27/40] staging: r8188eu: remove empty comments Michael Straube
2021-09-06 19:02 ` [PATCH v3 28/40] staging: r8188eu: remove Efuse_PgPacketRead from hal_ops Michael Straube
2021-09-06 19:02 ` [PATCH v3 29/40] staging: r8188eu: remove Efuse_PgPacketWrite " Michael Straube
2021-09-06 19:02 ` [PATCH v3 30/40] staging: r8188eu: remove Efuse_WordEnableDataWrite " Michael Straube
2021-09-06 19:02 ` [PATCH v3 31/40] staging: r8188eu: remove useless assignment Michael Straube
2021-09-06 19:02 ` [PATCH v3 32/40] staging: r8188eu: remove AntDivBeforeLinkHandler from hal_ops Michael Straube
2021-09-06 19:02 ` [PATCH v3 33/40] staging: r8188eu: remove AntDivCompareHandler " Michael Straube
2021-09-06 19:02 ` [PATCH v3 34/40] staging: r8188eu: remove empty function rtl8188e_start_thread() Michael Straube
2021-09-06 19:02 ` [PATCH v3 35/40] staging: r8188eu: remove empty function rtl8188e_stop_thread() Michael Straube
2021-09-06 19:02 ` [PATCH v3 36/40] staging: r8188eu: remove hal_notch_filter from hal_ops Michael Straube
2021-09-06 19:02 ` [PATCH v3 37/40] staging: r8188eu: remove free_hal_data " Michael Straube
2021-09-06 19:02 ` [PATCH v3 38/40] staging: r8188eu: remove unused function rtl8188e_clone_haldata() Michael Straube
2021-09-06 19:02 ` [PATCH v3 39/40] staging: r8188eu: remove SetBeaconRelatedRegistersHandler from hal_ops Michael Straube
2021-09-06 19:02 ` [PATCH v3 40/40] staging: r8188eu: remove UpdateHalRAMask8188EUsb " Michael Straube
2021-09-06 22:57 ` [PATCH v3 00/40] staging: r8188eu: remove function pointers from struct hal_ops Kari Argillander
2021-09-07 5:00 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210906190223.11396-5-straube.linux@gmail.com \
--to=straube.linux@gmail.com \
--cc=Larry.Finger@lwfinger.net \
--cc=fmdefrancesco@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=martin@kaiser.cx \
--cc=phil@philpotter.co.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).