From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f54.google.com (mail-ej1-f54.google.com [209.85.218.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 587BE6F for ; Wed, 31 Mar 2021 09:40:27 +0000 (UTC) Received: by mail-ej1-f54.google.com with SMTP id kt15so29041754ejb.12 for ; Wed, 31 Mar 2021 02:40:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1JSwcAsIwTkETAiCAOu8+EdDrTOoO0FeFHKJwcZxxps=; b=GRDcimpRJSHDf0G311fTt0Vtbr7YMv/frMM5R2bBi2gyj5rVYiFqfDQ9CQxqAxrKm4 aMF4NSmlT11MF8GdLrjykOTqiW8yuNeLGus5IlLn0lRqcnqCYgI1unSKDPNY/f8Dta40 e63dnuO38CrDa6c3c2f5drnY90lY7ANpuCu1tfs0SCe/MQMro4Pflq0VZtWLWCR2XQ4w hb9us5ybt0MroaLpzblUzxOBr3FtG2uz0QDA/h6XwX/7zXPtFxEscBZd67VwdtiRKwYK I+g0qHJwVmAev5Tl5+3sNsxMJLTm5XATgF6CdcC02Gm9Y6GlCQg9RIcNRGM3TNXfxeCU +tdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1JSwcAsIwTkETAiCAOu8+EdDrTOoO0FeFHKJwcZxxps=; b=freJLvEi71UJ3GhMWK1KBxn+8G8M/afJ2Zwnvw2beVupxCGZ/39LZcDLmOw9RV5iFg fg3PcBiS8zR/hrKsebt0FuoYvDOQVmBXiQweYvAYmg5vgYd8vdyR61wOyo0x2/k5iozx 1aJ5ON8q6AECE0bwYy1vTbi+yNosHYymVNLyza2CwBtzTgH3laOOy6NVPuXUOX6lh/nS aFH/CMiHQD9HB8jVTHQzQ9lzZSrIqqPJcgZDTd1Q8VOwllD2j1lZ85MawBE43mcyT1um 7F1oi/LHcA4pFiL37WdUjS7zIjWC+uj0YPCOV7Al4oymEFw9ywv9qS4mNoB3ODYa9e6E QcXw== X-Gm-Message-State: AOAM533h8qoiDFGhbo1HJLXmmTEz294kuBrWUSSNAt2qY6gqDw3DAb8e g7zsZ1dypDHe/1EgAw6EFpM= X-Google-Smtp-Source: ABdhPJwTnIefI0WbrKvXHMTmDCfoZxtwXnqz1JZgoseZg36c8gtspX3PL/cxbWcKCnWilX/CPdO8OA== X-Received: by 2002:a17:907:9709:: with SMTP id jg9mr2499469ejc.276.1617183625947; Wed, 31 Mar 2021 02:40:25 -0700 (PDT) Received: from agape ([5.171.73.44]) by smtp.gmail.com with ESMTPSA id r17sm1156405edx.1.2021.03.31.02.40.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 Mar 2021 02:40:25 -0700 (PDT) From: Fabio Aiuto To: gregkh@linuxfoundation.org Cc: joe@perches.com, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Fabio Aiuto Subject: [PATCH 08/40] staging: rtl8723bs: replace RT_TRACE with public printk wrappers in core/rtw_mlme_ext.c Date: Wed, 31 Mar 2021 11:39:36 +0200 Message-Id: <39dc6c0c012c4fa37a75667505babb48682a26de.1617183374.git.fabioaiuto83@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: References: X-Mailing-List: linux-staging@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit replace private macro RT_TRACE for tracing with in-kernel pr_* printk wrappers Signed-off-by: Fabio Aiuto --- 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