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 05/13] staging: rtl8723bs: Remove function pointer check_ips_status
Date: Sun, 3 Nov 2024 09:14:26 +0100 [thread overview]
Message-ID: <afcfbc2381d02a9f63a6ccc7acf4f31a24547488.1730619982.git.philipp.g.hortmann@gmail.com> (raw)
In-Reply-To: <cover.1730619982.git.philipp.g.hortmann@gmail.com>
Remove function pointer check_ips_status and use CheckIPSStatus directly
to increase readability.
Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
---
drivers/staging/rtl8723bs/hal/hal_intf.c | 7 +------
drivers/staging/rtl8723bs/hal/sdio_halinit.c | 1 -
drivers/staging/rtl8723bs/include/hal_intf.h | 1 -
3 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/drivers/staging/rtl8723bs/hal/hal_intf.c b/drivers/staging/rtl8723bs/hal/hal_intf.c
index 11d75b1b1ea9..44fab4eecb5e 100644
--- a/drivers/staging/rtl8723bs/hal/hal_intf.c
+++ b/drivers/staging/rtl8723bs/hal/hal_intf.c
@@ -156,12 +156,7 @@ void rtw_hal_disable_interrupt(struct adapter *padapter)
u8 rtw_hal_check_ips_status(struct adapter *padapter)
{
- u8 val = false;
-
- if (padapter->HalFunc.check_ips_status)
- val = padapter->HalFunc.check_ips_status(padapter);
-
- return val;
+ return CheckIPSStatus(padapter);
}
s32 rtw_hal_xmitframe_enqueue(struct adapter *padapter, struct xmit_frame *pxmitframe)
diff --git a/drivers/staging/rtl8723bs/hal/sdio_halinit.c b/drivers/staging/rtl8723bs/hal/sdio_halinit.c
index a64b28bee019..1211b7b440cf 100644
--- a/drivers/staging/rtl8723bs/hal/sdio_halinit.c
+++ b/drivers/staging/rtl8723bs/hal/sdio_halinit.c
@@ -1259,7 +1259,6 @@ void rtl8723bs_set_hal_ops(struct adapter *padapter)
rtl8723b_set_hal_ops(pHalFunc);
- pHalFunc->check_ips_status = &CheckIPSStatus;
pHalFunc->SetHwRegHandler = &SetHwReg8723BS;
pHalFunc->GetHwRegHandler = &GetHwReg8723BS;
pHalFunc->SetHwRegHandlerWithBuf = &SetHwRegWithBuf8723B;
diff --git a/drivers/staging/rtl8723bs/include/hal_intf.h b/drivers/staging/rtl8723bs/include/hal_intf.h
index 5b52b0fd95f0..e6f4c398f35f 100644
--- a/drivers/staging/rtl8723bs/include/hal_intf.h
+++ b/drivers/staging/rtl8723bs/include/hal_intf.h
@@ -162,7 +162,6 @@ enum hal_intf_ps_func {
typedef s32 (*c2h_id_filter)(u8 *c2h_evt);
struct hal_ops {
- u8 (*check_ips_status)(struct adapter *padapter);
void (*set_channel_handler)(struct adapter *padapter, u8 channel);
void (*set_chnl_bw_handler)(struct adapter *padapter, u8 channel, enum channel_width Bandwidth, u8 Offset40, u8 Offset80);
--
2.43.0
next prev parent reply other threads:[~2024-11-03 8:14 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-03 8:14 [PATCH 00/13] staging: rtl8723bs: Replace function pointers and #if 1 Philipp Hortmann
2024-11-03 8:14 ` [PATCH 01/13] staging: rtl8723bs: Replace function thread_enter Philipp Hortmann
2024-11-03 8:14 ` [PATCH 02/13] staging: rtl8723bs: Remove #if 1 in function hal_EfusePartialWriteCheck Philipp Hortmann
2024-11-03 8:14 ` [PATCH 03/13] staging: rtl8723bs: Remove #if 1 in function hal_EfuseGetCurrentSize_BT Philipp Hortmann
2024-11-03 8:14 ` [PATCH 04/13] staging: rtl8723bs: Remove #if 1 in function ReadChipVersion8723B Philipp Hortmann
2024-11-03 8:14 ` Philipp Hortmann [this message]
2024-11-03 8:14 ` [PATCH 06/13] staging: rtl8723bs: Remove function pointer SetHwRegHandler Philipp Hortmann
2024-11-03 8:14 ` [PATCH 07/13] staging: rtl8723bs: Remove function pointer GetHwRegHandler Philipp Hortmann
2024-11-03 8:14 ` [PATCH 08/13] staging: rtl8723bs: Remove function pointer SetHwRegHandlerWithBuf Philipp Hortmann
2024-11-03 8:14 ` [PATCH 09/13] staging: rtl8723bs: Remove function pointer GetHalDefVarHandler Philipp Hortmann
2024-11-03 8:14 ` [PATCH 10/13] staging: rtl8723bs: Remove function pointer SetHalDefVarHandler Philipp Hortmann
2024-11-03 8:14 ` [PATCH 11/13] staging: rtl8723bs: Remove function pointer hal_xmit Philipp Hortmann
2024-11-03 8:14 ` [PATCH 12/13] staging: rtl8723bs: Remove function pointer mgnt_xmit Philipp Hortmann
2024-11-03 8:14 ` [PATCH 13/13] staging: rtl8723bs: Remove function pointer hal_xmitframe_enqueue 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=afcfbc2381d02a9f63a6ccc7acf4f31a24547488.1730619982.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®