]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
rtlwifi: rtl8192se Rename RT_TRACE to rtl_dbg
authorLarry Finger <Larry.Finger@lwfinger.net>
Thu, 23 Jul 2020 20:42:39 +0000 (15:42 -0500)
committerKalle Valo <kvalo@codeaurora.org>
Mon, 31 Aug 2020 15:26:00 +0000 (18:26 +0300)
Change the misleading macro name to one that is more descriptive for
rtl8192se. 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-11-Larry.Finger@lwfinger.net
drivers/net/wireless/realtek/rtlwifi/rtl8192se/dm.c
drivers/net/wireless/realtek/rtlwifi/rtl8192se/fw.c
drivers/net/wireless/realtek/rtlwifi/rtl8192se/hw.c
drivers/net/wireless/realtek/rtlwifi/rtl8192se/led.c
drivers/net/wireless/realtek/rtlwifi/rtl8192se/phy.c
drivers/net/wireless/realtek/rtlwifi/rtl8192se/rf.c
drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.c
drivers/net/wireless/realtek/rtlwifi/rtl8192se/trx.c

index a6e4384ceea1dc83276e7cca62e0d59d5d7db09d..5fce3db52cd9a83f0632e800190fa3c597fcaee2 100644 (file)
@@ -144,10 +144,10 @@ static void _rtl92s_dm_txpowertracking_callback_thermalmeter(
 
        thermalvalue = (u8)rtl_get_rfreg(hw, RF90_PATH_A, RF_T_METER, 0x1f);
 
-       RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
-                "Readback Thermal Meter = 0x%x pre thermal meter 0x%x eeprom_thermal meter 0x%x\n",
-                thermalvalue,
-                rtlpriv->dm.thermalvalue, rtlefuse->eeprom_thermalmeter);
+       rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+               "Readback Thermal Meter = 0x%x pre thermal meter 0x%x eeprom_thermal meter 0x%x\n",
+               thermalvalue,
+               rtlpriv->dm.thermalvalue, rtlefuse->eeprom_thermalmeter);
 
        if (thermalvalue) {
                rtlpriv->dm.thermalvalue = thermalvalue;
@@ -158,8 +158,8 @@ static void _rtl92s_dm_txpowertracking_callback_thermalmeter(
                                 (rtlpriv->efuse.thermalmeter[0] << 8) |
                                 (thermalvalue << 16));
 
-                       RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
-                                "Write to FW Thermal Val = 0x%x\n", fw_cmd);
+                       rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                               "Write to FW Thermal Val = 0x%x\n", fw_cmd);
 
                        rtl_write_dword(rtlpriv, WFM5, fw_cmd);
                        rtl92s_phy_chk_fwcmd_iodone(hw);
@@ -264,10 +264,10 @@ static void _rtl92s_dm_refresh_rateadaptive_mask(struct ieee80211_hw *hw)
                }
 
                if (ra->pre_ratr_state != ra->ratr_state) {
-                       RT_TRACE(rtlpriv, COMP_RATE, DBG_LOUD,
-                                "RSSI = %ld RSSI_LEVEL = %d PreState = %d, CurState = %d\n",
-                                rtlpriv->dm.undec_sm_pwdb, ra->ratr_state,
-                                ra->pre_ratr_state, ra->ratr_state);
+                       rtl_dbg(rtlpriv, COMP_RATE, DBG_LOUD,
+                               "RSSI = %ld RSSI_LEVEL = %d PreState = %d, CurState = %d\n",
+                               rtlpriv->dm.undec_sm_pwdb, ra->ratr_state,
+                               ra->pre_ratr_state, ra->ratr_state);
 
                        rcu_read_lock();
                        sta = rtl_find_sta(hw, mac->bssid);
@@ -576,8 +576,8 @@ static void _rtl92s_dm_dynamic_txpower(struct ieee80211_hw *hw)
 
        if ((mac->link_state < MAC80211_LINKED) &&
            (rtlpriv->dm.entry_min_undec_sm_pwdb == 0)) {
-               RT_TRACE(rtlpriv, COMP_POWER, DBG_TRACE,
-                        "Not connected to any\n");
+               rtl_dbg(rtlpriv, COMP_POWER, DBG_TRACE,
+                       "Not connected to any\n");
 
                rtlpriv->dm.dynamic_txhighpower_lvl = TX_HIGHPWR_LEVEL_NORMAL;
 
@@ -588,21 +588,21 @@ static void _rtl92s_dm_dynamic_txpower(struct ieee80211_hw *hw)
        if (mac->link_state >= MAC80211_LINKED) {
                if (mac->opmode == NL80211_IFTYPE_ADHOC) {
                        undec_sm_pwdb = rtlpriv->dm.entry_min_undec_sm_pwdb;
-                       RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                                "AP Client PWDB = 0x%lx\n",
-                                undec_sm_pwdb);
+                       rtl_dbg(rtlpriv, COMP_POWER, DBG_LOUD,
+                               "AP Client PWDB = 0x%lx\n",
+                               undec_sm_pwdb);
                } else {
                        undec_sm_pwdb = rtlpriv->dm.undec_sm_pwdb;
-                       RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                                "STA Default Port PWDB = 0x%lx\n",
-                                undec_sm_pwdb);
+                       rtl_dbg(rtlpriv, COMP_POWER, DBG_LOUD,
+                               "STA Default Port PWDB = 0x%lx\n",
+                               undec_sm_pwdb);
                }
        } else {
                undec_sm_pwdb = rtlpriv->dm.entry_min_undec_sm_pwdb;
 
-               RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                        "AP Ext Port PWDB = 0x%lx\n",
-                        undec_sm_pwdb);
+               rtl_dbg(rtlpriv, COMP_POWER, DBG_LOUD,
+                       "AP Ext Port PWDB = 0x%lx\n",
+                       undec_sm_pwdb);
        }
 
        txpwr_threshold_lv2 = TX_POWER_NEAR_FIELD_THRESH_LVL2;
index 47a5b95ca2b938b5969a71a46774d87610f1d6fa..f570495af0440ca9e236e831ccdeb824dc1f1ff6 100644 (file)
@@ -39,8 +39,8 @@ static bool _rtl92s_firmware_enable_cpu(struct ieee80211_hw *hw)
        do {
                cpustatus = rtl_read_byte(rtlpriv, TCR);
                if (cpustatus & IMEM_RDY) {
-                       RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                                "IMEM Ready after CPU has refilled\n");
+                       rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,
+                               "IMEM Ready after CPU has refilled\n");
                        break;
                }
 
@@ -195,8 +195,8 @@ static bool _rtl92s_firmware_checkready(struct ieee80211_hw *hw,
        short pollingcnt = 1000;
        bool rtstatus = true;
 
-       RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                "LoadStaus(%d)\n", loadfw_status);
+       rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,
+               "LoadStaus(%d)\n", loadfw_status);
 
        firmware->fwstatus = (enum fw_status)loadfw_status;
 
@@ -256,9 +256,9 @@ static bool _rtl92s_firmware_checkready(struct ieee80211_hw *hw,
                        goto status_check_fail;
                }
 
-               RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                        "DMEM code download success, cpustatus(%#x)\n",
-                        cpustatus);
+               rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,
+                       "DMEM code download success, cpustatus(%#x)\n",
+                       cpustatus);
 
                /* Prevent Delay too much and being scheduled out */
                /* Polling Load Firmware ready */
@@ -270,9 +270,9 @@ static bool _rtl92s_firmware_checkready(struct ieee80211_hw *hw,
                        udelay(40);
                } while (pollingcnt--);
 
-               RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                        "Polling Load Firmware ready, cpustatus(%x)\n",
-                        cpustatus);
+               rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,
+                       "Polling Load Firmware ready, cpustatus(%x)\n",
+                       cpustatus);
 
                if (((cpustatus & LOAD_FW_READY) != LOAD_FW_READY) ||
                    (pollingcnt <= 0)) {
@@ -290,8 +290,8 @@ static bool _rtl92s_firmware_checkready(struct ieee80211_hw *hw,
                rtl_write_dword(rtlpriv, RCR, (tmpu4b | RCR_APPFCS |
                                RCR_APP_ICV | RCR_APP_MIC));
 
-               RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                        "Current RCR settings(%#x)\n", tmpu4b);
+               rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,
+                       "Current RCR settings(%#x)\n", tmpu4b);
 
                /* Set to normal mode. */
                rtl_write_byte(rtlpriv, LBKMD_SEL, LBK_NORMAL);
