staging: r8188eu: remove write_bbreg from struct hal_ops

Remove write_bbreg from struct hal_ops and its wrapper
rtw_hal_write_bbreg(). Call rtl8188e_PHY_SetBBReg() directly instead.

Acked-by: Fabio M. De Francesco <fmdefrancesco@gmail.com>
Signed-off-by: Michael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20210910205033.3778-5-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/r8188eu/core/rtw_mp.c b/drivers/staging/r8188eu/core/rtw_mp.c
index 19181d7851c538e4c913aca9b1f6345ddefaff25..2d71b3a5a3f58fd28142ade3ab9b03a6599daf36 100644 (file)
--- a/drivers/staging/r8188eu/core/rtw_mp.c
+++ b/drivers/staging/r8188eu/core/rtw_mp.c
@@ -14,7 +14,7 @@ u32 read_bbreg(struct adapter *padapter, u32 addr, u32 bitmask)
 
 void write_bbreg(struct adapter *padapter, u32 addr, u32 bitmask, u32 val)
 {
-       rtw_hal_write_bbreg(padapter, addr, bitmask, val);
+       rtl8188e_PHY_SetBBReg(padapter, addr, bitmask, val);
 }
 
 u32 _read_rfreg(struct adapter *padapter, u8 rfpath, u32 addr, u32 bitmask)

diff --git a/drivers/staging/r8188eu/hal/hal_intf.c b/drivers/staging/r8188eu/hal/hal_intf.c
index 0036a6e8dc58a5c762f8e46b58be3be03cfdbe65..155b2f5800546945fcaad8304cbb875b78f8887c 100644 (file)
--- a/drivers/staging/r8188eu/hal/hal_intf.c
+++ b/drivers/staging/r8188eu/hal/hal_intf.c
@@ -125,13 +125,6 @@ void rtw_hal_update_ra_mask(struct adapter *adapt, u32 mac_id, u8 rssi_level)
        }
 }
 
-void rtw_hal_write_bbreg(struct adapter *adapt, u32 regaddr, u32 bitmask,
-                        u32 data)
-{
-       if (adapt->HalFunc.write_bbreg)
-               adapt->HalFunc.write_bbreg(adapt, regaddr, bitmask, data);
-}
-
 u32 rtw_hal_read_rfreg(struct adapter *adapt, enum rf_radio_path rfpath,
                       u32 regaddr, u32 bitmask)
 {

diff --git a/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c b/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c
index 0f80c087ef9dfbae96afe3b46780cf606302353a..739f17606ead67560516fd1a16989cab71990ac0 100644 (file)
--- a/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c
+++ b/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c
@@ -1750,7 +1750,6 @@ void hal_notch_filter_8188e(struct adapter *adapter, bool enable)
 }
 void rtl8188e_set_hal_ops(struct hal_ops *pHalFunc)
 {
-       pHalFunc->write_bbreg = &rtl8188e_PHY_SetBBReg;
        pHalFunc->read_rfreg = &rtl8188e_PHY_QueryRFReg;
        pHalFunc->write_rfreg = &rtl8188e_PHY_SetRFReg;
 }

diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r8188eu/include/hal_intf.h
index 1d3ef4ba6c6b14ff67058420e62c1e34d039107e..11b0871ab66ada0f49f216deb79809c1820c6aca 100644 (file)
--- a/drivers/staging/r8188eu/include/hal_intf.h
+++ b/drivers/staging/r8188eu/include/hal_intf.h
@@ -147,8 +147,6 @@ struct hal_ops {
                                       enum hal_def_variable eVariable,
                                       void *pValue);
 
-       void    (*write_bbreg)(struct adapter *padapter, u32 RegAddr,
-                              u32 BitMask, u32 Data);
        u32     (*read_rfreg)(struct adapter *padapter,
                              enum rf_radio_path eRFPath, u32 RegAddr,
                              u32 BitMask);
@@ -219,8 +217,6 @@ void rtw_hal_update_ra_mask(struct adapter *padapter, u32 mac_id, u8 level);
 void   rtw_hal_clone_data(struct adapter *dst_adapt,
                           struct adapter *src_adapt);
 
-void   rtw_hal_write_bbreg(struct adapter *padapter, u32 RegAddr, u32 BitMask,
-                           u32 Data);
 u32    rtw_hal_read_rfreg(struct adapter *padapter, enum rf_radio_path eRFPath,
                           u32 RegAddr, u32 BitMask);
 void   rtw_hal_write_rfreg(struct adapter *padapter,

diff --git a/drivers/staging/r8188eu/os_dep/ioctl_linux.c b/drivers/staging/r8188eu/os_dep/ioctl_linux.c
index ee4029bb48a785b489baf6d3126899081818a4e5..cc03be3bbe0b9fdb9513eb19bb254ad288589b20 100644 (file)
--- a/drivers/staging/r8188eu/os_dep/ioctl_linux.c
+++ b/drivers/staging/r8188eu/os_dep/ioctl_linux.c
@@ -3961,7 +3961,7 @@ static int rtw_dbg_port(struct net_device *dev,
                DBG_88E("read_bbreg(0x%x) = 0x%x\n", arg, rtl8188e_PHY_QueryBBReg(padapter, arg, 0xffffffff));
                break;
        case 0x73:/* write_bb */
-               rtw_hal_write_bbreg(padapter, arg, 0xffffffff, extra_arg);
+               rtl8188e_PHY_SetBBReg(padapter, arg, 0xffffffff, extra_arg);
                DBG_88E("write_bbreg(0x%x) = 0x%x\n", arg, rtl8188e_PHY_QueryBBReg(padapter, arg, 0xffffffff));
                break;
        case 0x74:/* read_rf */