replace private macro RT_TRACE for tracing with in-kernel pr_* printk wrappers Signed-off-by: Fabio Aiuto <fabioaiuto83@xxxxxxxxx> --- .../staging/rtl8723bs/hal/rtl8723bs_xmit.c | 42 ++++++------------- 1 file changed, 13 insertions(+), 29 deletions(-) diff --git a/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c b/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c index 597cf3a88c51..ad27ba1592ed 100644 --- a/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c +++ b/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c @@ -102,11 +102,8 @@ static s32 rtl8723_dequeue_writeport(struct adapter *padapter) (padapter->bSurpriseRemoved) || (padapter->bDriverStopped) ) { - RT_TRACE( - _module_hal_xmit_c_, - _drv_notice_, - ("%s: bSurpriseRemoved(write port)\n", __func__) - ); + pr_notice("%s %s: bSurpriseRemoved(write port)\n", + DRIVER_PREFIX, __func__); goto free_xmitbuf; } @@ -151,16 +148,9 @@ s32 rtl8723bs_xmit_buf_handler(struct adapter *padapter) ret = (padapter->bDriverStopped) || (padapter->bSurpriseRemoved); if (ret) { - RT_TRACE( - _module_hal_xmit_c_, - _drv_err_, - ( - "%s: bDriverStopped(%d) bSurpriseRemoved(%d)!\n", - __func__, - padapter->bDriverStopped, - padapter->bSurpriseRemoved - ) - ); + pr_err("%s %s: bDriverStopped(%d) bSurpriseRemoved(%d)!\n", + DRIVER_PREFIX, __func__, padapter->bDriverStopped, + padapter->bSurpriseRemoved); return _FAIL; } @@ -374,7 +364,8 @@ static s32 xmit_xmitframes(struct adapter *padapter, struct xmit_priv *pxmitpriv /* dump xmit_buf to hw tx fifo */ if (pxmitbuf) { - RT_TRACE(_module_hal_xmit_c_, _drv_info_, ("pxmitbuf->len =%d enqueue\n", pxmitbuf->len)); + pr_info("%s pxmitbuf->len =%d enqueue\n", + DRIVER_PREFIX, pxmitbuf->len); if (pxmitbuf->len > 0) { struct xmit_frame *pframe; @@ -424,16 +415,9 @@ static s32 rtl8723bs_xmit_handler(struct adapter *padapter) (padapter->bDriverStopped) || (padapter->bSurpriseRemoved) ) { - RT_TRACE( - _module_hal_xmit_c_, - _drv_notice_, - ( - "%s: bDriverStopped(%d) bSurpriseRemoved(%d)\n", - __func__, - padapter->bDriverStopped, - padapter->bSurpriseRemoved - ) - ); + pr_notice("%s %s: bDriverStopped(%d) bSurpriseRemoved(%d)\n", + DRIVER_PREFIX, __func__, padapter->bDriverStopped, + padapter->bSurpriseRemoved); return _FAIL; } @@ -492,7 +476,7 @@ int rtl8723bs_xmit_thread(void *context) complete(&pxmitpriv->SdioXmitTerminate); - RT_TRACE(_module_hal_xmit_c_, _drv_notice_, ("-%s\n", __func__)); + pr_notice("%s-%s\n", DRIVER_PREFIX, __func__); thread_exit(); } @@ -509,7 +493,7 @@ s32 rtl8723bs_mgnt_xmit( u8 *pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; u8 txdesc_size = TXDESC_SIZE; - RT_TRACE(_module_hal_xmit_c_, _drv_info_, ("+%s\n", __func__)); + pr_info("%s+%s\n", DRIVER_PREFIX, __func__); pattrib = &pmgntframe->attrib; pxmitbuf = pmgntframe->pxmitbuf; @@ -572,7 +556,7 @@ s32 rtl8723bs_hal_xmit( err = rtw_xmitframe_enqueue(padapter, pxmitframe); spin_unlock_bh(&pxmitpriv->lock); if (err != _SUCCESS) { - RT_TRACE(_module_hal_xmit_c_, _drv_err_, ("rtl8723bs_hal_xmit: enqueue xmitframe fail\n")); + pr_err("%s %s: enqueue xmitframe fail\n", DRIVER_PREFIX, __func__); rtw_free_xmitframe(pxmitpriv, pxmitframe); pxmitpriv->tx_drop++; -- 2.20.1