replace private macro RT_TRACE for tracing with in-kernel
pr_* printk wrappers

Signed-off-by: Fabio Aiuto <fabioaiut...@gmail.com>
---
 drivers/staging/rtl8723bs/hal/HalPwrSeqCmd.c | 61 +++++---------------
 1 file changed, 16 insertions(+), 45 deletions(-)

diff --git a/drivers/staging/rtl8723bs/hal/HalPwrSeqCmd.c 
b/drivers/staging/rtl8723bs/hal/HalPwrSeqCmd.c
index 932b31fda6ad..9abe37bf318f 100644
--- a/drivers/staging/rtl8723bs/hal/HalPwrSeqCmd.c
+++ b/drivers/staging/rtl8723bs/hal/HalPwrSeqCmd.c
@@ -53,21 +53,16 @@ u8 HalPwrSeqCmdParsing(
        do {
                PwrCfgCmd = PwrSeqCmd[AryIdx];
 
-               RT_TRACE(
-                       _module_hal_init_c_,
-                       _drv_info_,
-                       (
-                               "HalPwrSeqCmdParsing: offset(%#x) cut_msk(%#x) 
fab_msk(%#x) interface_msk(%#x) base(%#x) cmd(%#x) msk(%#x) value(%#x)\n",
-                               GET_PWR_CFG_OFFSET(PwrCfgCmd),
-                               GET_PWR_CFG_CUT_MASK(PwrCfgCmd),
-                               GET_PWR_CFG_FAB_MASK(PwrCfgCmd),
-                               GET_PWR_CFG_INTF_MASK(PwrCfgCmd),
-                               GET_PWR_CFG_BASE(PwrCfgCmd),
-                               GET_PWR_CFG_CMD(PwrCfgCmd),
-                               GET_PWR_CFG_MASK(PwrCfgCmd),
-                               GET_PWR_CFG_VALUE(PwrCfgCmd)
-                       )
-               );
+               pr_info("%s %s: offset(%#x) cut_msk(%#x) fab_msk(%#x) 
interface_msk(%#x) base(%#x) cmd(%#x) msk(%#x) value(%#x)\n",
+                       DRIVER_PREFIX, __func__,
+                       GET_PWR_CFG_OFFSET(PwrCfgCmd),
+                       GET_PWR_CFG_CUT_MASK(PwrCfgCmd),
+                       GET_PWR_CFG_FAB_MASK(PwrCfgCmd),
+                       GET_PWR_CFG_INTF_MASK(PwrCfgCmd),
+                       GET_PWR_CFG_BASE(PwrCfgCmd),
+                       GET_PWR_CFG_CMD(PwrCfgCmd),
+                       GET_PWR_CFG_MASK(PwrCfgCmd),
+                       GET_PWR_CFG_VALUE(PwrCfgCmd));
 
                /* 2 Only Handle the command whose FAB, CUT, and Interface are 
matched */
                if (
@@ -77,19 +72,11 @@ u8 HalPwrSeqCmdParsing(
                ) {
                        switch (GET_PWR_CFG_CMD(PwrCfgCmd)) {
                        case PWR_CMD_READ:
-                               RT_TRACE(
-                                       _module_hal_init_c_,
-                                       _drv_info_,
-                                       ("HalPwrSeqCmdParsing: PWR_CMD_READ\n")
-                               );
+                               pr_info("%s %s: PWR_CMD_READ\n", DRIVER_PREFIX, 
__func__);
                                break;
 
                        case PWR_CMD_WRITE:
-                               RT_TRACE(
-                                       _module_hal_init_c_,
-                                       _drv_info_,
-                                       ("HalPwrSeqCmdParsing: PWR_CMD_WRITE\n")
-                               );
+                               pr_info("%s %s: PWR_CMD_WRITE\n", 
DRIVER_PREFIX, __func__);
                                offset = GET_PWR_CFG_OFFSET(PwrCfgCmd);
 
                                /*  */
@@ -124,11 +111,7 @@ u8 HalPwrSeqCmdParsing(
                                break;
 
                        case PWR_CMD_POLLING:
-                               RT_TRACE(
-                                       _module_hal_init_c_,
-                                       _drv_info_,
-                                       ("HalPwrSeqCmdParsing: 
PWR_CMD_POLLING\n")
-                               );
+                               pr_info("%s %s: PWR_CMD_POLLING\n", 
DRIVER_PREFIX, __func__);
 
                                bPollingBit = false;
                                offset = GET_PWR_CFG_OFFSET(PwrCfgCmd);
@@ -160,11 +143,7 @@ u8 HalPwrSeqCmdParsing(
                                break;
 
                        case PWR_CMD_DELAY:
-                               RT_TRACE(
-                                       _module_hal_init_c_,
-                                       _drv_info_,
-                                       ("HalPwrSeqCmdParsing: PWR_CMD_DELAY\n")
-                               );
+                               pr_info("%s %s: PWR_CMD_DELAY\n", 
DRIVER_PREFIX, __func__);
                                if (GET_PWR_CFG_VALUE(PwrCfgCmd) == 
PWRSEQ_DELAY_US)
                                        udelay(GET_PWR_CFG_OFFSET(PwrCfgCmd));
                                else
@@ -173,19 +152,11 @@ u8 HalPwrSeqCmdParsing(
 
                        case PWR_CMD_END:
                                /*  When this command is parsed, end the 
process */
-                               RT_TRACE(
-                                       _module_hal_init_c_,
-                                       _drv_info_,
-                                       ("HalPwrSeqCmdParsing: PWR_CMD_END\n")
-                               );
+                               pr_info("%s %s: PWR_CMD_END\n", DRIVER_PREFIX, 
__func__);
                                return true;
 
                        default:
-                               RT_TRACE(
-                                       _module_hal_init_c_,
-                                       _drv_err_,
-                                       ("HalPwrSeqCmdParsing: Unknown CMD!!\n")
-                               );
+                               pr_err("%s %s: Unknown CMD!!\n", DRIVER_PREFIX, 
__func__);
                                break;
                        }
                }
-- 
2.20.1

Reply via email to