lkml.org 
[lkml]   [2021]   [Mar]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 04/40] staging: rtl8723bs: replace RT_TRACE with public printk wrappers in core/rtw_pwrctrl.c
    Date
    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
    \
     
     \ /
      Last update: 2021-03-31 11:41    [W:3.737 / U:0.804 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site