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

Signed-off-by: Fabio Aiuto <fabioaiut...@gmail.com>
---
 drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c 
b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
index b6be1423ef75..e99c6f72cff6 100644
--- a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
+++ b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
@@ -160,7 +160,7 @@ static void sdio_deinit(struct dvobj_priv *dvobj)
        int err;
 
 
-       RT_TRACE(_module_hci_intfs_c_, _drv_notice_, ("+sdio_deinit\n"));
+       pr_notice("%s+%s\n", DRIVER_PREFIX, __func__);
 
        func = dvobj->intf_data.func;
 
@@ -201,7 +201,7 @@ static struct dvobj_priv *sdio_dvobj_init(struct sdio_func 
*func)
        psdio->func = func;
 
        if (sdio_init(dvobj) != _SUCCESS) {
-               RT_TRACE(_module_hci_intfs_c_, _drv_err_, ("%s: initialize SDIO 
Failed!\n", __func__));
+               pr_err("%s %s: initialize SDIO Failed!\n", DRIVER_PREFIX, 
__func__);
                goto free_dvobj;
        }
        rtw_reset_continual_io_error(dvobj);
@@ -306,8 +306,7 @@ static struct adapter *rtw_sdio_if1_init(struct dvobj_priv 
*dvobj, const struct
        padapter->intf_free_irq = &sdio_free_irq;
 
        if (rtw_init_io_priv(padapter, sdio_set_intf_ops) == _FAIL) {
-               RT_TRACE(_module_hci_intfs_c_, _drv_err_,
-                       ("rtw_drv_init: Can't init io_priv\n"));
+               pr_err("%s rtw_drv_init: Can't init io_priv\n", DRIVER_PREFIX);
                goto free_hal_data;
        }
 
@@ -322,8 +321,8 @@ static struct adapter *rtw_sdio_if1_init(struct dvobj_priv 
*dvobj, const struct
 
        /* 3 7. init driver common data */
        if (rtw_init_drv_sw(padapter) == _FAIL) {
-               RT_TRACE(_module_hci_intfs_c_, _drv_err_,
-                        ("rtw_drv_init: Initialize driver software resource 
Failed!\n"));
+               pr_err("%s rtw_drv_init: Initialize driver software resource 
Failed!\n",
+                      DRIVER_PREFIX);
                goto free_hal_data;
        }
 
@@ -406,7 +405,7 @@ static int rtw_drv_init(
 
        dvobj = sdio_dvobj_init(func);
        if (dvobj == NULL) {
-               RT_TRACE(_module_hci_intfs_c_, _drv_err_, ("initialize device 
object priv Failed!\n"));
+               pr_err("%s initialize device object priv Failed!\n", 
DRIVER_PREFIX);
                goto exit;
        }
 
@@ -424,7 +423,7 @@ static int rtw_drv_init(
        if (sdio_alloc_irq(dvobj) != _SUCCESS)
                goto free_if2;
 
-       RT_TRACE(_module_hci_intfs_c_, _drv_err_, ("-871x_drv - drv_init, 
success!\n"));
+       pr_err("%s-871x_drv - drv_init, success!\n", DRIVER_PREFIX);
 
        rtw_ndev_notifier_register();
        status = _SUCCESS;
@@ -447,7 +446,7 @@ static void rtw_dev_remove(struct sdio_func *func)
        struct dvobj_priv *dvobj = sdio_get_drvdata(func);
        struct adapter *padapter = dvobj->if1;
 
-       RT_TRACE(_module_hci_intfs_c_, _drv_notice_, ("+rtw_dev_remove\n"));
+       pr_notice("%s+%s\n", DRIVER_PREFIX, __func__);
 
        dvobj->processing_dev_remove = true;
 
@@ -479,7 +478,7 @@ static void rtw_dev_remove(struct sdio_func *func)
 
        sdio_dvobj_deinit(func);
 
-       RT_TRACE(_module_hci_intfs_c_, _drv_notice_, ("-rtw_dev_remove\n"));
+       pr_notice("%s - %s\n", DRIVER_PREFIX, __func__);
 }
 
 static int rtw_sdio_suspend(struct device *dev)
-- 
2.20.1

Reply via email to