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

Signed-off-by: Fabio Aiuto <[email protected]>
---
 drivers/staging/rtl8723bs/core/rtw_eeprom.c | 26 ++++++++++-----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/drivers/staging/rtl8723bs/core/rtw_eeprom.c 
b/drivers/staging/rtl8723bs/core/rtw_eeprom.c
index 3cbd65dee741..6176d741d60e 100644
--- a/drivers/staging/rtl8723bs/core/rtw_eeprom.c
+++ b/drivers/staging/rtl8723bs/core/rtw_eeprom.c
@@ -36,7 +36,7 @@ void shift_out_bits(_adapter *padapter, u16 data, u16 count)
 _func_enter_;
 
        if (padapter->bSurpriseRemoved == true) {
-               RT_TRACE(_module_rtl871x_eeprom_c_, _drv_err_, 
("padapter->bSurpriseRemoved==true"));
+               pr_err("%s padapter->bSurpriseRemoved==true", DRIVER_PREFIX);
                goto out;
        }
        mask = 0x01 << (count - 1);
@@ -49,8 +49,8 @@ _func_enter_;
                if (data & mask)
                        x |= _EEDI;
                if (padapter->bSurpriseRemoved == true) {
-               RT_TRACE(_module_rtl871x_eeprom_c_, _drv_err_, 
("padapter->bSurpriseRemoved==true"));
-               goto out;
+                       pr_err("%s padapter->bSurpriseRemoved==true", 
DRIVER_PREFIX);
+                       goto out;
                }
                rtw_write8(padapter, EE_9346CR, (u8)x);
                udelay(CLOCK_RATE);
@@ -59,7 +59,7 @@ _func_enter_;
                mask = mask >> 1;
        } while (mask);
        if (padapter->bSurpriseRemoved == true) {
-               RT_TRACE(_module_rtl871x_eeprom_c_, _drv_err_, 
("padapter->bSurpriseRemoved==true"));
+               pr_err("%s padapter->bSurpriseRemoved==true", DRIVER_PREFIX);
                goto out;
        }
        x &= ~_EEDI;
@@ -73,7 +73,7 @@ u16 shift_in_bits(_adapter *padapter)
        u16 x, d = 0, i;
 _func_enter_;
        if (padapter->bSurpriseRemoved == true) {
-               RT_TRACE(_module_rtl871x_eeprom_c_, _drv_err_, 
("padapter->bSurpriseRemoved==true"));
+               pr_err("%s padapter->bSurpriseRemoved==true", DRIVER_PREFIX);
                goto out;
        }
        x = rtw_read8(padapter, EE_9346CR);
@@ -85,7 +85,7 @@ _func_enter_;
                d = d << 1;
                up_clk(padapter, &x);
        if (padapter->bSurpriseRemoved == true) {
-               RT_TRACE(_module_rtl871x_eeprom_c_, _drv_err_, 
("padapter->bSurpriseRemoved==true"));
+               pr_err("%s padapter->bSurpriseRemoved==true", DRIVER_PREFIX);
                goto out;
        }
                x = rtw_read8(padapter, EE_9346CR);
@@ -123,23 +123,23 @@ void eeprom_clean(_adapter *padapter)
        u16 x;
 _func_enter_;
        if (padapter->bSurpriseRemoved == true) {
-               RT_TRACE(_module_rtl871x_eeprom_c_, _drv_err_, 
("padapter->bSurpriseRemoved==true"));
+               pr_err("%s padapter->bSurpriseRemoved==true", DRIVER_PREFIX);
                goto out;
        }
        x = rtw_read8(padapter, EE_9346CR);
        if (padapter->bSurpriseRemoved == true) {
-               RT_TRACE(_module_rtl871x_eeprom_c_, _drv_err_, 
("padapter->bSurpriseRemoved==true"));
+               pr_err("%s padapter->bSurpriseRemoved==true", DRIVER_PREFIX);
                goto out;
        }
        x &= ~(_EECS | _EEDI);
        rtw_write8(padapter, EE_9346CR, (u8)x);
        if (padapter->bSurpriseRemoved == true) {
-               RT_TRACE(_module_rtl871x_eeprom_c_, _drv_err_, 
("padapter->bSurpriseRemoved==true"));
+               pr_err("%s padapter->bSurpriseRemoved==true", DRIVER_PREFIX);
                goto out;
        }
        up_clk(padapter, &x);
-               if (padapter->bSurpriseRemoved == true) {
-               RT_TRACE(_module_rtl871x_eeprom_c_, _drv_err_, 
("padapter->bSurpriseRemoved==true"));
+       if (padapter->bSurpriseRemoved == true) {
+               pr_err("%s padapter->bSurpriseRemoved==true", DRIVER_PREFIX);
                goto out;
        }
        down_clk(padapter, &x);
@@ -156,14 +156,14 @@ u16 eeprom_read16(_adapter *padapter, u16 reg) 
/*ReadEEprom*/
 _func_enter_;
 
        if (padapter->bSurpriseRemoved == true) {
-               RT_TRACE(_module_rtl871x_eeprom_c_, _drv_err_, 
("padapter->bSurpriseRemoved==true"));
+               pr_err("%s padapter->bSurpriseRemoved==true", DRIVER_PREFIX);
                goto out;
        }
        /* select EEPROM, reset bits, set _EECS*/
        x = rtw_read8(padapter, EE_9346CR);
 
        if (padapter->bSurpriseRemoved == true) {
-               RT_TRACE(_module_rtl871x_eeprom_c_, _drv_err_, 
("padapter->bSurpriseRemoved==true"));
+               pr_err("%s padapter->bSurpriseRemoved==true", DRIVER_PREFIX);
                goto out;
        }
 
-- 
2.20.1

Reply via email to