rtlwifi: rtl8723-common: Rename RT_TRACE to rtl_dbg

Change the misleading macro name to one that is more descriptive for
rtl8723-common. Changes suggested by ckeckpatch.pl have been made.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20200723204244.24457-14-Larry.Finger@lwfinger.net

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723com/fw_common.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723com/fw_common.c
index 37036e6..36c00b8 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723com/fw_common.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723com/fw_common.c
@@ -41,7 +41,7 @@ void rtl8723_write_fw(struct ieee80211_hw *hw,
        u32 page_nums, remain_size;
        u32 page, offset;
 
-       RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE, "FW size is %d bytes,\n", size);
+       rtl_dbg(rtlpriv, COMP_FW, DBG_TRACE, "FW size is %d bytes,\n", size);
 
        rtl_fill_dummy(bufferptr, &size);
 
@@ -63,7 +63,7 @@ void rtl8723_write_fw(struct ieee80211_hw *hw,
                page = page_nums;
                rtl_fw_page_write(hw, page, (bufferptr + offset), remain_size);
        }
-       RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE, "FW write done.\n");
+       rtl_dbg(rtlpriv, COMP_FW, DBG_TRACE, "FW write done.\n");
 }
 EXPORT_SYMBOL_GPL(rtl8723_write_fw);
 
@@ -109,8 +109,8 @@ void rtl8723be_firmware_selfreset(struct ieee80211_hw *hw)
        u1b_tmp = rtl_read_byte(rtlpriv, REG_SYS_FUNC_EN + 1);
        rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN + 1, (u1b_tmp | BIT(2)));
 
-       RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                "  _8051Reset8723be(): 8051 reset success .\n");
+       rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,
+               "_8051Reset8723be(): 8051 reset success .\n");
 }
 EXPORT_SYMBOL_GPL(rtl8723be_firmware_selfreset);
 
@@ -143,9 +143,9 @@ int rtl8723_fw_free_to_go(struct ieee80211_hw *hw, bool is_8723be,
        do {
                value32 = rtl_read_dword(rtlpriv, REG_MCUFWDL);
                if (value32 & WINTINI_RDY) {
-                       RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,
-                                "Polling FW ready success!! REG_MCUFWDL:0x%08x .\n",
-                                value32);
+                       rtl_dbg(rtlpriv, COMP_FW, DBG_TRACE,
+                               "Polling FW ready success!! REG_MCUFWDL:0x%08x .\n",
+                               value32);
                        err = 0;
                        goto exit;
                }
@@ -188,10 +188,10 @@ int rtl8723_download_fw(struct ieee80211_hw *hw,
        else
                max_page = 8;
        if (rtlpriv->cfg->ops->is_fw_header(pfwheader)) {
-               RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD,
-                        "Firmware Version(%d), Signature(%#x), Size(%d)\n",
-                        pfwheader->version, pfwheader->signature,
-                        (int)sizeof(struct rtlwifi_firmware_header));
+               rtl_dbg(rtlpriv, COMP_FW, DBG_LOUD,
+                       "Firmware Version(%d), Signature(%#x), Size(%d)\n",
+                       pfwheader->version, pfwheader->signature,
+                       (int)sizeof(struct rtlwifi_firmware_header));
 
                pfwdata = pfwdata + sizeof(struct rtlwifi_firmware_header);
                fwsize = fwsize - sizeof(struct rtlwifi_firmware_header);

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723com/phy_common.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723com/phy_common.c
index debecc6..097f21f 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723com/phy_common.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723com/phy_common.c
@@ -14,15 +14,15 @@ u32 rtl8723_phy_query_bb_reg(struct ieee80211_hw *hw,
        struct rtl_priv *rtlpriv = rtl_priv(hw);
        u32 returnvalue, originalvalue, bitshift;
 
-       RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
-                "regaddr(%#x), bitmask(%#x)\n", regaddr, bitmask);
+       rtl_dbg(rtlpriv, COMP_RF, DBG_TRACE,
+               "regaddr(%#x), bitmask(%#x)\n", regaddr, bitmask);
        originalvalue = rtl_read_dword(rtlpriv, regaddr);
        bitshift = rtl8723_phy_calculate_bit_shift(bitmask);
        returnvalue = (originalvalue & bitmask) >> bitshift;
 
-       RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
-                "BBR MASK=0x%x Addr[0x%x]=0x%x\n", bitmask,
-                regaddr, originalvalue);
+       rtl_dbg(rtlpriv, COMP_RF, DBG_TRACE,
+               "BBR MASK=0x%x Addr[0x%x]=0x%x\n", bitmask,
+               regaddr, originalvalue);
        return returnvalue;
 }
 EXPORT_SYMBOL_GPL(rtl8723_phy_query_bb_reg);
@@ -33,9 +33,9 @@ void rtl8723_phy_set_bb_reg(struct ieee80211_hw *hw, u32 regaddr,
        struct rtl_priv *rtlpriv = rtl_priv(hw);
        u32 originalvalue, bitshift;
 
-       RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
-                "regaddr(%#x), bitmask(%#x), data(%#x)\n", regaddr, bitmask,
-                data);
+       rtl_dbg(rtlpriv, COMP_RF, DBG_TRACE,
+               "regaddr(%#x), bitmask(%#x), data(%#x)\n", regaddr, bitmask,
+               data);
 
        if (bitmask != MASKDWORD) {
                originalvalue = rtl_read_dword(rtlpriv, regaddr);
@@ -45,9 +45,9 @@ void rtl8723_phy_set_bb_reg(struct ieee80211_hw *hw, u32 regaddr,
 
        rtl_write_dword(rtlpriv, regaddr, data);
 
-       RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
-                "regaddr(%#x), bitmask(%#x), data(%#x)\n",
-                regaddr, bitmask, data);
+       rtl_dbg(rtlpriv, COMP_RF, DBG_TRACE,
+               "regaddr(%#x), bitmask(%#x), data(%#x)\n",
+               regaddr, bitmask, data);
 }
 EXPORT_SYMBOL_GPL(rtl8723_phy_set_bb_reg);
 
@@ -105,9 +105,9 @@ u32 rtl8723_phy_rf_serial_read(struct ieee80211_hw *hw,
        else
                retvalue = rtl_get_bbreg(hw, pphyreg->rf_rb,
                                         BLSSIREADBACKDATA);
-       RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
-                "RFR-%d Addr[0x%x]=0x%x\n",
-                rfpath, pphyreg->rf_rb, retvalue);
+       rtl_dbg(rtlpriv, COMP_RF, DBG_TRACE,
+               "RFR-%d Addr[0x%x]=0x%x\n",
+               rfpath, pphyreg->rf_rb, retvalue);
        return retvalue;
 }
 EXPORT_SYMBOL_GPL(rtl8723_phy_rf_serial_read);
@@ -130,10 +130,10 @@ void rtl8723_phy_rf_serial_write(struct ieee80211_hw *hw,
        newoffset = offset;
        data_and_addr = ((newoffset << 20) | (data & 0x000fffff)) & 0x0fffffff;
        rtl_set_bbreg(hw, pphyreg->rf3wire_offset, MASKDWORD, data_and_addr);
-       RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
-                "RFW-%d Addr[0x%x]=0x%x\n",
-                rfpath, pphyreg->rf3wire_offset,
-                data_and_addr);
+       rtl_dbg(rtlpriv, COMP_RF, DBG_TRACE,
+               "RFW-%d Addr[0x%x]=0x%x\n",
+               rfpath, pphyreg->rf3wire_offset,
+               data_and_addr);
 }
 EXPORT_SYMBOL_GPL(rtl8723_phy_rf_serial_write);