@@ -304,9 +304,9 @@ static bool _rtl92s_firmware_checkready(struct ieee80211_hw *hw,
        }
 
 status_check_fail:
-       RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                "loadfw_status(%d), rtstatus(%x)\n",
-                loadfw_status, rtstatus);
+       rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,
+               "loadfw_status(%d), rtstatus(%x)\n",
+               loadfw_status, rtstatus);
        return rtstatus;
 }
 
@@ -337,11 +337,11 @@ int rtl92s_download_fw(struct ieee80211_hw *hw)
        firmware->firmwareversion =  byte(pfwheader->version, 0);
        firmware->pfwheader->fwpriv.hci_sel = 1;/* pcie */
 
-       RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                "signature:%x, version:%x, size:%x, imemsize:%x, sram size:%x\n",
-                pfwheader->signature,
-                pfwheader->version, pfwheader->dmem_size,
-                pfwheader->img_imem_size, pfwheader->img_sram_size);
+       rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,
+               "signature:%x, version:%x, size:%x, imemsize:%x, sram size:%x\n",
+               pfwheader->signature,
+               pfwheader->version, pfwheader->dmem_size,
+               pfwheader->img_imem_size, pfwheader->img_sram_size);
 
        /* 2. Retrieve IMEM image. */
        if ((pfwheader->img_imem_size == 0) || (pfwheader->img_imem_size >
index 81313e0ca83411f784dd24c876ff68b5720ab7ea..149fa4c4ed28f78d86a2a34f39993e07138050ea 100644 (file)
@@ -111,8 +111,8 @@ void rtl92se_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
        case HW_VAR_SLOT_TIME:{
                        u8 e_aci;
 
-                       RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
-                                "HW_VAR_SLOT_TIME %x\n", val[0]);
+                       rtl_dbg(rtlpriv, COMP_MLME, DBG_LOUD,
+                               "HW_VAR_SLOT_TIME %x\n", val[0]);
 
                        rtl_write_byte(rtlpriv, SLOT_TIME, val[0]);
 
@@ -156,9 +156,9 @@ void rtl92se_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
 
                                *val = min_spacing_to_set;
 
-                               RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
-                                        "Set HW_VAR_AMPDU_MIN_SPACE: %#x\n",
-                                        mac->min_space_cfg);
+                               rtl_dbg(rtlpriv, COMP_MLME, DBG_LOUD,
+                                       "Set HW_VAR_AMPDU_MIN_SPACE: %#x\n",
+                                       mac->min_space_cfg);
 
                                rtl_write_byte(rtlpriv, AMPDU_MIN_SPACE,
                                               mac->min_space_cfg);
@@ -172,9 +172,9 @@ void rtl92se_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                        mac->min_space_cfg = rtlpriv->rtlhal.minspace_cfg;
                        mac->min_space_cfg |= (density_to_set << 3);
 
-                       RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
-                                "Set HW_VAR_SHORTGI_DENSITY: %#x\n",
-                                mac->min_space_cfg);
+                       rtl_dbg(rtlpriv, COMP_MLME, DBG_LOUD,
+                               "Set HW_VAR_SHORTGI_DENSITY: %#x\n",
+                               mac->min_space_cfg);
 
                        rtl_write_byte(rtlpriv, AMPDU_MIN_SPACE,
                                       mac->min_space_cfg);
@@ -215,9 +215,9 @@ void rtl92se_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                                            (factorlevel[17] << 4));
                                rtl_write_byte(rtlpriv, AGGLEN_LMT_H, regtoset);
 
-                               RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
-                                        "Set HW_VAR_AMPDU_FACTOR: %#x\n",
-                                        factor_toset);
+                               rtl_dbg(rtlpriv, COMP_MLME, DBG_LOUD,
+                                       "Set HW_VAR_AMPDU_FACTOR: %#x\n",
+                                       factor_toset);
                        }
                        break;
                }
@@ -253,9 +253,9 @@ void rtl92se_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                                        acm_ctrl |= ACMHW_VOQEN;
                                        break;
                                default:
-                                       RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                                                "HW_VAR_ACM_CTRL acm set failed: eACI is %d\n",
-                                                acm);
+                                       rtl_dbg(rtlpriv, COMP_ERR, DBG_WARNING,
+                                               "HW_VAR_ACM_CTRL acm set failed: eACI is %d\n",
+                                               acm);
                                        break;
                                }
                        } else {
@@ -276,8 +276,8 @@ void rtl92se_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                                }
                        }
 
-                       RT_TRACE(rtlpriv, COMP_QOS, DBG_TRACE,
-                                "HW_VAR_ACM_CTRL Write 0x%X\n", acm_ctrl);
+                       rtl_dbg(rtlpriv, COMP_QOS, DBG_TRACE,
+                               "HW_VAR_ACM_CTRL Write 0x%X\n", acm_ctrl);
                        rtl_write_byte(rtlpriv, ACMHWCTRL, acm_ctrl);
                        break;
                }
@@ -417,14 +417,14 @@ void rtl92se_enable_hw_security_config(struct ieee80211_hw *hw)
        struct rtl_priv *rtlpriv = rtl_priv(hw);
        u8 sec_reg_value = 0x0;
 
-       RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                "PairwiseEncAlgorithm = %d GroupEncAlgorithm = %d\n",
-                rtlpriv->sec.pairwise_enc_algorithm,
-                rtlpriv->sec.group_enc_algorithm);
+       rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,
+               "PairwiseEncAlgorithm = %d GroupEncAlgorithm = %d\n",
+               rtlpriv->sec.pairwise_enc_algorithm,
+               rtlpriv->sec.group_enc_algorithm);
 
        if (rtlpriv->cfg->mod_params->sw_crypto || rtlpriv->sec.use_sw_sec) {
-               RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
-                        "not open hw encryption\n");
+               rtl_dbg(rtlpriv, COMP_SEC, DBG_DMESG,
+                       "not open hw encryption\n");
                return;
        }
 
@@ -435,8 +435,8 @@ void rtl92se_enable_hw_security_config(struct ieee80211_hw *hw)
                sec_reg_value |= SCR_RXUSEDK;
        }
 
-       RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD, "The SECR-value %x\n",
-                sec_reg_value);
+       rtl_dbg(rtlpriv, COMP_SEC, DBG_LOUD, "The SECR-value %x\n",
+               sec_reg_value);
 
        rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_WPA_CONFIG, &sec_reg_value);
 
@@ -870,10 +870,10 @@ static void _rtl92se_macconfig_after_fwdownload(struct ieee80211_hw *hw)
 
                /* Change Program timing */
                rtl_write_byte(rtlpriv, REG_EFUSE_CTRL + 3, 0x72);
-               RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "EFUSE CONFIG OK\n");
+               rtl_dbg(rtlpriv, COMP_INIT, DBG_DMESG, "EFUSE CONFIG OK\n");
        }
 
-       RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "OK\n");
+       rtl_dbg(rtlpriv, COMP_INIT, DBG_DMESG, "OK\n");
 
 }
 
@@ -960,9 +960,8 @@ int rtl92se_hw_init(struct ieee80211_hw *hw)
        /* 2. download firmware */
        rtstatus = rtl92s_download_fw(hw);
        if (!rtstatus) {
-               RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                        "Failed to download FW. Init HW without FW now... "
-                        "Please copy FW into /lib/firmware/rtlwifi\n");
+               rtl_dbg(rtlpriv, COMP_ERR, DBG_WARNING,
+                       "Failed to download FW. Init HW without FW now... Please copy FW into /lib/firmware/rtlwifi\n");
                err = 1;
                goto exit;
        }
