From: Philipp Hortmann <philipp.g.hortmann@gmail.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org
Cc: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Subject: [PATCH 02/15] staging: rtl8723bs: Remove function pointer hal_deinit
Date: Sat, 5 Oct 2024 22:33:45 +0200 [thread overview]
Message-ID: <b0acbbdc372e01baabd1d98f824bc2a3c6c4c600.1727966761.git.philipp.g.hortmann@gmail.com> (raw)
In-Reply-To: <cover.1727966761.git.philipp.g.hortmann@gmail.com>
Remove function pointer hal_deinit and use rtl8723bs_hal_deinit directly
to increase readability.
Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
---
drivers/staging/rtl8723bs/hal/hal_intf.c | 2 +-
drivers/staging/rtl8723bs/hal/sdio_halinit.c | 4 +---
drivers/staging/rtl8723bs/include/hal_intf.h | 2 --
drivers/staging/rtl8723bs/include/rtl8723b_xmit.h | 1 +
4 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/rtl8723bs/hal/hal_intf.c b/drivers/staging/rtl8723bs/hal/hal_intf.c
index 684d31360f4b..d9121e13fe69 100644
--- a/drivers/staging/rtl8723bs/hal/hal_intf.c
+++ b/drivers/staging/rtl8723bs/hal/hal_intf.c
@@ -107,7 +107,7 @@ uint rtw_hal_deinit(struct adapter *padapter)
uint status = _SUCCESS;
struct dvobj_priv *dvobj = adapter_to_dvobj(padapter);
- status = padapter->HalFunc.hal_deinit(padapter);
+ status = rtl8723bs_hal_deinit(padapter);
if (status == _SUCCESS) {
padapter = dvobj->padapters;
diff --git a/drivers/staging/rtl8723bs/hal/sdio_halinit.c b/drivers/staging/rtl8723bs/hal/sdio_halinit.c
index b4819ff2928f..d7941fdf42e1 100644
--- a/drivers/staging/rtl8723bs/hal/sdio_halinit.c
+++ b/drivers/staging/rtl8723bs/hal/sdio_halinit.c
@@ -884,7 +884,7 @@ static void CardDisableRTL8723BSdio(struct adapter *padapter)
HalPwrSeqCmdParsing(padapter, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK, rtl8723B_card_disable_flow);
}
-static u32 rtl8723bs_hal_deinit(struct adapter *padapter)
+u32 rtl8723bs_hal_deinit(struct adapter *padapter)
{
struct dvobj_priv *psdpriv = padapter->dvobj;
struct debug_priv *pdbgpriv = &psdpriv->drv_dbg;
@@ -1259,8 +1259,6 @@ void rtl8723bs_set_hal_ops(struct adapter *padapter)
rtl8723b_set_hal_ops(pHalFunc);
- pHalFunc->hal_deinit = &rtl8723bs_hal_deinit;
-
pHalFunc->init_xmit_priv = &rtl8723bs_init_xmit_priv;
pHalFunc->free_xmit_priv = &rtl8723bs_free_xmit_priv;
diff --git a/drivers/staging/rtl8723bs/include/hal_intf.h b/drivers/staging/rtl8723bs/include/hal_intf.h
index fc3a94e40721..40383d3cdcef 100644
--- a/drivers/staging/rtl8723bs/include/hal_intf.h
+++ b/drivers/staging/rtl8723bs/include/hal_intf.h
@@ -162,8 +162,6 @@ enum hal_intf_ps_func {
typedef s32 (*c2h_id_filter)(u8 *c2h_evt);
struct hal_ops {
- u32 (*hal_deinit)(struct adapter *padapter);
-
void (*free_hal_data)(struct adapter *padapter);
s32 (*init_xmit_priv)(struct adapter *padapter);
diff --git a/drivers/staging/rtl8723bs/include/rtl8723b_xmit.h b/drivers/staging/rtl8723bs/include/rtl8723b_xmit.h
index 5e3483cb22db..ac4ca7e05b9b 100644
--- a/drivers/staging/rtl8723bs/include/rtl8723b_xmit.h
+++ b/drivers/staging/rtl8723bs/include/rtl8723b_xmit.h
@@ -406,6 +406,7 @@ void rtl8723b_update_txdesc(struct xmit_frame *pxmitframe, u8 *pmem);
void rtl8723b_fill_fake_txdesc(struct adapter *padapter, u8 *pDesc, u32 BufferLen, u8 IsPsPoll, u8 IsBTQosNull, u8 bDataFrame);
u32 rtl8723bs_hal_init(struct adapter *padapter);
+u32 rtl8723bs_hal_deinit(struct adapter *padapter);
s32 rtl8723bs_init_xmit_priv(struct adapter *padapter);
void rtl8723bs_free_xmit_priv(struct adapter *padapter);
s32 rtl8723bs_hal_xmit(struct adapter *padapter, struct xmit_frame *pxmitframe);
--
2.43.0
next prev parent reply other threads:[~2024-10-05 20:34 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-05 20:33 [PATCH 00/15] staging: rtl8723bs: Remove function pointers starting with hal_init Philipp Hortmann
2024-10-05 20:33 ` [PATCH 01/15] staging: rtl8723bs: Remove function pointer hal_init Philipp Hortmann
2024-10-05 20:33 ` Philipp Hortmann [this message]
2024-10-05 20:33 ` [PATCH 03/15] staging: rtl8723bs: Remove function pointer free_hal_data Philipp Hortmann
2024-10-05 20:33 ` [PATCH 04/15] staging: rtl8723bs: Remove function pointer init_xmit_priv Philipp Hortmann
2024-10-05 20:33 ` [PATCH 05/15] staging: rtl8723bs: Remove function pointer free_xmit_priv Philipp Hortmann
2024-10-05 20:33 ` [PATCH 06/15] staging: rtl8723bs: Remove function pointer init_recv_priv Philipp Hortmann
2024-10-05 20:33 ` [PATCH 07/15] staging: rtl8723bs: Remove function pointer free_recv_priv Philipp Hortmann
2024-10-05 20:33 ` [PATCH 08/15] staging: rtl8723bs: Remove function pointer dm_init Philipp Hortmann
2024-10-05 20:33 ` [PATCH 09/15] staging: rtl8723bs: Remove function pointer dm_deinit Philipp Hortmann
2024-10-05 20:33 ` [PATCH 10/15] staging: rtl8723bs: Remove function pointer read_chip_version Philipp Hortmann
2024-10-05 20:33 ` [PATCH 11/15] staging: rtl8723bs: Remove function pointer init_default_value Philipp Hortmann
2024-10-05 20:33 ` [PATCH 12/15] staging: rtl8723bs: Remove function pointer intf_chip_configure Philipp Hortmann
2024-10-05 20:33 ` [PATCH 13/15] staging: rtl8723bs: Remove function pointer read_adapter_info Philipp Hortmann
2024-10-05 20:33 ` [PATCH 14/15] staging: rtl8723bs: Remove function pointer enable_interrupt Philipp Hortmann
2024-10-05 20:33 ` [PATCH 15/15] staging: rtl8723bs: Remove function pointer disable_interrupt Philipp Hortmann
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=b0acbbdc372e01baabd1d98f824bc2a3c6c4c600.1727966761.git.philipp.g.hortmann@gmail.com \
--to=philipp.g.hortmann@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
/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
all inboxes | Powered by JetHome®