staging: r8188eu: remove read_rfreg from struct hal_ops

Remove read_rfreg from struct hal_ops and its wrapper
rtw_hal_read_rfreg(). Call rtl8188e_PHY_QueryRFReg() 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-6-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/r8188eu/core/rtw_debug.c b/drivers/staging/r8188eu/core/rtw_debug.c
index 65daf67..3d613d9 100644 (file)
--- a/drivers/staging/r8188eu/core/rtw_debug.c
+++ b/drivers/staging/r8188eu/core/rtw_debug.c
@@ -428,7 +428,7 @@ int proc_get_rf_reg_dump1(char *page, char **start,
        path = 1;
        len += snprintf(page + len, count - len, "\nRF_Path(%x)\n", path);
        for (i = 0; i < 0xC0; i++) {
-               value = rtw_hal_read_rfreg(padapter, path, i, 0xffffffff);
+               value = rtl8188e_PHY_QueryRFReg(padapter, path, i, 0xffffffff);
                if (j % 4 == 1)
                        len += snprintf(page + len, count - len, "0x%02x ", i);
                len += snprintf(page + len, count - len, " 0x%08x ", value);
@@ -453,7 +453,7 @@ int proc_get_rf_reg_dump2(char *page, char **start,
        path = 1;
        len += snprintf(page + len, count - len, "\nRF_Path(%x)\n", path);
        for (i = 0xC0; i < 0x100; i++) {
-               value = rtw_hal_read_rfreg(padapter, path, i, 0xffffffff);
+               value = rtl8188e_PHY_QueryRFReg(padapter, path, i, 0xffffffff);
                if (j % 4 == 1)
                        len += snprintf(page + len, count - len, "0x%02x ", i);
                len += snprintf(page + len, count - len, " 0x%08x ", value);
@@ -478,7 +478,7 @@ int proc_get_rf_reg_dump3(char *page, char **start,
        path = 2;
        len += snprintf(page + len, count - len, "\nRF_Path(%x)\n", path);
        for (i = 0; i < 0xC0; i++) {
-               value = rtw_hal_read_rfreg(padapter, path, i, 0xffffffff);
+               value = rtl8188e_PHY_QueryRFReg(padapter, path, i, 0xffffffff);
                if (j % 4 == 1)
                        len += snprintf(page + len, count - len, "0x%02x ", i);
                len += snprintf(page + len, count - len, " 0x%08x ", value);
@@ -504,7 +504,7 @@ int proc_get_rf_reg_dump4(char *page, char **start,
        path = 2;
        len += snprintf(page + len, count - len, "\nRF_Path(%x)\n", path);
        for (i = 0xC0; i < 0x100; i++) {
-               value = rtw_hal_read_rfreg(padapter, path, i, 0xffffffff);
+               value = rtl8188e_PHY_QueryRFReg(padapter, path, i, 0xffffffff);
                if (j % 4 == 1)
                        len += snprintf(page + len, count - len, "0x%02x ", i);
                len += snprintf(page + len, count - len, " 0x%08x ", value);

diff --git a/drivers/staging/r8188eu/core/rtw_mp.c b/drivers/staging/r8188eu/core/rtw_mp.c
index 2d71b3a..85821ee 100644 (file)
--- a/drivers/staging/r8188eu/core/rtw_mp.c
+++ b/drivers/staging/r8188eu/core/rtw_mp.c
@@ -19,7 +19,7 @@ void write_bbreg(struct adapter *padapter, u32 addr, u32 bitmask, u32 val)
 
 u32 _read_rfreg(struct adapter *padapter, u8 rfpath, u32 addr, u32 bitmask)
 {
-       return rtw_hal_read_rfreg(padapter, (enum rf_radio_path)rfpath, addr, bitmask);
+       return rtl8188e_PHY_QueryRFReg(padapter, (enum rf_radio_path)rfpath, addr, bitmask);
 }
 
 void _write_rfreg(struct adapter *padapter, u8 rfpath, u32 addr, u32 bitmask, u32 val)

diff --git a/drivers/staging/r8188eu/hal/hal_intf.c b/drivers/staging/r8188eu/hal/hal_intf.c
index 155b2f5..72e4b17 100644 (file)
--- a/drivers/staging/r8188eu/hal/hal_intf.c
+++ b/drivers/staging/r8188eu/hal/hal_intf.c
@@ -125,17 +125,6 @@ void rtw_hal_update_ra_mask(struct adapter *adapt, u32 mac_id, u8 rssi_level)
        }
 }
 
-u32 rtw_hal_read_rfreg(struct adapter *adapt, enum rf_radio_path rfpath,
-                      u32 regaddr, u32 bitmask)
-{
-       u32 data = 0;
-
-       if (adapt->HalFunc.read_rfreg)
-               data = adapt->HalFunc.read_rfreg(adapt, rfpath, regaddr,
-                                                   bitmask);
-       return data;
-}
-
 void rtw_hal_write_rfreg(struct adapter *adapt, enum rf_radio_path rfpath,
                         u32 regaddr, u32 bitmask, u32 data)
 {

diff --git a/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c b/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c
index 739f176..9ddd63a 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->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 11b0871..0aebf40 100644 (file)
--- a/drivers/staging/r8188eu/include/hal_intf.h
+++ b/drivers/staging/r8188eu/include/hal_intf.h
@@ -147,9 +147,6 @@ struct hal_ops {
                                       enum hal_def_variable eVariable,
                                       void *pValue);
 
-       u32     (*read_rfreg)(struct adapter *padapter,
-                             enum rf_radio_path eRFPath, u32 RegAddr,
-                             u32 BitMask);
        void    (*write_rfreg)(struct adapter *padapter,
                               enum rf_radio_path eRFPath, u32 RegAddr,
                               u32 BitMask, u32 Data);
@@ -217,8 +214,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);
 
-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,
                            enum rf_radio_path eRFPath, u32 RegAddr,
                            u32 BitMask, u32 Data);

diff --git a/drivers/staging/r8188eu/os_dep/ioctl_linux.c b/drivers/staging/r8188eu/os_dep/ioctl_linux.c
index cc03be3..21a5d7c 100644 (file)
--- a/drivers/staging/r8188eu/os_dep/ioctl_linux.c
+++ b/drivers/staging/r8188eu/os_dep/ioctl_linux.c
@@ -2122,7 +2122,7 @@ static int rtw_wx_read_rf(struct net_device *dev,
 
        path = *(u32 *)extra;
        addr = *((u32 *)extra + 1);
-       data32 = rtw_hal_read_rfreg(padapter, path, addr, 0xFFFFF);
+       data32 = rtl8188e_PHY_QueryRFReg(padapter, path, addr, 0xFFFFF);
        /*
         * IMPORTANT!!
         * Only when wireless private ioctl is at odd order,
@@ -2262,7 +2262,7 @@ static void rtw_dbg_mode_hdl(struct adapter *padapter, u32 id, u8 *pdata, u32 le
                path = (u8)prfreg->path;
                offset = (u8)prfreg->offset;
 
-               value = rtw_hal_read_rfreg(padapter, path, offset, 0xffffffff);
+               value = rtl8188e_PHY_QueryRFReg(padapter, path, offset, 0xffffffff);
 
                prfreg->value = value;
 
@@ -3890,7 +3890,7 @@ static void rf_reg_dump(struct adapter *padapter)
        for (path = 0; path < path_nums; path++) {
                pr_info("\nRF_Path(%x)\n", path);
                for (i = 0; i < 0x100; i++) {
-                       value = rtw_hal_read_rfreg(padapter, path, i, 0xffffffff);
+                       value = rtl8188e_PHY_QueryRFReg(padapter, path, i, 0xffffffff);
                        if (j % 4 == 1)
                                pr_info("0x%02x ", i);
                        pr_info(" 0x%08x ", value);
@@ -3965,11 +3965,11 @@ static int rtw_dbg_port(struct net_device *dev,
                DBG_88E("write_bbreg(0x%x) = 0x%x\n", arg, rtl8188e_PHY_QueryBBReg(padapter, arg, 0xffffffff));
                break;
        case 0x74:/* read_rf */
-               DBG_88E("read RF_reg path(0x%02x), offset(0x%x), value(0x%08x)\n", minor_cmd, arg, rtw_hal_read_rfreg(padapter, minor_cmd, arg, 0xffffffff));
+               DBG_88E("read RF_reg path(0x%02x), offset(0x%x), value(0x%08x)\n", minor_cmd, arg, rtl8188e_PHY_QueryRFReg(padapter, minor_cmd, arg, 0xffffffff));
                break;
        case 0x75:/* write_rf */
                rtw_hal_write_rfreg(padapter, minor_cmd, arg, 0xffffffff, extra_arg);
-               DBG_88E("write RF_reg path(0x%02x), offset(0x%x), value(0x%08x)\n", minor_cmd, arg, rtw_hal_read_rfreg(padapter, minor_cmd, arg, 0xffffffff));
+               DBG_88E("write RF_reg path(0x%02x), offset(0x%x), value(0x%08x)\n", minor_cmd, arg, rtl8188e_PHY_QueryRFReg(padapter, minor_cmd, arg, 0xffffffff));
                break;
 
        case 0x76:
@@ -6069,7 +6069,7 @@ static int rtw_mp_dump(struct net_device *dev,
 
                for (path = 0; path < path_nums; path++) {
                        for (i = 0; i < 0x34; i++) {
-                               value = rtw_hal_read_rfreg(padapter, path, i, 0xffffffff);
+                               value = rtl8188e_PHY_QueryRFReg(padapter, path, i, 0xffffffff);
                                if (j % 4 == 1)
                                        DBG_88E("0x%02x ", i);
                                DBG_88E(" 0x%08x ", value);