@@ -1014,7 +1013,7 @@ int rtl92se_hw_init(struct ieee80211_hw *hw)
                rtl_write_byte(rtlpriv, RF_CTRL, 0x07);
 
        if (!rtl92s_phy_rf_config(hw)) {
-               RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "RF Config failed\n");
+               rtl_dbg(rtlpriv, COMP_INIT, DBG_DMESG, "RF Config failed\n");
                err = rtstatus;
                goto exit;
        }
@@ -1147,23 +1146,23 @@ static int _rtl92se_set_media_status(struct ieee80211_hw *hw,
        switch (type) {
        case NL80211_IFTYPE_UNSPECIFIED:
                bt_msr |= (MSR_LINK_NONE << MSR_LINK_SHIFT);
-               RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                        "Set Network type to NO LINK!\n");
+               rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE,
+                       "Set Network type to NO LINK!\n");
                break;
        case NL80211_IFTYPE_ADHOC:
                bt_msr |= (MSR_LINK_ADHOC << MSR_LINK_SHIFT);
-               RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                        "Set Network type to Ad Hoc!\n");
+               rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE,
+                       "Set Network type to Ad Hoc!\n");
                break;
        case NL80211_IFTYPE_STATION:
                bt_msr |= (MSR_LINK_MANAGED << MSR_LINK_SHIFT);
-               RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                        "Set Network type to STA!\n");
+               rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE,
+                       "Set Network type to STA!\n");
                break;
        case NL80211_IFTYPE_AP:
                bt_msr |= (MSR_LINK_MASTER << MSR_LINK_SHIFT);
-               RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                        "Set Network type to AP!\n");
+               rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE,
+                       "Set Network type to AP!\n");
                break;
        default:
                pr_err("Network type %d not supported!\n", type);
@@ -1606,8 +1605,8 @@ void rtl92se_update_interrupt_mask(struct ieee80211_hw *hw,
        struct rtl_priv *rtlpriv = rtl_priv(hw);
        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
 
-       RT_TRACE(rtlpriv, COMP_INTR, DBG_LOUD, "add_msr:%x, rm_msr:%x\n",
-                add_msr, rm_msr);
+       rtl_dbg(rtlpriv, COMP_INTR, DBG_LOUD, "add_msr:%x, rm_msr:%x\n",
+               add_msr, rm_msr);
 
        if (add_msr)
                rtlpci->irq_mask[0] |= add_msr;
@@ -1671,11 +1670,11 @@ static void _rtl92se_read_adapter_info(struct ieee80211_hw *hw)
 
        eeprom_id = *((u16 *)&hwinfo[0]);
        if (eeprom_id != RTL8190_EEPROM_ID) {
-               RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                        "EEPROM ID(%#x) is invalid!!\n", eeprom_id);
+               rtl_dbg(rtlpriv, COMP_ERR, DBG_WARNING,
+                       "EEPROM ID(%#x) is invalid!!\n", eeprom_id);
                rtlefuse->autoload_failflag = true;
        } else {
-               RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "Autoload OK\n");
+               rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD, "Autoload OK\n");
                rtlefuse->autoload_failflag = false;
        }
 
@@ -1692,16 +1691,16 @@ static void _rtl92se_read_adapter_info(struct ieee80211_hw *hw)
        rtlefuse->eeprom_smid = *(u16 *)&hwinfo[EEPROM_SMID];
        rtlefuse->eeprom_version = *(u16 *)&hwinfo[EEPROM_VERSION];
 
-       RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                "EEPROMId = 0x%4x\n", eeprom_id);
-       RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                "EEPROM VID = 0x%4x\n", rtlefuse->eeprom_vid);
-       RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                "EEPROM DID = 0x%4x\n", rtlefuse->eeprom_did);
-       RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                "EEPROM SVID = 0x%4x\n", rtlefuse->eeprom_svid);
-       RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                "EEPROM SMID = 0x%4x\n", rtlefuse->eeprom_smid);
+       rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,
+               "EEPROMId = 0x%4x\n", eeprom_id);
+       rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,
+               "EEPROM VID = 0x%4x\n", rtlefuse->eeprom_vid);
+       rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,
+               "EEPROM DID = 0x%4x\n", rtlefuse->eeprom_did);
+       rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,
+               "EEPROM SVID = 0x%4x\n", rtlefuse->eeprom_svid);
+       rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,
+               "EEPROM SMID = 0x%4x\n", rtlefuse->eeprom_smid);
 
        for (i = 0; i < 6; i += 2) {
                usvalue = *(u16 *)&hwinfo[EEPROM_MAC_ADDR + i];
@@ -1711,7 +1710,7 @@ static void _rtl92se_read_adapter_info(struct ieee80211_hw *hw)
        for (i = 0; i < 6; i++)
                rtl_write_byte(rtlpriv, MACIDR0 + i, rtlefuse->dev_addr[i]);
 
-       RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "%pM\n", rtlefuse->dev_addr);
+       rtl_dbg(rtlpriv, COMP_INIT, DBG_DMESG, "%pM\n", rtlefuse->dev_addr);
 
        /* Get Tx Power Level by Channel */
        /* Read Tx power of Channel 1 ~ 14 from EEPROM. */
@@ -1964,15 +1963,15 @@ static void _rtl92se_read_adapter_info(struct ieee80211_hw *hw)
                tempval = rtl_read_byte(rtlpriv, 0x07);
                if (!(tempval & BIT(0))) {
                        rtlefuse->b1x1_recvcombine = true;
-                       RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                                "RF_TYPE=1T2R but only 1SS\n");
+                       rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,
+                               "RF_TYPE=1T2R but only 1SS\n");
                }
        }
        rtlefuse->b1ss_support = rtlefuse->b1x1_recvcombine;
        rtlefuse->eeprom_oemid = *&hwinfo[EEPROM_CUSTOMID];
 
-       RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "EEPROM Customer ID: 0x%2x\n",
-                rtlefuse->eeprom_oemid);
+       rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD, "EEPROM Customer ID: 0x%2x\n",
+               rtlefuse->eeprom_oemid);
 
        /* set channel paln to world wide 13 */
        rtlefuse->channel_plan = COUNTRY_CODE_WORLD_WIDE_13;
