staging: rtl8723bs: remove wrapper rtw_hal_read_chip_info()

Remove the rtw_hal_read_chip_info() function, as it's just a wrapper
that calls ReadAdapterInfo8723BS() directly. Replace all its calls to
the ReadAdapterInfo8723BS() function. This will remove an extra level of
abstraction and simplify the code.

Signed-off-by: Nikolay Kulikov <nikolayof23@gmail.com>
Link: https://patch.msgid.link/20260419072034.19824-3-nikolayof23@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723bs/hal/hal_intf.c b/drivers/staging/rtl8723bs/hal/hal_intf.c
index 491208431396e64b627bfed3fc24897e6b718926..da250179fc924b9013af70077686b21c4405fd4c 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/hal_intf.c
+++ b/drivers/staging/rtl8723bs/hal/hal_intf.c
@@ -7,11 +7,6 @@
 #include <drv_types.h>
 #include <hal_data.h>
 
-void rtw_hal_read_chip_info(struct adapter *padapter)
-{
-       ReadAdapterInfo8723BS(padapter);
-}
-
 void rtw_hal_read_chip_version(struct adapter *padapter)
 {
        rtl8723b_read_chip_version(padapter);

diff --git a/drivers/staging/rtl8723bs/include/hal_intf.h b/drivers/staging/rtl8723bs/include/hal_intf.h
index 7629cef95b0661bbebab9b1460c3addc869fa0cd..8f5f2c63fc10c438aa0795c08b35f027c6afbe53 100644 (file)
--- a/drivers/staging/rtl8723bs/include/hal_intf.h
+++ b/drivers/staging/rtl8723bs/include/hal_intf.h
@@ -195,7 +195,6 @@ void rtw_hal_get_hwreg(struct adapter *padapter, u8 variable, u8 *val);
 
 void rtw_hal_set_hwreg_with_buf(struct adapter *padapter, u8 variable, u8 *pbuf, int len);
 
-void rtw_hal_read_chip_info(struct adapter *padapter);
 void rtw_hal_read_chip_version(struct adapter *padapter);
 
 u8 rtw_hal_get_def_var(struct adapter *padapter, enum hal_def_variable eVariable, void *pValue);

diff --git a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
index f733692784bba192605d0e798356659a92e64020..98eff17be9b6746a8b76dca87b54d197cb33f1a1 100644 (file)
--- a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
+++ b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
@@ -271,7 +271,7 @@ static struct adapter *rtw_sdio_if1_init(struct dvobj_priv *dvobj, const struct
        hal_btcoex_Initialize((void *)padapter);
 
        /* 3 6. read efuse/eeprom data */
-       rtw_hal_read_chip_info(padapter);
+       ReadAdapterInfo8723BS(padapter);
 
        /* 3 7. init driver common data */
        if (rtw_init_drv_sw(padapter) == _FAIL)