From: Fabio Aiuto <fabioaiuto83@gmail.com>
To: gregkh@linuxfoundation.org
Cc: joe@perches.com, linux-staging@lists.linux.dev,
linux-kernel@vger.kernel.org,
Fabio Aiuto <fabioaiuto83@gmail.com>
Subject: [PATCH 04/40] staging: rtl8723bs: replace RT_TRACE with public printk wrappers in core/rtw_pwrctrl.c
Date: Wed, 31 Mar 2021 11:39:32 +0200 [thread overview]
Message-ID: <e452bbaa8b6af6c0e48f90f4e73052768dbe9845.1617183374.git.fabioaiuto83@gmail.com> (raw)
In-Reply-To: <cover.1617183374.git.fabioaiuto83@gmail.com>
replace private macro RT_TRACE for tracing with in-kernel
pr_* printk wrappers
Signed-off-by: Fabio Aiuto <fabioaiuto83@gmail.com>
---
drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 62 +++++++++-----------
1 file changed, 27 insertions(+), 35 deletions(-)
diff --git a/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c b/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c
index 8bf80e6f4a11..da967e819fcf 100644
--- a/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c
+++ b/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c
@@ -268,16 +268,16 @@ void rtw_set_rpwm(struct adapter *padapter, u8 pslv)
} else {
if ((pwrpriv->rpwm == pslv)
|| ((pwrpriv->rpwm >= PS_STATE_S2) && (pslv >= PS_STATE_S2))) {
- RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_err_,
- ("%s: Already set rpwm[0x%02X], new = 0x%02X!\n", __func__, pwrpriv->rpwm, pslv));
+ pr_err("%s %s: Already set rpwm[0x%02X], new = 0x%02X!\n",
+ DRIVER_PREFIX, __func__, pwrpriv->rpwm, pslv);
return;
}
}
if ((padapter->bSurpriseRemoved) || !(padapter->hw_init_completed)) {
- RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_err_,
- ("%s: SurpriseRemoved(%d) hw_init_completed(%d)\n",
- __func__, padapter->bSurpriseRemoved, padapter->hw_init_completed));
+ pr_err("%s %s: SurpriseRemoved(%d) hw_init_completed(%d)\n",
+ DRIVER_PREFIX, __func__, padapter->bSurpriseRemoved,
+ padapter->hw_init_completed);
pwrpriv->cpwm = PS_STATE_S4;
@@ -285,12 +285,12 @@ void rtw_set_rpwm(struct adapter *padapter, u8 pslv)
}
if (padapter->bDriverStopped) {
- RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_err_,
- ("%s: change power state(0x%02X) when DriverStopped\n", __func__, pslv));
+ pr_err("%s %s: change power state(0x%02X) when DriverStopped\n",
+ DRIVER_PREFIX, __func__, pslv);
if (pslv < PS_STATE_S2) {
- RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_err_,
- ("%s: Reject to enter PS_STATE(0x%02X) lower than S2 when DriverStopped!!\n", __func__, pslv));
+ pr_err("%s %s: Reject to enter PS_STATE(0x%02X) lower than S2 when DriverStopped!!\n",
+ DRIVER_PREFIX, __func__, pslv);
return;
}
}
@@ -299,8 +299,8 @@ void rtw_set_rpwm(struct adapter *padapter, u8 pslv)
/* only when from PS_STATE S0/S1 to S2 and higher needs ACK */
if ((pwrpriv->cpwm < PS_STATE_S2) && (pslv >= PS_STATE_S2))
rpwm |= PS_ACK;
- RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_notice_,
- ("rtw_set_rpwm: rpwm = 0x%02x cpwm = 0x%02x\n", rpwm, pwrpriv->cpwm));
+ pr_notice("%s %s: rpwm = 0x%02x cpwm = 0x%02x\n", DRIVER_PREFIX,
+ __func__, rpwm, pwrpriv->cpwm);
pwrpriv->rpwm = pslv;
@@ -382,12 +382,11 @@ void rtw_set_ps_mode(struct adapter *padapter, u8 ps_mode, u8 smart_ps, u8 bcn_a
{
struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter);
- RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_notice_,
- ("%s: PowerMode =%d Smart_PS =%d\n",
- __func__, ps_mode, smart_ps));
+ pr_notice("%s %s: PowerMode =%d Smart_PS =%d\n", DRIVER_PREFIX,
+ __func__, ps_mode, smart_ps);
if (ps_mode > PM_Card_Disable) {
- RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_err_, ("ps_mode:%d error\n", ps_mode));
+ pr_err("%s ps_mode:%d error\n", DRIVER_PREFIX, ps_mode);
return;
}
@@ -701,8 +700,7 @@ void cpwm_int_hdl(struct adapter *padapter, struct reportpwrstate_parm *preportp
exit:
mutex_unlock(&pwrpriv->lock);
- RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_notice_,
- ("cpwm_int_hdl: cpwm = 0x%02x\n", pwrpriv->cpwm));
+ pr_notice("%s %s: cpwm = 0x%02x\n", DRIVER_PREFIX, __func__, pwrpriv->cpwm);
}
static void cpwm_event_callback(struct work_struct *work)
@@ -817,9 +815,8 @@ s32 rtw_register_task_alive(struct adapter *padapter, u32 task)
register_task_alive(pwrctrl, task);
if (pwrctrl->bFwCurrentInPSMode) {
- RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_notice_,
- ("%s: task = 0x%x cpwm = 0x%02x alives = 0x%08x\n",
- __func__, task, pwrctrl->cpwm, pwrctrl->alives));
+ pr_notice("%s %s: task = 0x%x cpwm = 0x%02x alives = 0x%08x\n",
+ DRIVER_PREFIX, __func__, task, pwrctrl->cpwm, pwrctrl->alives);
if (pwrctrl->cpwm < pslv) {
if (pwrctrl->cpwm < PS_STATE_S2)
@@ -869,9 +866,8 @@ void rtw_unregister_task_alive(struct adapter *padapter, u32 task)
unregister_task_alive(pwrctrl, task);
if ((pwrctrl->pwr_mode != PS_MODE_ACTIVE) && pwrctrl->bFwCurrentInPSMode) {
- RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_notice_,
- ("%s: cpwm = 0x%02x alives = 0x%08x\n",
- __func__, pwrctrl->cpwm, pwrctrl->alives));
+ pr_notice("%s %s: cpwm = 0x%02x alives = 0x%08x\n", DRIVER_PREFIX,
+ __func__, pwrctrl->cpwm, pwrctrl->alives);
if (pwrctrl->cpwm > pslv)
if ((pslv >= PS_STATE_S2) || (pwrctrl->alives == 0))
@@ -910,9 +906,8 @@ s32 rtw_register_tx_alive(struct adapter *padapter)
register_task_alive(pwrctrl, XMIT_ALIVE);
if (pwrctrl->bFwCurrentInPSMode) {
- RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_notice_,
- ("rtw_register_tx_alive: cpwm = 0x%02x alives = 0x%08x\n",
- pwrctrl->cpwm, pwrctrl->alives));
+ pr_notice("%s %s: cpwm = 0x%02x alives = 0x%08x\n",
+ DRIVER_PREFIX, __func__, pwrctrl->cpwm, pwrctrl->alives);
if (pwrctrl->cpwm < pslv) {
if (pwrctrl->cpwm < PS_STATE_S2)
@@ -959,9 +954,8 @@ s32 rtw_register_cmd_alive(struct adapter *padapter)
register_task_alive(pwrctrl, CMD_ALIVE);
if (pwrctrl->bFwCurrentInPSMode) {
- RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_info_,
- ("rtw_register_cmd_alive: cpwm = 0x%02x alives = 0x%08x\n",
- pwrctrl->cpwm, pwrctrl->alives));
+ pr_info("%s %s: cpwm = 0x%02x alives = 0x%08x\n",
+ DRIVER_PREFIX, __func__, pwrctrl->cpwm, pwrctrl->alives);
if (pwrctrl->cpwm < pslv) {
if (pwrctrl->cpwm < PS_STATE_S2)
@@ -1008,9 +1002,8 @@ void rtw_unregister_tx_alive(struct adapter *padapter)
unregister_task_alive(pwrctrl, XMIT_ALIVE);
if ((pwrctrl->pwr_mode != PS_MODE_ACTIVE) && pwrctrl->bFwCurrentInPSMode) {
- RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_notice_,
- ("%s: cpwm = 0x%02x alives = 0x%08x\n",
- __func__, pwrctrl->cpwm, pwrctrl->alives));
+ pr_notice("%s %s: cpwm = 0x%02x alives = 0x%08x\n",
+ DRIVER_PREFIX, __func__, pwrctrl->cpwm, pwrctrl->alives);
if (pwrctrl->cpwm > pslv)
if ((pslv >= PS_STATE_S2) || (pwrctrl->alives == 0))
@@ -1048,9 +1041,8 @@ void rtw_unregister_cmd_alive(struct adapter *padapter)
unregister_task_alive(pwrctrl, CMD_ALIVE);
if ((pwrctrl->pwr_mode != PS_MODE_ACTIVE) && pwrctrl->bFwCurrentInPSMode) {
- RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_info_,
- ("%s: cpwm = 0x%02x alives = 0x%08x\n",
- __func__, pwrctrl->cpwm, pwrctrl->alives));
+ pr_info("%s %s: cpwm = 0x%02x alives = 0x%08x\n",
+ DRIVER_PREFIX, __func__, pwrctrl->cpwm, pwrctrl->alives);
if (pwrctrl->cpwm > pslv) {
if ((pslv >= PS_STATE_S2) || (pwrctrl->alives == 0))
--
2.20.1
next prev parent reply other threads:[~2021-03-31 9:40 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-31 9:39 [PATCH 00/40] staging: rtl8723bs: replace RT_TRACE private macro Fabio Aiuto
2021-03-31 9:39 ` [PATCH 01/40] staging: rtl8723bs: replace RT_TRACE with public printk wrappers in core/rtw_xmit.c Fabio Aiuto
2021-03-31 10:16 ` Dan Carpenter
2021-03-31 9:39 ` [PATCH 02/40] staging: rtl8723bs: replace RT_TRACE with public printk wrappers in core/rtw_security.c Fabio Aiuto
2021-03-31 9:39 ` [PATCH 03/40] staging: rtl8723bs: replace RT_TRACE with public printk wrappers in core/rtw_eeprom.c Fabio Aiuto
2021-03-31 10:27 ` Greg KH
2021-03-31 10:36 ` Fabio Aiuto
2021-03-31 10:48 ` Greg KH
2021-03-31 12:19 ` Fabio Aiuto
2021-03-31 10:55 ` Fabio Aiuto
2021-03-31 11:14 ` Greg KH
2021-03-31 12:17 ` Fabio Aiuto
2021-04-01 9:10 ` Fabio Aiuto
2021-03-31 9:39 ` Fabio Aiuto [this message]
2021-03-31 9:39 ` [PATCH 05/40] staging: rtl8723bs: replace RT_TRACE with public printk wrappers in core/rtw_cmd.c Fabio Aiuto
2021-03-31 9:39 ` [PATCH 06/40] staging: rtl8723bs: remove commented RT_TRACE calls in core/rtw_mlme.c Fabio Aiuto
2021-03-31 9:39 ` [PATCH 07/40] staging: rtl8723bs: replace RT_TRACE with public printk wrappers " Fabio Aiuto
2021-03-31 9:39 ` [PATCH 08/40] staging: rtl8723bs: replace RT_TRACE with public printk wrappers in core/rtw_mlme_ext.c Fabio Aiuto
2021-03-31 9:39 ` [PATCH 09/40] staging: rtl8723bs: remove commented RT_TRACE calls in core/rtw_recv.c Fabio Aiuto
2021-03-31 9:39 ` [PATCH 10/40] staging: rtl8723bs: replace RT_TRACE with public printk wrappers " Fabio Aiuto
2021-03-31 9:39 ` [PATCH 11/40] staging: rtl8723bs: remove commented RT_TRACE call in core/rtw_ioctl_set.c Fabio Aiuto
2021-03-31 9:39 ` [PATCH 12/40] staging: rtl8723bs: replace RT_TRACE with public printk wrappers " Fabio Aiuto
2021-03-31 9:39 ` [PATCH 13/40] staging: rtl8723bs: replace RT_TRACE with public printk wrappers in core/rtw_wlan_util.c Fabio Aiuto
2021-03-31 9:39 ` [PATCH 14/40] staging: rtl8723bs: replace RT_TRACE with public printk wrappers in core/rtw_sta_mgt.c Fabio Aiuto
2021-03-31 9:39 ` [PATCH 15/40] staging: rtl8723bs: replace RT_TRACE with public printk wrappers in core/rtw_ieee80211.c Fabio Aiuto
2021-03-31 9:39 ` [PATCH 16/40] staging: rtl8723bs: replace RT_TRACE with public printk wrappers in hal/HalPwrSeqCmd.c Fabio Aiuto
2021-03-31 9:39 ` [PATCH 17/40] staging: rtl8723bs: fix constant name in hal/rtl8723b_hal_init.c Fabio Aiuto
2021-03-31 9:39 ` [PATCH 18/40] staging: rtl8723bs: added driver prefix in log messages Fabio Aiuto
2021-03-31 9:39 ` [PATCH 19/40] staging: rtl8723bs: remove commented RT_TRACE call in hal/rtl8723b_hal_init.c Fabio Aiuto
2021-03-31 9:39 ` [PATCH 20/40] staging: rtl8723bs: replace RT_TRACE with public printk wrappers " Fabio Aiuto
2021-03-31 9:39 ` [PATCH 21/40] staging: rtl8723bs: replace RT_TRACE with public printk wrappers in hal/sdio_ops.c Fabio Aiuto
2021-03-31 9:39 ` [PATCH 22/40] staging: rtl8723bs: remove commented code block in hal/hal_com_phycfg.c Fabio Aiuto
2021-03-31 9:39 ` [PATCH 23/40] staging: rtl8723bs: replace RT_TRACE with public printk wrappers in hal/rtl8723b_phycfg.c Fabio Aiuto
2021-03-31 9:39 ` [PATCH 24/40] staging: rtl8723bs: replace RT_TRACE with public printk wrappers in hal/hal_intf.c Fabio Aiuto
2021-03-31 9:39 ` [PATCH 25/40] staging: rtl8723bs: replace RT_TRACE with public printk wrappers in hal/rtl8723bs_xmit.c Fabio Aiuto
2021-03-31 9:39 ` [PATCH 26/40] staging: rtl8723bs: replace RT_TRACE with public printk wrappers in hal/sdio_halinit.c Fabio Aiuto
2021-03-31 9:39 ` [PATCH 27/40] staging: rtl8723bs: replace RT_TRACE with public printk wrappers in hal/rtl8723bs_recv.c Fabio Aiuto
2021-03-31 9:39 ` [PATCH 28/40] staging: rtl8723bs: remove commented RT_TRACE calls in hal/HalPhyRf_8723B.c Fabio Aiuto
2021-03-31 9:39 ` [PATCH 29/40] staging: rtl8723bs: remove commented RT_TRACE calls in hal/rtl8723b_rf6052.c Fabio Aiuto
2021-03-31 9:39 ` [PATCH 30/40] staging: rtl8723bs: remove commented RT_TRACE calls in os_dep/ioctl_linux.c Fabio Aiuto
2021-03-31 9:39 ` [PATCH 31/40] staging: rtl8723bs: replace RT_TRACE with public printk wrappers " Fabio Aiuto
2021-03-31 9:40 ` [PATCH 32/40] staging: rtl8723bs: replace RT_TRACE with public printk wrappers in os_dep/mlme_linux.c Fabio Aiuto
2021-03-31 9:40 ` [PATCH 33/40] staging: rtl8723bs: fix string format in os_dep/ioctl_cfg80211.c Fabio Aiuto
2021-03-31 9:40 ` [PATCH 34/40] staging: rtl8723bs: replace RT_TRACE with public printk wrappers " Fabio Aiuto
2021-03-31 9:40 ` [PATCH 35/40] staging: rtl8723bs: replace RT_TRACE with public printk wrappers in os_dep/os_intfs.c Fabio Aiuto
2021-03-31 9:40 ` [PATCH 36/40] staging: rtl8723bs: replace RT_TRACE with public printk wrappers in os_dep/recv_linux.c Fabio Aiuto
2021-03-31 9:40 ` [PATCH 37/40] staging: rtl8723bs: replace RT_TRACE with public printk wrappers in os_dep/sdio_intf.c Fabio Aiuto
2021-03-31 9:40 ` [PATCH 38/40] staging: rtl8723bs: replace RT_TRACE with public printk wrappers in os_dep/xmit_linux.c Fabio Aiuto
2021-03-31 9:40 ` [PATCH 39/40] staging: rtl8723bs: replace RT_TRACE with public printk wrappers in os_dep/osdep_service.c Fabio Aiuto
2021-03-31 9:40 ` [PATCH 40/40] staging: rtl8723bs: remove obsolete debug macro Fabio Aiuto
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=e452bbaa8b6af6c0e48f90f4e73052768dbe9845.1617183374.git.fabioaiuto83@gmail.com \
--to=fabioaiuto83@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=joe@perches.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).