@@ -1987,15 +1986,15 @@ void rtl92se_read_eeprom_info(struct ieee80211_hw *hw)
        tmp_u1b = rtl_read_byte(rtlpriv, EPROM_CMD);
 
        if (tmp_u1b & BIT(4)) {
-               RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "Boot from EEPROM\n");
+               rtl_dbg(rtlpriv, COMP_INIT, DBG_DMESG, "Boot from EEPROM\n");
                rtlefuse->epromtype = EEPROM_93C46;
        } else {
-               RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "Boot from EFUSE\n");
+               rtl_dbg(rtlpriv, COMP_INIT, DBG_DMESG, "Boot from EFUSE\n");
                rtlefuse->epromtype = EEPROM_BOOT_EFUSE;
        }
 
        if (tmp_u1b & BIT(5)) {
-               RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "Autoload OK\n");
+               rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD, "Autoload OK\n");
                rtlefuse->autoload_failflag = false;
                _rtl92se_read_adapter_info(hw);
        } else {
@@ -2101,8 +2100,8 @@ static void rtl92se_update_hal_rate_table(struct ieee80211_hw *hw,
        else
                rtl92s_phy_set_fw_cmd(hw, FW_CMD_RA_REFRESH_BG);
 
-       RT_TRACE(rtlpriv, COMP_RATR, DBG_DMESG, "%x\n",
-                rtl_read_dword(rtlpriv, ARFR0));
+       rtl_dbg(rtlpriv, COMP_RATR, DBG_DMESG, "%x\n",
+               rtl_read_dword(rtlpriv, ARFR0));
 }
 
 static void rtl92se_update_hal_rate_mask(struct ieee80211_hw *hw,
@@ -2256,8 +2255,8 @@ static void rtl92se_update_hal_rate_mask(struct ieee80211_hw *hw,
 
        mask |= (bmulticast ? 1 : 0) << 9 | (macid & 0x1f) << 4 | (band & 0xf);
 
-       RT_TRACE(rtlpriv, COMP_RATR, DBG_TRACE, "mask = %x, bitmap = %x\n",
-                mask, ratr_bitmap);
+       rtl_dbg(rtlpriv, COMP_RATR, DBG_TRACE, "mask = %x, bitmap = %x\n",
+               mask, ratr_bitmap);
        rtl_write_dword(rtlpriv, 0x2c4, ratr_bitmap);
        rtl_write_dword(rtlpriv, WFM5, (FW_RA_UPDATE_MASK | (mask << 8)));
 
@@ -2332,15 +2331,15 @@ bool rtl92se_gpio_radio_on_off_checking(struct ieee80211_hw *hw, u8 *valid)
        rfpwr_toset = _rtl92se_rf_onoff_detect(hw);
 
        if ((ppsc->hwradiooff) && (rfpwr_toset == ERFON)) {
-               RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
-                        "RFKILL-HW Radio ON, RF ON\n");
+               rtl_dbg(rtlpriv, COMP_RF, DBG_DMESG,
+                       "RFKILL-HW Radio ON, RF ON\n");
 
                rfpwr_toset = ERFON;
                ppsc->hwradiooff = false;
                actuallyset = true;
        } else if ((!ppsc->hwradiooff) && (rfpwr_toset == ERFOFF)) {
-               RT_TRACE(rtlpriv, COMP_RF,
-                        DBG_DMESG, "RFKILL-HW Radio OFF, RF OFF\n");
+               rtl_dbg(rtlpriv, COMP_RF,
+                       DBG_DMESG, "RFKILL-HW Radio OFF, RF OFF\n");
 
                rfpwr_toset = ERFOFF;
                ppsc->hwradiooff = true;
@@ -2404,7 +2403,7 @@ void rtl92se_set_key(struct ieee80211_hw *hw, u32 key_index, u8 *p_macaddr,
                u8 cam_offset = 0;
                u8 clear_number = 5;
 
-               RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, "clear_all\n");
+               rtl_dbg(rtlpriv, COMP_SEC, DBG_DMESG, "clear_all\n");
 
                for (idx = 0; idx < clear_number; idx++) {
                        rtl_cam_mark_invalid(hw, cam_offset + idx);
@@ -2463,26 +2462,26 @@ void rtl92se_set_key(struct ieee80211_hw *hw, u32 key_index, u8 *p_macaddr,
                }
 
                if (rtlpriv->sec.key_len[key_index] == 0) {
-                       RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
-                                "delete one entry, entry_id is %d\n",
-                                entry_id);
+                       rtl_dbg(rtlpriv, COMP_SEC, DBG_DMESG,
+                               "delete one entry, entry_id is %d\n",
+                               entry_id);
                        if (mac->opmode == NL80211_IFTYPE_AP)
                                rtl_cam_del_entry(hw, p_macaddr);
                        rtl_cam_delete_one_entry(hw, p_macaddr, entry_id);
                } else {
-                       RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
-                                "add one entry\n");
+                       rtl_dbg(rtlpriv, COMP_SEC, DBG_DMESG,
+                               "add one entry\n");
                        if (is_pairwise) {
-                               RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
-                                        "set Pairwise key\n");
+                               rtl_dbg(rtlpriv, COMP_SEC, DBG_DMESG,
+                                       "set Pairwise key\n");
 
                                rtl_cam_add_one_entry(hw, macaddr, key_index,
                                        entry_id, enc_algo,
                                        CAM_CONFIG_NO_USEDK,
                                        rtlpriv->sec.key_buf[key_index]);
                        } else {
-                               RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
-                                        "set group key\n");
+                               rtl_dbg(rtlpriv, COMP_SEC, DBG_DMESG,
+                                       "set group key\n");
 
                                if (mac->opmode == NL80211_IFTYPE_ADHOC) {
                                        rtl_cam_add_one_entry(hw,
index 2d18bc1ee480381bdec30b80ce97a577c171300d..ecbf425f679f8868298d93013aad96318c8ed48e 100644 (file)
@@ -27,8 +27,8 @@ void rtl92se_sw_led_on(struct ieee80211_hw *hw, struct rtl_led *pled)
        u8 ledcfg;
        struct rtl_priv *rtlpriv = rtl_priv(hw);
 
-       RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD, "LedAddr:%X ledpin=%d\n",
-                LEDCFG, pled->ledpin);
+       rtl_dbg(rtlpriv, COMP_LED, DBG_LOUD, "LedAddr:%X ledpin=%d\n",
+               LEDCFG, pled->ledpin);
 
        ledcfg = rtl_read_byte(rtlpriv, LEDCFG);
 
@@ -57,8 +57,8 @@ void rtl92se_sw_led_off(struct ieee80211_hw *hw, struct rtl_led *pled)
        rtlpriv = rtl_priv(hw);
        if (!rtlpriv || rtlpriv->max_fw_size)
                return;
-       RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD, "LedAddr:%X ledpin=%d\n",
-                LEDCFG, pled->ledpin);
+       rtl_dbg(rtlpriv, COMP_LED, DBG_LOUD, "LedAddr:%X ledpin=%d\n",
+               LEDCFG, pled->ledpin);
 
        ledcfg = rtl_read_byte(rtlpriv, LEDCFG);
 
@@ -119,7 +119,7 @@ void rtl92se_led_control(struct ieee80211_hw *hw, enum led_ctl_mode ledaction)
            ledaction == LED_CTL_POWER_ON)) {
                return;
        }
-       RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD, "ledaction %d\n", ledaction);
+       rtl_dbg(rtlpriv, COMP_LED, DBG_LOUD, "ledaction %d\n", ledaction);
 
        _rtl92se_sw_led_control(hw, ledaction);
 }
index d5c0eb462315512052915b7479f2a1892a22dafe..3d482b8675e20b3e9307c1522b0ea3ca8d545269 100644 (file)
@@ -31,15 +31,15 @@ u32 rtl92s_phy_query_bb_reg(struct ieee80211_hw *hw, u32 regaddr, u32 bitmask)
        struct rtl_priv *rtlpriv = rtl_priv(hw);
        u32 returnvalue = 0, 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 = _rtl92s_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;
 
@@ -51,9 +51,9 @@ void rtl92s_phy_set_bb_reg(struct ieee80211_hw *hw, u32 regaddr, u32 bitmask,
        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);
@@ -63,9 +63,9 @@ void rtl92s_phy_set_bb_reg(struct ieee80211_hw *hw, u32 regaddr, u32 bitmask,
 
        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);
 
 }
 
@@ -123,8 +123,8 @@ static u32 _rtl92s_phy_rf_serial_read(struct ieee80211_hw *hw,
        retvalue = rtl_get_bbreg(hw, pphyreg->rf_rb,
                                 BLSSI_READBACK_DATA);
 
-       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;
 
@@ -146,8 +146,8 @@ static void _rtl92s_phy_rf_serial_write(struct ieee80211_hw *hw,
        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);
 }
 
 
@@ -157,8 +157,8 @@ u32 rtl92s_phy_query_rf_reg(struct ieee80211_hw *hw, enum radio_path rfpath,
        struct rtl_priv *rtlpriv = rtl_priv(hw);
        u32 original_value, readback_value, bitshift;
 
-       RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
-                "regaddr(%#x), rfpath(%#x), bitmask(%#x)\n",
+       rtl_dbg(rtlpriv, COMP_RF, DBG_TRACE,
+               "regaddr(%#x), rfpath(%#x), bitmask(%#x)\n",
                 regaddr, rfpath, bitmask);
 
        spin_lock(&rtlpriv->locks.rf_lock);
@@ -170,9 +170,9 @@ u32 rtl92s_phy_query_rf_reg(struct ieee80211_hw *hw, enum radio_path rfpath,
 
        spin_unlock(&rtlpriv->locks.rf_lock);
 
-       RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
-                "regaddr(%#x), rfpath(%#x), bitmask(%#x), original_value(%#x)\n",
-                regaddr, rfpath, bitmask, original_value);
+       rtl_dbg(rtlpriv, COMP_RF, DBG_TRACE,
+               "regaddr(%#x), rfpath(%#x), bitmask(%#x), original_value(%#x)\n",
+               regaddr, rfpath, bitmask, original_value);
 
        return readback_value;
 }
