[PATCH 21/40] staging: rtl8723bs: replace RT_TRACE with public printk wrappers in hal/sdio_ops.c

[Fabio Aiuto]

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/sdio_ops.c | 42 ++++++++----------------
 1 file changed, 13 insertions(+), 29 deletions(-)

diff --git a/drivers/staging/rtl8723bs/hal/sdio_ops.c 
b/drivers/staging/rtl8723bs/hal/sdio_ops.c
index a24a39e70454..34531d6a6810 100644
--- a/drivers/staging/rtl8723bs/hal/sdio_ops.c
+++ b/drivers/staging/rtl8723bs/hal/sdio_ops.c
@@ -777,29 +777,15 @@ void EnableInterrupt8723BSdio(struct adapter *adapter)
        himr = cpu_to_le32(haldata->sdio_himr);
        sdio_local_write(adapter, SDIO_REG_HIMR, 4, (u8 *)&himr);
 
-       RT_TRACE(
-               _module_hci_ops_c_,
-               _drv_notice_,
-               (
-                       "%s: enable SDIO HIMR = 0x%08X\n",
-                       __func__,
-                       haldata->sdio_himr
-               )
-       );
+       pr_notice("%s %s: enable SDIO HIMR = 0x%08X\n",
+                 DRIVER_PREFIX, __func__, haldata->sdio_himr);
 
        /*  Update current system IMR settings */
        tmp = rtw_read32(adapter, REG_HSIMR);
        rtw_write32(adapter, REG_HSIMR, tmp | haldata->SysIntrMask);
 
-       RT_TRACE(
-               _module_hci_ops_c_,
-               _drv_notice_,
-               (
-                       "%s: enable HSIMR = 0x%08X\n",
-                       __func__,
-                       haldata->SysIntrMask
-               )
-       );
+       pr_notice("%s %s: enable HSIMR = 0x%08X\n",
+                 DRIVER_PREFIX, __func__, haldata->SysIntrMask);
 
        /*  */
        /*  <Roger_Notes> There are some C2H CMDs have been sent before system 
interrupt is enabled, e.g., C2H, CPWM. */
@@ -894,7 +880,7 @@ static struct recv_buf *sd_recv_rxfifo(struct adapter 
*adapter, u32 size)
        readbuf = recvbuf->pskb->data;
        ret = sdio_read_port(&adapter->iopriv.intf, WLAN_RX0FF_DEVICE_ID, 
readsize, readbuf);
        if (ret == _FAIL) {
-               RT_TRACE(_module_hci_ops_os_c_, _drv_err_, ("%s: read port 
FAIL!\n", __func__));
+               pr_err("%s %s: read port FAIL!\n", DRIVER_PREFIX, __func__);
                return NULL;
        }
 
@@ -1062,9 +1048,8 @@ void sd_int_hdl(struct adapter *adapter)
 
                sd_int_dpc(adapter);
        } else {
-               RT_TRACE(_module_hci_ops_c_, _drv_err_,
-                               ("%s: HISR(0x%08x) and HIMR(0x%08x) not 
match!\n",
-                               __func__, hal->sdio_hisr, hal->sdio_himr));
+               pr_err("%s %s: HISR(0x%08x) and HIMR(0x%08x) not match!\n",
+                      DRIVER_PREFIX, __func__, hal->sdio_hisr, hal->sdio_himr);
        }
 }
 
@@ -1088,13 +1073,12 @@ u8 HalQueryTxBufferStatus8723BSdio(struct adapter 
*adapter)
        numof_free_page = SdioLocalCmd53Read4Byte(adapter, SDIO_REG_FREE_TXPG);
 
        memcpy(hal->SdioTxFIFOFreePage, &numof_free_page, 4);
-       RT_TRACE(_module_hci_ops_c_, _drv_notice_,
-                       ("%s: Free page for HIQ(%#x), MIDQ(%#x), LOWQ(%#x), 
PUBQ(%#x)\n",
-                       __func__,
-                       hal->SdioTxFIFOFreePage[HI_QUEUE_IDX],
-                       hal->SdioTxFIFOFreePage[MID_QUEUE_IDX],
-                       hal->SdioTxFIFOFreePage[LOW_QUEUE_IDX],
-                       hal->SdioTxFIFOFreePage[PUBLIC_QUEUE_IDX]));
+       pr_notice("%s %s: Free page for HIQ(%#x), MIDQ(%#x), LOWQ(%#x), 
PUBQ(%#x)\n",
+                 DRIVER_PREFIX, __func__,
+                 hal->SdioTxFIFOFreePage[HI_QUEUE_IDX],
+                 hal->SdioTxFIFOFreePage[MID_QUEUE_IDX],
+                 hal->SdioTxFIFOFreePage[LOW_QUEUE_IDX],
+                 hal->SdioTxFIFOFreePage[PUBLIC_QUEUE_IDX]);
 
        return true;
 }
-- 
2.20.1