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 11/15] staging: rtl8723bs: Remove function pointer init_default_value
Date: Sat, 5 Oct 2024 22:33:54 +0200 [thread overview]
Message-ID: <d0bb58235d54d1c7e4806c5ea3a50dbf77c293e7.1727966761.git.philipp.g.hortmann@gmail.com> (raw)
In-Reply-To: <cover.1727966761.git.philipp.g.hortmann@gmail.com>
Remove function pointer init_default_value and use
rtl8723bs_init_default_value directly to increase readability.
Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
---
drivers/staging/rtl8723bs/hal/hal_intf.c | 3 +--
drivers/staging/rtl8723bs/hal/sdio_halinit.c | 3 +--
drivers/staging/rtl8723bs/include/hal_intf.h | 2 --
drivers/staging/rtl8723bs/include/rtl8723b_recv.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 8c80e0735840..bcbc9ea78951 100644
--- a/drivers/staging/rtl8723bs/hal/hal_intf.c
+++ b/drivers/staging/rtl8723bs/hal/hal_intf.c
@@ -26,8 +26,7 @@ void rtw_hal_read_chip_version(struct adapter *padapter)
void rtw_hal_def_value_init(struct adapter *padapter)
{
- if (padapter->HalFunc.init_default_value)
- padapter->HalFunc.init_default_value(padapter);
+ rtl8723bs_init_default_value(padapter);
}
void rtw_hal_free_data(struct adapter *padapter)
diff --git a/drivers/staging/rtl8723bs/hal/sdio_halinit.c b/drivers/staging/rtl8723bs/hal/sdio_halinit.c
index 52cd980c2003..236effa5c96e 100644
--- a/drivers/staging/rtl8723bs/hal/sdio_halinit.c
+++ b/drivers/staging/rtl8723bs/hal/sdio_halinit.c
@@ -937,7 +937,7 @@ u32 rtl8723bs_hal_deinit(struct adapter *padapter)
return _SUCCESS;
}
-static void rtl8723bs_init_default_value(struct adapter *padapter)
+void rtl8723bs_init_default_value(struct adapter *padapter)
{
struct hal_com_data *pHalData;
@@ -1259,7 +1259,6 @@ void rtl8723bs_set_hal_ops(struct adapter *padapter)
rtl8723b_set_hal_ops(pHalFunc);
- pHalFunc->init_default_value = &rtl8723bs_init_default_value;
pHalFunc->intf_chip_configure = &rtl8723bs_interface_configure;
pHalFunc->read_adapter_info = &ReadAdapterInfo8723BS;
diff --git a/drivers/staging/rtl8723bs/include/hal_intf.h b/drivers/staging/rtl8723bs/include/hal_intf.h
index 9b0e9c0bf020..357b41894cf1 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 {
- void (*init_default_value)(struct adapter *padapter);
-
void (*intf_chip_configure)(struct adapter *padapter);
void (*read_adapter_info)(struct adapter *padapter);
diff --git a/drivers/staging/rtl8723bs/include/rtl8723b_recv.h b/drivers/staging/rtl8723bs/include/rtl8723b_recv.h
index 040c9af06eee..69b5a7df32ad 100644
--- a/drivers/staging/rtl8723bs/include/rtl8723b_recv.h
+++ b/drivers/staging/rtl8723bs/include/rtl8723b_recv.h
@@ -88,5 +88,6 @@ void rtl8723b_query_rx_phy_status(union recv_frame *prframe, struct phy_stat *pp
void rtl8723b_process_phy_info(struct adapter *padapter, void *prframe);
void rtl8723b_read_chip_version(struct adapter *padapter);
+void rtl8723bs_init_default_value(struct adapter *padapter);
#endif
--
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 ` [PATCH 02/15] staging: rtl8723bs: Remove function pointer hal_deinit Philipp Hortmann
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 ` Philipp Hortmann [this message]
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=d0bb58235d54d1c7e4806c5ea3a50dbf77c293e7.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®