@@ -187,9 +187,9 @@ void rtl92s_phy_set_rf_reg(struct ieee80211_hw *hw, enum radio_path rfpath,
        if (!((rtlphy->rf_pathmap >> rfpath) & 0x1))
                return;
 
-       RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
-                "regaddr(%#x), bitmask(%#x), data(%#x), rfpath(%#x)\n",
-                regaddr, bitmask, data, rfpath);
+       rtl_dbg(rtlpriv, COMP_RF, DBG_TRACE,
+               "regaddr(%#x), bitmask(%#x), data(%#x), rfpath(%#x)\n",
+               regaddr, bitmask, data, rfpath);
 
        spin_lock(&rtlpriv->locks.rf_lock);
 
@@ -204,9 +204,9 @@ void rtl92s_phy_set_rf_reg(struct ieee80211_hw *hw, enum radio_path rfpath,
 
        spin_unlock(&rtlpriv->locks.rf_lock);
 
-       RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
-                "regaddr(%#x), bitmask(%#x), data(%#x), rfpath(%#x)\n",
-                regaddr, bitmask, data, rfpath);
+       rtl_dbg(rtlpriv, COMP_RF, DBG_TRACE,
+               "regaddr(%#x), bitmask(%#x), data(%#x), rfpath(%#x)\n",
+               regaddr, bitmask, data, rfpath);
 
 }
 
@@ -239,9 +239,9 @@ void rtl92s_phy_set_bw_mode(struct ieee80211_hw *hw,
        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
        u8 reg_bw_opmode;
 
-       RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE, "Switch to %s bandwidth\n",
-                rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20 ?
-                "20MHz" : "40MHz");
+       rtl_dbg(rtlpriv, COMP_SCAN, DBG_TRACE, "Switch to %s bandwidth\n",
+               rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20 ?
+               "20MHz" : "40MHz");
 
        if (rtlphy->set_bwmode_inprogress)
                return;
@@ -296,7 +296,7 @@ void rtl92s_phy_set_bw_mode(struct ieee80211_hw *hw,
 
        rtl92s_phy_rf6052_set_bandwidth(hw, rtlphy->current_chan_bw);
        rtlphy->set_bwmode_inprogress = false;
-       RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE, "<==\n");
+       rtl_dbg(rtlpriv, COMP_SCAN, DBG_TRACE, "<==\n");
 }
 
 static bool _rtl92s_phy_set_sw_chnl_cmdarray(struct swchnlcmd *cmdtable,
@@ -434,8 +434,8 @@ u8 rtl92s_phy_sw_chnl(struct ieee80211_hw *hw)
        u32 delay;
        bool ret;
 
-       RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE, "switch to channel%d\n",
-                rtlphy->current_channel);
+       rtl_dbg(rtlpriv, COMP_SCAN, DBG_TRACE, "switch to channel%d\n",
+               rtlphy->current_channel);
 
        if (rtlphy->sw_chnl_inprogress)
                return 0;
@@ -471,7 +471,7 @@ u8 rtl92s_phy_sw_chnl(struct ieee80211_hw *hw)
 
        rtlphy->sw_chnl_inprogress = false;
 
-       RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE, "<==\n");
+       rtl_dbg(rtlpriv, COMP_SCAN, DBG_TRACE, "<==\n");
 
        return 1;
 }
@@ -530,20 +530,19 @@ bool rtl92s_phy_set_rf_power_state(struct ieee80211_hw *hw,
                                u32 initializecount = 0;
                                do {
                                        initializecount++;
-                                       RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
-                                                "IPS Set eRf nic enable\n");
+                                       rtl_dbg(rtlpriv, COMP_RF, DBG_DMESG,
+                                               "IPS Set eRf nic enable\n");
                                        rtstatus = rtl_ps_enable_nic(hw);
                                } while (!rtstatus && (initializecount < 10));
 
                                RT_CLEAR_PS_LEVEL(ppsc,
                                                  RT_RF_OFF_LEVL_HALT_NIC);
                        } else {
-                               RT_TRACE(rtlpriv, COMP_POWER, DBG_DMESG,
-                                        "awake, sleeped:%d ms state_inap:%x\n",
-                                        jiffies_to_msecs(jiffies -
-                                                         ppsc->
-                                                         last_sleep_jiffies),
-                                        rtlpriv->psc.state_inap);
+                               rtl_dbg(rtlpriv, COMP_POWER, DBG_DMESG,
+                                       "awake, slept:%d ms state_inap:%x\n",
+                                       jiffies_to_msecs(jiffies -
+                                       ppsc->last_sleep_jiffies),
+                                       rtlpriv->psc.state_inap);
                                ppsc->last_awake_jiffies = jiffies;
                                rtl_write_word(rtlpriv, CMDR, 0x37FC);
                                rtl_write_byte(rtlpriv, TXPAUSE, 0x00);
@@ -560,8 +559,8 @@ bool rtl92s_phy_set_rf_power_state(struct ieee80211_hw *hw,
                }
        case ERFOFF:{
                        if (ppsc->reg_rfps_level & RT_RF_OFF_LEVL_HALT_NIC) {
-                               RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
-                                        "IPS Set eRf nic disable\n");
+                               rtl_dbg(rtlpriv, COMP_RF, DBG_DMESG,
+                                       "IPS Set eRf nic disable\n");
                                rtl_ps_disable_nic(hw);
                                RT_SET_PS_LEVEL(ppsc, RT_RF_OFF_LEVL_HALT_NIC);
                        } else {
@@ -586,34 +585,34 @@ bool rtl92s_phy_set_rf_power_state(struct ieee80211_hw *hw,
                                        queue_id++;
                                        continue;
                                } else {
-                                       RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                                                "eRf Off/Sleep: %d times TcbBusyQueue[%d] = %d before doze!\n",
-                                                i + 1, queue_id,
-                                                skb_queue_len(&ring->queue));
+                                       rtl_dbg(rtlpriv, COMP_ERR, DBG_WARNING,
+                                               "eRf Off/Sleep: %d times TcbBusyQueue[%d] = %d before doze!\n",
+                                               i + 1, queue_id,
+                                               skb_queue_len(&ring->queue));
 
                                        udelay(10);
                                        i++;
                                }
 
                                if (i >= MAX_DOZE_WAITING_TIMES_9x) {
-                                       RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                                                "ERFOFF: %d times TcbBusyQueue[%d] = %d !\n",
-                                                MAX_DOZE_WAITING_TIMES_9x,
-                                                queue_id,
-                                                skb_queue_len(&ring->queue));
+                                       rtl_dbg(rtlpriv, COMP_ERR, DBG_WARNING,
+                                               "ERFOFF: %d times TcbBusyQueue[%d] = %d !\n",
+                                               MAX_DOZE_WAITING_TIMES_9x,
+                                               queue_id,
+                                               skb_queue_len(&ring->queue));
                                        break;
                                }
                        }
 
-                       RT_TRACE(rtlpriv, COMP_POWER, DBG_DMESG,
-                                "Set ERFSLEEP awaked:%d ms\n",
-                                jiffies_to_msecs(jiffies -
-                                                 ppsc->last_awake_jiffies));
+                       rtl_dbg(rtlpriv, COMP_POWER, DBG_DMESG,
+                               "Set ERFSLEEP awaked:%d ms\n",
+                               jiffies_to_msecs(jiffies -
+                                                ppsc->last_awake_jiffies));
 
-                       RT_TRACE(rtlpriv, COMP_POWER, DBG_DMESG,
-                                "sleep awaked:%d ms state_inap:%x\n",
-                                jiffies_to_msecs(jiffies -
-                                                 ppsc->last_awake_jiffies),
+                       rtl_dbg(rtlpriv, COMP_POWER, DBG_DMESG,
+                               "sleep awaked:%d ms state_inap:%x\n",
+                               jiffies_to_msecs(jiffies -
+                                                ppsc->last_awake_jiffies),
                                 rtlpriv->psc.state_inap);
                        ppsc->last_sleep_jiffies = jiffies;
                        _rtl92se_phy_set_rf_sleep(hw);
@@ -968,7 +967,7 @@ u8 rtl92s_phy_config_rf(struct ieee80211_hw *hw, enum radio_path rfpath)
                radio_b_tblen = RADIOB_ARRAYLENGTH;
        }
 
