remove the RT_TRACE macro

We've deleted all RT_TRACE calls. The macro itself can now be removed
as well.

Link: https://lore.kernel.org/r/20210807153636.11712-13-martin@kaiser.cx
This commit is contained in:
Martin Kaiser 2021-08-07 17:36:36 +02:00 committed by Carlos Garcés
parent 9ad10523e3
commit 2965c273c9
9 changed files with 2 additions and 31 deletions

View File

@ -2388,8 +2388,6 @@ u8 halbtcoutsrc_GetAntDetValFromBt(void *pBtcContext)
status = NDBG_GetAntDetValFromBt(Adapter, opcodeVer, &AntDetVal); status = NDBG_GetAntDetValFromBt(Adapter, opcodeVer, &AntDetVal);
RT_TRACE(COMP_DBG, DBG_LOUD, ("$$$ halbtcoutsrc_GetAntDetValFromBt(): status = %d, feature = %x\n", status, AntDetVal));
return AntDetVal; return AntDetVal;
#else #else
return 0; return 0;

View File

@ -85,8 +85,6 @@ static __inline void RF_DBG(PDM_ODM_T dm, int comp, char *fmt, ...)
do { \ do { \
struct dm_struct *__dm = dm; \ struct dm_struct *__dm = dm; \
if ((comp) & __dm->rf_table.rf_dbg_comp) { \ if ((comp) & __dm->rf_table.rf_dbg_comp) { \
RT_TRACE(((struct rtl_priv *)__dm->adapter), \
COMP_PHYDM, DBG_DMESG, "[RF] " fmt, ##args); \
} \ } \
} while (0) } while (0)
#endif #endif

View File

@ -848,8 +848,6 @@ void odm_txpowertracking_check_mp(void *dm_void)
void *adapter = dm->adapter; void *adapter = dm->adapter;
if (odm_check_power_status(adapter) == false) { if (odm_check_power_status(adapter) == false) {
RT_TRACE(COMP_POWER_TRACKING, DBG_LOUD,
("check_pow_status, return false\n"));
return; return;
} }

View File

@ -718,7 +718,6 @@ odm_txpowertracking_check_mp(
void *adapter = dm->adapter; void *adapter = dm->adapter;
if (odm_check_power_status(adapter) == false) { if (odm_check_power_status(adapter) == false) {
RT_TRACE(COMP_POWER_TRACKING, DBG_LOUD, ("check_pow_status, return false\n"));
return; return;
} }

View File

@ -784,7 +784,6 @@ odm_txpowertracking_check_mp(
return; return;
if (odm_check_power_status(dm) == false) { if (odm_check_power_status(dm) == false) {
RT_TRACE(COMP_POWER_TRACKING, DBG_LOUD, ("check_pow_status return false\n"));
return; return;
} }
@ -831,11 +830,8 @@ odm_txpowertracking_thermal_meter_check(
struct dm_struct *dm = &(pHalData->DM_OutSrc); struct dm_struct *dm = &(pHalData->DM_OutSrc);
struct _hal_rf_ *rf = &(dm->rf_table); struct _hal_rf_ *rf = &(dm->rf_table);
if (!(rf->rf_supportability & HAL_RF_TX_PWR_TRACK)) { if (!(rf->rf_supportability & HAL_RF_TX_PWR_TRACK))
RT_TRACE(COMP_POWER_TRACKING, DBG_LOUD,
("===>odm_txpowertracking_thermal_meter_check(),mgnt_info->is_txpowertracking is false, return!!\n"));
return; return;
}
if (!tm_trigger) { if (!tm_trigger) {
if (IS_HARDWARE_TYPE_8188E(adapter) || IS_HARDWARE_TYPE_JAGUAR(adapter) || IS_HARDWARE_TYPE_8192E(adapter) || IS_HARDWARE_TYPE_8192F(adapter) if (IS_HARDWARE_TYPE_8188E(adapter) || IS_HARDWARE_TYPE_JAGUAR(adapter) || IS_HARDWARE_TYPE_8192E(adapter) || IS_HARDWARE_TYPE_8192F(adapter)
@ -845,14 +841,11 @@ odm_txpowertracking_thermal_meter_check(
else else
PHY_SetRFReg(adapter, RF_PATH_A, RF_T_METER, RFREGOFFSETMASK, 0x60); PHY_SetRFReg(adapter, RF_PATH_A, RF_T_METER, RFREGOFFSETMASK, 0x60);
RT_TRACE(COMP_POWER_TRACKING, DBG_LOUD, ("Trigger Thermal Meter!!\n"));
tm_trigger = 1; tm_trigger = 1;
return; return;
} else if (IS_HARDWARE_TYPE_8822C(adapter) || IS_HARDWARE_TYPE_8814B(adapter)) } else if (IS_HARDWARE_TYPE_8822C(adapter) || IS_HARDWARE_TYPE_8814B(adapter))
return; return;
else { else {
RT_TRACE(COMP_POWER_TRACKING, DBG_LOUD, ("Schedule TxPowerTracking direct call!!\n"));
odm_txpowertracking_direct_call(adapter); odm_txpowertracking_direct_call(adapter);
tm_trigger = 0; tm_trigger = 0;
} }

View File

@ -90,8 +90,6 @@
#define pr_debug printk #define pr_debug printk
#define RT_PRINTK(fmt, args...) pr_debug(fmt, ## args) #define RT_PRINTK(fmt, args...) pr_debug(fmt, ## args)
#define RT_DISP(dbgtype, dbgflag, printstr) #define RT_DISP(dbgtype, dbgflag, printstr)
#define RT_TRACE(adapter, comp, drv_level, fmt, args...) \
RTW_INFO(fmt, ## args)
#define PHYDM_SNPRINTF snprintf #define PHYDM_SNPRINTF snprintf
#elif (DM_ODM_SUPPORT_TYPE == ODM_IOT) #elif (DM_ODM_SUPPORT_TYPE == ODM_IOT)
#define pr_debug(fmt, args...) RTW_PRINT_MSG(fmt, ## args) #define pr_debug(fmt, args...) RTW_PRINT_MSG(fmt, ## args)
@ -250,9 +248,6 @@ static __inline void PHYDM_DBG_F(PDM_ODM_T dm, int comp, char *fmt, ...)
do { \ do { \
struct dm_struct *__dm = (dm); \ struct dm_struct *__dm = (dm); \
if ((comp) & __dm->debug_components) { \ if ((comp) & __dm->debug_components) { \
RT_TRACE(((struct rtl_priv *)__dm->adapter),\
COMP_PHYDM, DBG_DMESG, \
"[PHYDM] " fmt, ##args); \
} \ } \
} while (0) } while (0)
@ -260,8 +255,6 @@ static __inline void PHYDM_DBG_F(PDM_ODM_T dm, int comp, char *fmt, ...)
do { \ do { \
struct dm_struct *__dm = (dm); \ struct dm_struct *__dm = (dm); \
if ((comp) & __dm->debug_components) { \ if ((comp) & __dm->debug_components) { \
RT_TRACE(((struct rtl_priv *)__dm->adapter),\
COMP_PHYDM, DBG_DMESG, fmt, ##args); \
} \ } \
} while (0) } while (0)
@ -269,9 +262,6 @@ static __inline void PHYDM_DBG_F(PDM_ODM_T dm, int comp, char *fmt, ...)
do { \ do { \
struct dm_struct *__dm = (dm); \ struct dm_struct *__dm = (dm); \
if ((comp) & __dm->debug_components) { \ if ((comp) & __dm->debug_components) { \
RT_TRACE(((struct rtl_priv *)__dm->adapter),\
COMP_PHYDM, DBG_DMESG, \
"[PHYDM] " title_str "%pM\n", addr);\
} \ } \
} while (0) } while (0)
#endif #endif
@ -379,9 +369,7 @@ static __inline void PDM_SNPF(u32 out_len, u32 used, char *buff, int len,
#elif (DM_ODM_SUPPORT_TYPE == ODM_CE) && defined(DM_ODM_CE_MAC80211_V2) #elif (DM_ODM_SUPPORT_TYPE == ODM_CE) && defined(DM_ODM_CE_MAC80211_V2)
#define PDM_VAST_SNPF(out_len, used, buff, len, fmt, args...) #define PDM_VAST_SNPF(out_len, used, buff, len, fmt, args...)
#else #else
#define PDM_VAST_SNPF(out_len, used, buff, len, fmt, args...) \ #define PDM_VAST_SNPF(out_len, used, buff, len, fmt, args...)
RT_TRACE(((struct rtl_priv *)dm->adapter), COMP_PHYDM, \
DBG_DMESG, fmt, ##args)
#endif #endif
#if (PHYDM_DBGPRINT == 1) #if (PHYDM_DBGPRINT == 1)

View File

@ -2315,7 +2315,6 @@ void phydm_dfs_ap_reset_radar_detect_counter_and_flag(void *dm_void)
odm_set_bb_reg(dm, R_0xa40, BIT(15), 0); odm_set_bb_reg(dm, R_0xa40, BIT(15), 0);
odm_set_bb_reg(dm, R_0xa40, BIT(15), 1); odm_set_bb_reg(dm, R_0xa40, BIT(15), 1);
/* RT_TRACE(COMP_DFS, DBG_LOUD, ("[DFS], After reset radar counter, 0xcf8 = 0x%x, 0xcf4 = 0x%x\n", */
/* PHY_QueryBBReg(Adapter, 0xcf8, bMaskDWord), */ /* PHY_QueryBBReg(Adapter, 0xcf8, bMaskDWord), */
/* PHY_QueryBBReg(Adapter, 0xcf4, bMaskDWord))); */ /* PHY_QueryBBReg(Adapter, 0xcf4, bMaskDWord))); */
} }

View File

@ -1023,7 +1023,6 @@ u8 phydm_c2H_content_parsing(void *dm_void, u8 c2h_cmd_id, u8 c2h_cmd_len,
#if (DM_ODM_SUPPORT_TYPE == ODM_WIN) #if (DM_ODM_SUPPORT_TYPE == ODM_WIN)
if (dm->support_ic_type & (ODM_RTL8812 | ODM_RTL8821)) { if (dm->support_ic_type & (ODM_RTL8812 | ODM_RTL8821)) {
RT_TRACE(COMP_MP, DBG_LOUD, ("== FW IQK Finish ==\n"));
odm_acquire_spin_lock(dm, RT_IQK_SPINLOCK); odm_acquire_spin_lock(dm, RT_IQK_SPINLOCK);
dm->rf_calibrate_info.is_iqk_in_progress = false; dm->rf_calibrate_info.is_iqk_in_progress = false;
odm_release_spin_lock(dm, RT_IQK_SPINLOCK); odm_release_spin_lock(dm, RT_IQK_SPINLOCK);

View File

@ -185,7 +185,6 @@ hal_txbf_8822b_download_ndpa(
platform_efio_write_1byte(adapter, REG_FWHW_TXQ_CTRL_8814A + 2, tmp_reg422 & (~BIT(6))); platform_efio_write_1byte(adapter, REG_FWHW_TXQ_CTRL_8814A + 2, tmp_reg422 & (~BIT(6)));
if (tmp_reg422 & BIT(6)) { if (tmp_reg422 & BIT(6)) {
RT_TRACE(COMP_INIT, DBG_LOUD, ("SetBeamformDownloadNDPA_8814A(): There is an adapter is sending beacon.\n"));
is_send_beacon = true; is_send_beacon = true;
} }