replace private macro RT_TRACE for tracing with in-kernel
pr_* printk wrappers
Signed-off-by: Fabio Aiuto <fabioaiut...@gmail.com>
---
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 39 ++++++++++---------
1 file changed, 20 insertions(+), 19 deletions(-)
diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
index 8aadcf72a7ba..9ed216c58fa0 100644
--- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
@@ -526,12 +526,12 @@ void mgt_dispatcher(struct adapter *padapter, union
recv_frame *precv_frame)
struct dvobj_priv *psdpriv = padapter->dvobj;
struct debug_priv *pdbgpriv = &psdpriv->drv_dbg;
- RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_,
- ("+mgt_dispatcher: type(0x%x) subtype(0x%x)\n",
- GetFrameType(pframe), GetFrameSubType(pframe)));
+ pr_info("%s+%s: type(0x%x) subtype(0x%x)\n", DRIVER_PREFIX, __func__,
+ GetFrameType(pframe), GetFrameSubType(pframe));
if (GetFrameType(pframe) != WIFI_MGT_TYPE) {
- RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("mgt_dispatcher:
type(0x%x) error!\n", GetFrameType(pframe)));
+ pr_err("%s %s: type(0x%x) error!\n", DRIVER_PREFIX, __func__,
+ GetFrameType(pframe));
return;
}
@@ -546,7 +546,8 @@ void mgt_dispatcher(struct adapter *padapter, union
recv_frame *precv_frame)
index = GetFrameSubType(pframe) >> 4;
if (index >= ARRAY_SIZE(mlme_sta_tbl)) {
- RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("Currently we do
not support reserved sub-fr-type =%d\n", index));
+ pr_err("%s Currently we do not support reserved sub-fr-type
=%d\n",
+ DRIVER_PREFIX, index);
return;
}
ptable += index;
@@ -2675,7 +2676,7 @@ static int _issue_probereq(struct adapter *padapter,
int bssrate_len = 0;
u8 bc_addr[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
- RT_TRACE(_module_rtl871x_mlme_c_, _drv_notice_, ("+issue_probereq\n"));
+ pr_notice("%s+%s\n", DRIVER_PREFIX, __func__);
pmgntframe = alloc_mgtxmitframe(pxmitpriv);
if (!pmgntframe)
@@ -2743,7 +2744,8 @@ static int _issue_probereq(struct adapter *padapter,
pattrib->last_txcmdsz = pattrib->pktlen;
- RT_TRACE(_module_rtl871x_mlme_c_, _drv_notice_, ("issuing probe_req,
tx_len =%d\n", pattrib->last_txcmdsz));
+ pr_notice("%s issuing probe_req, tx_len =%d\n",
+ DRIVER_PREFIX, pattrib->last_txcmdsz);
if (wait_ack) {
ret = dump_mgntframe_and_wait_ack(padapter, pmgntframe);
@@ -4441,7 +4443,7 @@ void start_create_ibss(struct adapter *padapter)
/* issue beacon */
if (send_beacon(padapter) == _FAIL) {
- RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("issuing
beacon frame fail....\n"));
+ pr_err("%s issuing beacon frame fail....\n",
DRIVER_PREFIX);
report_join_res(padapter, -1);
pmlmeinfo->state = WIFI_FW_NULL_STATE;
@@ -4622,8 +4624,8 @@ static void process_80211d(struct adapter *padapter,
struct wlan_bssid_ex *bssid
memset(country, 0, 4);
memcpy(country, p, 3);
p += 3;
- RT_TRACE(_module_rtl871x_mlme_c_, _drv_notice_,
- ("%s: 802.11d country =%s\n", __func__,
country));
+ pr_notice("%s %s: 802.11d country =%s\n", DRIVER_PREFIX,
+ __func__, country);
i = 0;
while ((ie - p) >= 3) {
@@ -4813,9 +4815,8 @@ static void process_80211d(struct adapter *padapter,
struct wlan_bssid_ex *bssid
break;
chplan_new[i].ScanType = SCAN_ACTIVE;
- RT_TRACE(_module_rtl871x_mlme_c_, _drv_notice_,
- ("%s: change channel %d scan
type from passive to active\n",
- __func__, channel));
+ pr_notice("%s %s: change channel %d scan type
from passive to active\n",
+ DRIVER_PREFIX, __func__, channel);
}
break;
}
@@ -6332,9 +6333,9 @@ u8 mlme_evt_hdl(struct adapter *padapter, unsigned char
*pbuf)
#ifdef CHECK_EVENT_SEQ
/* checking event sequence... */
if (evt_seq != (atomic_read(&pevt_priv->event_seq) & 0x7f)) {
- RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_,
- ("Event Seq Error! %d vs %d\n", (evt_seq & 0x7f),
- (atomic_read(&pevt_priv->event_seq) & 0x7f)));
+ pr_info("%s Event Seq Error! %d vs %d\n",
+ DRIVER_PREFIX, (evt_seq & 0x7f),
+ (atomic_read(&pevt_priv->event_seq) & 0x7f));
pevt_priv->event_seq = (evt_seq+1)&0x7f;
@@ -6344,7 +6345,7 @@ u8 mlme_evt_hdl(struct adapter *padapter, unsigned char
*pbuf)
/* checking if event code is valid */
if (evt_code >= MAX_C2HEVT) {
- RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_, ("\nEvent Code(%d)
mismatch!\n", evt_code));
+ pr_err("%s Event Code(%d) mismatch!\n", DRIVER_PREFIX,
evt_code);
goto _abort_event_;
}
@@ -6352,8 +6353,8 @@ u8 mlme_evt_hdl(struct adapter *padapter, unsigned char
*pbuf)
if ((wlanevents[evt_code].parmsize != 0) &&
(wlanevents[evt_code].parmsize != evt_sz)) {
- RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_, ("\nEvent(%d) Parm
Size mismatch (%d vs %d)!\n",
- evt_code, wlanevents[evt_code].parmsize, evt_sz));
+ pr_err("%s Event(%d) Parm Size mismatch (%d vs %d)!\n",
+ DRIVER_PREFIX, evt_code, wlanevents[evt_code].parmsize,
evt_sz);
goto _abort_event_;
}
--
2.20.1