-       RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "Radio No %x\n", rfpath);
+       rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD, "Radio No %x\n", rfpath);
        rtstatus = true;
 
        switch (rfpath) {
@@ -1088,20 +1087,20 @@ void rtl92s_phy_get_hw_reg_originalvalue(struct ieee80211_hw *hw)
                        ROFDM0_XCAGCCORE1, MASKBYTE0);
        rtlphy->default_initialgain[3] = rtl_get_bbreg(hw,
                        ROFDM0_XDAGCCORE1, MASKBYTE0);
-       RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                "Default initial gain (c50=0x%x, c58=0x%x, c60=0x%x, c68=0x%x)\n",
-                rtlphy->default_initialgain[0],
-                rtlphy->default_initialgain[1],
-                rtlphy->default_initialgain[2],
-                rtlphy->default_initialgain[3]);
+       rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,
+               "Default initial gain (c50=0x%x, c58=0x%x, c60=0x%x, c68=0x%x)\n",
+               rtlphy->default_initialgain[0],
+               rtlphy->default_initialgain[1],
+               rtlphy->default_initialgain[2],
+               rtlphy->default_initialgain[3]);
 
        /* read framesync */
        rtlphy->framesync = rtl_get_bbreg(hw, ROFDM0_RXDETECTOR3, MASKBYTE0);
        rtlphy->framesync_c34 = rtl_get_bbreg(hw, ROFDM0_RXDETECTOR2,
                                              MASKDWORD);
-       RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                "Default framesync (0x%x) = 0x%x\n",
-                ROFDM0_RXDETECTOR3, rtlphy->framesync);
+       rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,
+               "Default framesync (0x%x) = 0x%x\n",
+               ROFDM0_RXDETECTOR3, rtlphy->framesync);
 
 }
 
@@ -1163,10 +1162,10 @@ void rtl92s_phy_set_txpower(struct ieee80211_hw *hw, u8 channel)
        _rtl92s_phy_get_txpower_index(hw, channel, &cckpowerlevel[0],
                        &ofdmpowerlevel[0]);
 
-       RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                "Channel-%d, cckPowerLevel (A / B) = 0x%x / 0x%x, ofdmPowerLevel (A / B) = 0x%x / 0x%x\n",
-                channel, cckpowerlevel[0], cckpowerlevel[1],
-                ofdmpowerlevel[0], ofdmpowerlevel[1]);
+       rtl_dbg(rtlpriv, COMP_POWER, DBG_LOUD,
+               "Channel-%d, cckPowerLevel (A / B) = 0x%x / 0x%x, ofdmPowerLevel (A / B) = 0x%x / 0x%x\n",
+               channel, cckpowerlevel[0], cckpowerlevel[1],
+               ofdmpowerlevel[0], ofdmpowerlevel[1]);
 
        _rtl92s_phy_ccxpower_indexcheck(hw, channel, &cckpowerlevel[0],
                        &ofdmpowerlevel[0]);
@@ -1224,17 +1223,17 @@ static void _rtl92s_phy_set_fwcmd_io(struct ieee80211_hw *hw)
 skip:
        switch (rtlhal->current_fwcmd_io) {
        case FW_CMD_RA_RESET:
-               RT_TRACE(rtlpriv, COMP_CMD, DBG_DMESG, "FW_CMD_RA_RESET\n");
+               rtl_dbg(rtlpriv, COMP_CMD, DBG_DMESG, "FW_CMD_RA_RESET\n");
                rtl_write_dword(rtlpriv, WFM5, FW_RA_RESET);
                rtl92s_phy_chk_fwcmd_iodone(hw);
                break;
        case FW_CMD_RA_ACTIVE:
-               RT_TRACE(rtlpriv, COMP_CMD, DBG_DMESG, "FW_CMD_RA_ACTIVE\n");
+               rtl_dbg(rtlpriv, COMP_CMD, DBG_DMESG, "FW_CMD_RA_ACTIVE\n");
                rtl_write_dword(rtlpriv, WFM5, FW_RA_ACTIVE);
                rtl92s_phy_chk_fwcmd_iodone(hw);
                break;
        case FW_CMD_RA_REFRESH_N:
-               RT_TRACE(rtlpriv, COMP_CMD, DBG_DMESG, "FW_CMD_RA_REFRESH_N\n");
+               rtl_dbg(rtlpriv, COMP_CMD, DBG_DMESG, "FW_CMD_RA_REFRESH_N\n");
                input = FW_RA_REFRESH;
                rtl_write_dword(rtlpriv, WFM5, input);
                rtl92s_phy_chk_fwcmd_iodone(hw);
@@ -1242,29 +1241,29 @@ skip:
                rtl92s_phy_chk_fwcmd_iodone(hw);
                break;
        case FW_CMD_RA_REFRESH_BG:
-               RT_TRACE(rtlpriv, COMP_CMD, DBG_DMESG,
-                        "FW_CMD_RA_REFRESH_BG\n");
+               rtl_dbg(rtlpriv, COMP_CMD, DBG_DMESG,
+                       "FW_CMD_RA_REFRESH_BG\n");
                rtl_write_dword(rtlpriv, WFM5, FW_RA_REFRESH);
                rtl92s_phy_chk_fwcmd_iodone(hw);
                rtl_write_dword(rtlpriv, WFM5, FW_RA_DISABLE_RSSI_MASK);
                rtl92s_phy_chk_fwcmd_iodone(hw);
                break;
        case FW_CMD_RA_REFRESH_N_COMB:
-               RT_TRACE(rtlpriv, COMP_CMD, DBG_DMESG,
-                        "FW_CMD_RA_REFRESH_N_COMB\n");
+               rtl_dbg(rtlpriv, COMP_CMD, DBG_DMESG,
+                       "FW_CMD_RA_REFRESH_N_COMB\n");
                input = FW_RA_IOT_N_COMB;
                rtl_write_dword(rtlpriv, WFM5, input);
                rtl92s_phy_chk_fwcmd_iodone(hw);
                break;
        case FW_CMD_RA_REFRESH_BG_COMB:
-               RT_TRACE(rtlpriv, COMP_CMD, DBG_DMESG,
-                        "FW_CMD_RA_REFRESH_BG_COMB\n");
+               rtl_dbg(rtlpriv, COMP_CMD, DBG_DMESG,
+                       "FW_CMD_RA_REFRESH_BG_COMB\n");
                input = FW_RA_IOT_BG_COMB;
                rtl_write_dword(rtlpriv, WFM5, input);
                rtl92s_phy_chk_fwcmd_iodone(hw);
                break;
        case FW_CMD_IQK_ENABLE:
-               RT_TRACE(rtlpriv, COMP_CMD, DBG_DMESG, "FW_CMD_IQK_ENABLE\n");
+               rtl_dbg(rtlpriv, COMP_CMD, DBG_DMESG, "FW_CMD_IQK_ENABLE\n");
                rtl_write_dword(rtlpriv, WFM5, FW_IQK_ENABLE);
                rtl92s_phy_chk_fwcmd_iodone(hw);
                break;
@@ -1299,7 +1298,7 @@ skip:
                rtl_set_bbreg(hw, RCCK0_CCA, MASKBYTE2, 0xcd);
                break;
        case FW_CMD_LPS_ENTER:
-               RT_TRACE(rtlpriv, COMP_CMD, DBG_DMESG, "FW_CMD_LPS_ENTER\n");
+               rtl_dbg(rtlpriv, COMP_CMD, DBG_DMESG, "FW_CMD_LPS_ENTER\n");
                current_aid = rtlpriv->mac80211.assoc_id;
                rtl_write_dword(rtlpriv, WFM5, (FW_LPS_ENTER |
                                ((current_aid | 0xc000) << 8)));
@@ -1308,18 +1307,18 @@ skip:
                 * turbo mode until driver leave LPS */
                break;
        case FW_CMD_LPS_LEAVE:
-               RT_TRACE(rtlpriv, COMP_CMD, DBG_DMESG, "FW_CMD_LPS_LEAVE\n");
+               rtl_dbg(rtlpriv, COMP_CMD, DBG_DMESG, "FW_CMD_LPS_LEAVE\n");
                rtl_write_dword(rtlpriv, WFM5, FW_LPS_LEAVE);
                rtl92s_phy_chk_fwcmd_iodone(hw);
                break;
        case FW_CMD_ADD_A2_ENTRY:
-               RT_TRACE(rtlpriv, COMP_CMD, DBG_DMESG, "FW_CMD_ADD_A2_ENTRY\n");
+               rtl_dbg(rtlpriv, COMP_CMD, DBG_DMESG, "FW_CMD_ADD_A2_ENTRY\n");
                rtl_write_dword(rtlpriv, WFM5, FW_ADD_A2_ENTRY);
                rtl92s_phy_chk_fwcmd_iodone(hw);
                break;
        case FW_CMD_CTRL_DM_BY_DRIVER:
-               RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
-                        "FW_CMD_CTRL_DM_BY_DRIVER\n");
+               rtl_dbg(rtlpriv, COMP_CMD, DBG_LOUD,
+                       "FW_CMD_CTRL_DM_BY_DRIVER\n");
                rtl_write_dword(rtlpriv, WFM5, FW_CTRL_DM_BY_DRIVER);
                rtl92s_phy_chk_fwcmd_iodone(hw);
                break;
