[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <d542f172438c333c015b87376a20645eeeae1b99.1727966761.git.philipp.g.hortmann@gmail.com>
Date: Sat, 5 Oct 2024 22:33:55 +0200
From: Philipp Hortmann <philipp.g.hortmann@...il.com>
To: Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
linux-staging@...ts.linux.dev,
linux-kernel@...r.kernel.org
Cc: Philipp Hortmann <philipp.g.hortmann@...il.com>
Subject: [PATCH 12/15] staging: rtl8723bs: Remove function pointer intf_chip_configure
Remove function pointer intf_chip_configure and use
rtl8723bs_interface_configure directly to increase readability.
Signed-off-by: Philipp Hortmann <philipp.g.hortmann@...il.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 bcbc9ea78951..ec95d3ec3170 100644
--- a/drivers/staging/rtl8723bs/hal/hal_intf.c
+++ b/drivers/staging/rtl8723bs/hal/hal_intf.c
@@ -9,8 +9,7 @@
void rtw_hal_chip_configure(struct adapter *padapter)
{
- if (padapter->HalFunc.intf_chip_configure)
- padapter->HalFunc.intf_chip_configure(padapter);
+ rtl8723bs_interface_configure(padapter);
}
void rtw_hal_read_chip_info(struct adapter *padapter)
diff --git a/drivers/staging/rtl8723bs/hal/sdio_halinit.c b/drivers/staging/rtl8723bs/hal/sdio_halinit.c
index 236effa5c96e..6a56a5db5a5f 100644
--- a/drivers/staging/rtl8723bs/hal/sdio_halinit.c
+++ b/drivers/staging/rtl8723bs/hal/sdio_halinit.c
@@ -950,7 +950,7 @@ void rtl8723bs_init_default_value(struct adapter *padapter)
pHalData->SdioRxFIFOCnt = 0;
}
-static void rtl8723bs_interface_configure(struct adapter *padapter)
+void rtl8723bs_interface_configure(struct adapter *padapter)
{
struct hal_com_data *pHalData = GET_HAL_DATA(padapter);
struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(padapter);
@@ -1259,7 +1259,6 @@ void rtl8723bs_set_hal_ops(struct adapter *padapter)
rtl8723b_set_hal_ops(pHalFunc);
- pHalFunc->intf_chip_configure = &rtl8723bs_interface_configure;
pHalFunc->read_adapter_info = &ReadAdapterInfo8723BS;
pHalFunc->enable_interrupt = &EnableInterrupt8723BSdio;
diff --git a/drivers/staging/rtl8723bs/include/hal_intf.h b/drivers/staging/rtl8723bs/include/hal_intf.h
index 357b41894cf1..1932f93d89c7 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 (*intf_chip_configure)(struct adapter *padapter);
-
void (*read_adapter_info)(struct adapter *padapter);
void (*enable_interrupt)(struct adapter *padapter);
diff --git a/drivers/staging/rtl8723bs/include/rtl8723b_recv.h b/drivers/staging/rtl8723bs/include/rtl8723b_recv.h
index 69b5a7df32ad..dbd051a34d90 100644
--- a/drivers/staging/rtl8723bs/include/rtl8723b_recv.h
+++ b/drivers/staging/rtl8723bs/include/rtl8723b_recv.h
@@ -89,5 +89,6 @@ 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);
+void rtl8723bs_interface_configure(struct adapter *padapter);
#endif
--
2.43.0
Powered by blists - more mailing lists