@@ -1344,9 +1343,9 @@ bool rtl92s_phy_set_fw_cmd(struct ieee80211_hw *hw, enum fwcmd_iotype fw_cmdio)
        u16     fw_cmdmap = FW_CMD_IO_QUERY(rtlpriv);
        bool postprocessing = false;
 
-       RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
-                "Set FW Cmd(%#x), set_fwcmd_inprogress(%d)\n",
-                fw_cmdio, rtlhal->set_fwcmd_inprogress);
+       rtl_dbg(rtlpriv, COMP_CMD, DBG_LOUD,
+               "Set FW Cmd(%#x), set_fwcmd_inprogress(%d)\n",
+               fw_cmdio, rtlhal->set_fwcmd_inprogress);
 
        do {
                /* We re-map to combined FW CMD ones if firmware version */
@@ -1383,30 +1382,30 @@ bool rtl92s_phy_set_fw_cmd(struct ieee80211_hw *hw, enum fwcmd_iotype fw_cmdio)
                 * DM map table in the future. */
                switch (fw_cmdio) {
                case FW_CMD_RA_INIT:
-                       RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, "RA init!!\n");
+                       rtl_dbg(rtlpriv, COMP_CMD, DBG_LOUD, "RA init!!\n");
                        fw_cmdmap |= FW_RA_INIT_CTL;
                        FW_CMD_IO_SET(rtlpriv, fw_cmdmap);
                        /* Clear control flag to sync with FW. */
                        FW_CMD_IO_CLR(rtlpriv, FW_RA_INIT_CTL);
                        break;
                case FW_CMD_DIG_DISABLE:
-                       RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
-                                "Set DIG disable!!\n");
+                       rtl_dbg(rtlpriv, COMP_CMD, DBG_LOUD,
+                               "Set DIG disable!!\n");
                        fw_cmdmap &= ~FW_DIG_ENABLE_CTL;
                        FW_CMD_IO_SET(rtlpriv, fw_cmdmap);
                        break;
                case FW_CMD_DIG_ENABLE:
                case FW_CMD_DIG_RESUME:
                        if (!(rtlpriv->dm.dm_flag & HAL_DM_DIG_DISABLE)) {
-                               RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
-                                        "Set DIG enable or resume!!\n");
+                               rtl_dbg(rtlpriv, COMP_CMD, DBG_LOUD,
+                                       "Set DIG enable or resume!!\n");
                                fw_cmdmap |= (FW_DIG_ENABLE_CTL | FW_SS_CTL);
                                FW_CMD_IO_SET(rtlpriv, fw_cmdmap);
                        }
                        break;
                case FW_CMD_DIG_HALT:
-                       RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
-                                "Set DIG halt!!\n");
+                       rtl_dbg(rtlpriv, COMP_CMD, DBG_LOUD,
+                               "Set DIG halt!!\n");
                        fw_cmdmap &= ~(FW_DIG_ENABLE_CTL | FW_SS_CTL);
                        FW_CMD_IO_SET(rtlpriv, fw_cmdmap);
                        break;
@@ -1421,9 +1420,9 @@ bool rtl92s_phy_set_fw_cmd(struct ieee80211_hw *hw, enum fwcmd_iotype fw_cmdio)
                        fw_param |= ((thermalval << 24) |
                                     (rtlefuse->thermalmeter[0] << 16));
 
-                       RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
-                                "Set TxPwr tracking!! FwCmdMap(%#x), FwParam(%#x)\n",
-                                fw_cmdmap, fw_param);
+                       rtl_dbg(rtlpriv, COMP_CMD, DBG_LOUD,
+                               "Set TxPwr tracking!! FwCmdMap(%#x), FwParam(%#x)\n",
+                               fw_cmdmap, fw_param);
 
                        FW_CMD_PARA_SET(rtlpriv, fw_param);
                        FW_CMD_IO_SET(rtlpriv, fw_cmdmap);
@@ -1443,9 +1442,9 @@ bool rtl92s_phy_set_fw_cmd(struct ieee80211_hw *hw, enum fwcmd_iotype fw_cmdio)
                        /* Clear FW parameter in terms of RA parts. */
                        fw_param &= FW_RA_PARAM_CLR;
 
-                       RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
-                                "[FW CMD] [New Version] Set RA/IOT Comb in n mode!! FwCmdMap(%#x), FwParam(%#x)\n",
-                                fw_cmdmap, fw_param);
+                       rtl_dbg(rtlpriv, COMP_CMD, DBG_LOUD,
+                               "[FW CMD] [New Version] Set RA/IOT Comb in n mode!! FwCmdMap(%#x), FwParam(%#x)\n",
+                               fw_cmdmap, fw_param);
 
                        FW_CMD_PARA_SET(rtlpriv, fw_param);
                        FW_CMD_IO_SET(rtlpriv, fw_cmdmap);
@@ -1531,8 +1530,8 @@ bool rtl92s_phy_set_fw_cmd(struct ieee80211_hw *hw, enum fwcmd_iotype fw_cmdio)
                        FW_CMD_IO_SET(rtlpriv, fw_cmdmap);
                        break;
                case FW_CMD_PAPE_CONTROL:
-                       RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
-                                "[FW CMD] Set PAPE Control\n");
+                       rtl_dbg(rtlpriv, COMP_CMD, DBG_LOUD,
+                               "[FW CMD] Set PAPE Control\n");
                        fw_cmdmap &= ~FW_PAPE_CTL_BY_SW_HW;
 
                        FW_CMD_IO_SET(rtlpriv, fw_cmdmap);
index a37855f57e76f6f300556ce8daa9952f8be3e92a..85f6d0d4dd799805239260f91a1c7f2f0a54e0cb 100644 (file)
@@ -95,13 +95,13 @@ static void _rtl92s_get_powerbase(struct ieee80211_hw *hw, u8 *p_pwrlevel,
        }
 
        if (rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20_40) {
-               RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                        "40MHz finalpwr_idx (A / B) = 0x%x / 0x%x\n",
-                        p_final_pwridx[0], p_final_pwridx[1]);
+               rtl_dbg(rtlpriv, COMP_POWER, DBG_LOUD,
+                       "40MHz finalpwr_idx (A / B) = 0x%x / 0x%x\n",
+                       p_final_pwridx[0], p_final_pwridx[1]);
        } else {
-               RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                        "20MHz finalpwr_idx (A / B) = 0x%x / 0x%x\n",
-                        p_final_pwridx[0], p_final_pwridx[1]);
+               rtl_dbg(rtlpriv, COMP_POWER, DBG_LOUD,
+                       "20MHz finalpwr_idx (A / B) = 0x%x / 0x%x\n",
+                       p_final_pwridx[0], p_final_pwridx[1]);
        }
 }
 
@@ -124,9 +124,9 @@ static void _rtl92s_set_antennadiff(struct ieee80211_hw *hw,
                if (ant_pwr_diff < -8)
                        ant_pwr_diff = -8;
 
-               RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                        "Antenna Diff from RF-B to RF-A = %d (0x%x)\n",
-                        ant_pwr_diff, ant_pwr_diff & 0xf);
+               rtl_dbg(rtlpriv, COMP_POWER, DBG_LOUD,
+                       "Antenna Diff from RF-B to RF-A = %d (0x%x)\n",
+                       ant_pwr_diff, ant_pwr_diff & 0xf);
 
                ant_pwr_diff &= 0xf;
        }
@@ -143,8 +143,8 @@ static void _rtl92s_set_antennadiff(struct ieee80211_hw *hw,
        rtl_set_bbreg(hw, RFPGA0_TXGAINSTAGE, (BXBTXAGC | BXCTXAGC | BXDTXAGC),
                      u4reg_val);
 
-       RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD, "Write BCD-Diff(0x%x) = 0x%x\n",
-                RFPGA0_TXGAINSTAGE, u4reg_val);
+       rtl_dbg(rtlpriv, COMP_POWER, DBG_LOUD, "Write BCD-Diff(0x%x) = 0x%x\n",
+               RFPGA0_TXGAINSTAGE, u4reg_val);
 }
 
 static void _rtl92s_get_txpower_writeval_byregulatory(struct ieee80211_hw *hw,
@@ -169,8 +169,8 @@ static void _rtl92s_get_txpower_writeval_byregulatory(struct ieee80211_hw *hw,
                writeval = rtlphy->mcs_offset[chnlgroup][index] +
                                ((index < 2) ? pwrbase0 : pwrbase1);
 
-               RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                        "RTK better performance, writeval = 0x%x\n", writeval);
+               rtl_dbg(rtlpriv, COMP_POWER, DBG_LOUD,
+                       "RTK better performance, writeval = 0x%x\n", writeval);
                break;
        case 1:
                /* Realtek regulatory increase power diff defined
@@ -178,9 +178,9 @@ static void _rtl92s_get_txpower_writeval_byregulatory(struct ieee80211_hw *hw,
                if (rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20_40) {
                        writeval = ((index < 2) ? pwrbase0 : pwrbase1);
 
-                       RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                                "Realtek regulatory, 40MHz, writeval = 0x%x\n",
-                                writeval);
+                       rtl_dbg(rtlpriv, COMP_POWER, DBG_LOUD,
+                               "Realtek regulatory, 40MHz, writeval = 0x%x\n",
+                               writeval);
                } else {
                        chnlgroup = 0;
 
@@ -199,16 +199,16 @@ static void _rtl92s_get_txpower_writeval_byregulatory(struct ieee80211_hw *hw,
                                        + ((index < 2) ?
                                        pwrbase0 : pwrbase1);
 
-                       RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                                "Realtek regulatory, 20MHz, writeval = 0x%x\n",
-                                writeval);
+                       rtl_dbg(rtlpriv, COMP_POWER, DBG_LOUD,
+                               "Realtek regulatory, 20MHz, writeval = 0x%x\n",
+                               writeval);
                }
                break;
        case 2:
                /* Better regulatory don't increase any power diff */
                writeval = ((index < 2) ? pwrbase0 : pwrbase1);
-               RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                        "Better regulatory, writeval = 0x%x\n", writeval);
+               rtl_dbg(rtlpriv, COMP_POWER, DBG_LOUD,
+                       "Better regulatory, writeval = 0x%x\n", writeval);
                break;
        case 3:
                /* Customer defined power diff. increase power diff
@@ -216,15 +216,15 @@ static void _rtl92s_get_txpower_writeval_byregulatory(struct ieee80211_hw *hw,
                chnlgroup = 0;
 
                if (rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20_40) {
-                       RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                                "customer's limit, 40MHz = 0x%x\n",
-                                rtlefuse->pwrgroup_ht40
-                                [RF90_PATH_A][chnl - 1]);
+                       rtl_dbg(rtlpriv, COMP_POWER, DBG_LOUD,
+                               "customer's limit, 40MHz = 0x%x\n",
+                               rtlefuse->pwrgroup_ht40
+                               [RF90_PATH_A][chnl - 1]);
                } else {
-                       RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                                "customer's limit, 20MHz = 0x%x\n",
-                                rtlefuse->pwrgroup_ht20
-                                [RF90_PATH_A][chnl - 1]);
+                       rtl_dbg(rtlpriv, COMP_POWER, DBG_LOUD,
+                               "customer's limit, 20MHz = 0x%x\n",
+                               rtlefuse->pwrgroup_ht20
+                               [RF90_PATH_A][chnl - 1]);
                }
 
                for (i = 0; i < 4; i++) {
@@ -256,20 +256,20 @@ static void _rtl92s_get_txpower_writeval_byregulatory(struct ieee80211_hw *hw,
                                (pwrdiff_limit[2] << 16) |
                                (pwrdiff_limit[1] << 8) |
                                (pwrdiff_limit[0]);
-               RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                        "Customer's limit = 0x%x\n", customer_limit);
+               rtl_dbg(rtlpriv, COMP_POWER, DBG_LOUD,
+                       "Customer's limit = 0x%x\n", customer_limit);
 
                writeval = customer_limit + ((index < 2) ?
                                             pwrbase0 : pwrbase1);
-               RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                        "Customer, writeval = 0x%x\n", writeval);
+               rtl_dbg(rtlpriv, COMP_POWER, DBG_LOUD,
+                       "Customer, writeval = 0x%x\n", writeval);
                break;
        default:
                chnlgroup = 0;
                writeval = rtlphy->mcs_offset[chnlgroup][index] +
                                ((index < 2) ? pwrbase0 : pwrbase1);
-               RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                        "RTK better performance, writeval = 0x%x\n", writeval);
+               rtl_dbg(rtlpriv, COMP_POWER, DBG_LOUD,
+                       "RTK better performance, writeval = 0x%x\n", writeval);
                break;
        }
 
index 7a54497b7df25ace7557f6674ee0034d9a2a477a..6d352a3161b8f79822708e5cd5f513e27075ef06 100644 (file)
@@ -65,8 +65,8 @@ static void rtl92se_fw_cb(const struct firmware *firmware, void *context)
        struct rt_firmware *pfirmware = NULL;
        char *fw_name = "rtlwifi/rtl8192sefw.bin";
 
-       RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
-                        "Firmware callback routine entered!\n");
+       rtl_dbg(rtlpriv, COMP_ERR, DBG_LOUD,
+               "Firmware callback routine entered!\n");
        complete(&rtlpriv->firmware_loading_complete);
        if (!firmware) {
                pr_err("Firmware %s not available\n", fw_name);
index 9eaa5348b556f1fb8eea86feb4a226e91f9e7574..f2b0d3eb73d058768cdfe3d252c51600d97f8ac9 100644 (file)
@@ -333,8 +333,8 @@ void rtl92se_tx_fill_desc(struct ieee80211_hw *hw,
        u8 bw_40 = 0;
 
        if (pci_dma_mapping_error(rtlpci->pdev, mapping)) {
-               RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE,
-                        "DMA mapping error\n");
+               rtl_dbg(rtlpriv, COMP_SEND, DBG_TRACE,
+                       "DMA mapping error\n");
                return;
        }
        if (mac->opmode == NL80211_IFTYPE_STATION) {
@@ -488,7 +488,7 @@ void rtl92se_tx_fill_desc(struct ieee80211_hw *hw,
        /* DOWRD 8 */
        set_tx_desc_tx_buffer_address(pdesc, mapping);
 
-       RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE, "\n");
+       rtl_dbg(rtlpriv, COMP_SEND, DBG_TRACE, "\n");
 }
 
 void rtl92se_tx_fill_cmddesc(struct ieee80211_hw *hw, u8 *pdesc8,
@@ -504,8 +504,8 @@ void rtl92se_tx_fill_cmddesc(struct ieee80211_hw *hw, u8 *pdesc8,
                        PCI_DMA_TODEVICE);
 
        if (pci_dma_mapping_error(rtlpci->pdev, mapping)) {
-               RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE,
-                        "DMA mapping error\n");
+               rtl_dbg(rtlpriv, COMP_SEND, DBG_TRACE,
+                       "DMA mapping error\n");
                return;
        }
        /* Clear all status     */