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 23/40] staging: rtl8723bs: replace RT_TRACE with public printk wrappers in hal/rtl8723b_phycfg.c
    Date
    replace private macro RT_TRACE for tracing with in-kernel
    pr_* printk wrappers

    Signed-off-by: Fabio Aiuto <fabioaiuto83@gmail.com>
    ---
    .../staging/rtl8723bs/hal/rtl8723b_phycfg.c | 48 +++++++++----------
    1 file changed, 22 insertions(+), 26 deletions(-)

    diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c b/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c
    index 2abff4673be2..59a659b76995 100644
    --- a/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c
    +++ b/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c
    @@ -551,7 +551,7 @@ void PHY_SetTxPowerIndex(
    break;
    }
    } else {
    - RT_TRACE(_module_hal_init_c_, _drv_err_, ("Invalid RFPath!!\n"));
    + pr_err("%s Invalid RFPath!!\n", DRIVER_PREFIX);
    }
    }

    @@ -604,11 +604,11 @@ void PHY_SetTxPowerLevel8723B(struct adapter *Adapter, u8 Channel)
    RFPath = pHalData->ant_path;
    }

    - RT_TRACE(_module_hal_init_c_, _drv_info_, ("==>PHY_SetTxPowerLevel8723B()\n"));
    + pr_info("%s ==> %s\n", DRIVER_PREFIX, __func__);

    PHY_SetTxPowerLevelByPath(Adapter, Channel, RFPath);

    - RT_TRACE(_module_hal_init_c_, _drv_info_, ("<==PHY_SetTxPowerLevel8723B()\n"));
    + pr_info("%s <== %s\n", DRIVER_PREFIX, __func__);
    }

    void PHY_GetTxPowerLevel8723B(struct adapter *Adapter, s32 *powerlevel)
    @@ -648,23 +648,20 @@ static u8 phy_GetSecondaryChnl_8723B(struct adapter *Adapter)
    u8 SCSettingOf40 = 0, SCSettingOf20 = 0;
    struct hal_com_data *pHalData = GET_HAL_DATA(Adapter);

    - RT_TRACE(
    - _module_hal_init_c_,
    - _drv_info_,
    - (
    - "SCMapping: VHT Case: pHalData->CurrentChannelBW %d, pHalData->nCur80MhzPrimeSC %d, pHalData->nCur40MhzPrimeSC %d\n",
    - pHalData->CurrentChannelBW,
    - pHalData->nCur80MhzPrimeSC,
    - pHalData->nCur40MhzPrimeSC
    - )
    - );
    + pr_info("%s SCMapping: VHT Case: pHalData->CurrentChannelBW %d, "
    + "pHalData->nCur80MhzPrimeSC %d, pHalData->nCur40MhzPrimeSC %d\n",
    + DRIVER_PREFIX,
    + pHalData->CurrentChannelBW,
    + pHalData->nCur80MhzPrimeSC,
    + pHalData->nCur40MhzPrimeSC);
    +
    if (pHalData->CurrentChannelBW == CHANNEL_WIDTH_80) {
    if (pHalData->nCur80MhzPrimeSC == HAL_PRIME_CHNL_OFFSET_LOWER)
    SCSettingOf40 = VHT_DATA_SC_40_LOWER_OF_80MHZ;
    else if (pHalData->nCur80MhzPrimeSC == HAL_PRIME_CHNL_OFFSET_UPPER)
    SCSettingOf40 = VHT_DATA_SC_40_UPPER_OF_80MHZ;
    else
    - RT_TRACE(_module_hal_init_c_, _drv_err_, ("SCMapping: Not Correct Primary40MHz Setting\n"));
    + pr_err("%s SCMapping: Not Correct Primary40MHz Setting\n", DRIVER_PREFIX);

    if (
    (pHalData->nCur40MhzPrimeSC == HAL_PRIME_CHNL_OFFSET_LOWER) &&
    @@ -687,27 +684,26 @@ static u8 phy_GetSecondaryChnl_8723B(struct adapter *Adapter)
    )
    SCSettingOf20 = VHT_DATA_SC_20_UPPERST_OF_80MHZ;
    else
    - RT_TRACE(_module_hal_init_c_, _drv_err_, ("SCMapping: Not Correct Primary40MHz Setting\n"));
    + pr_err("%s SCMapping: Not Correct Primary40MHz Setting\n",
    + DRIVER_PREFIX);
    } else if (pHalData->CurrentChannelBW == CHANNEL_WIDTH_40) {
    - RT_TRACE(
    - _module_hal_init_c_,
    - _drv_info_,
    - (
    - "SCMapping: VHT Case: pHalData->CurrentChannelBW %d, pHalData->nCur40MhzPrimeSC %d\n",
    - pHalData->CurrentChannelBW,
    - pHalData->nCur40MhzPrimeSC
    - )
    - );
    + pr_info("%s SCMapping: VHT Case: pHalData->CurrentChannelBW %d, "
    + "pHalData->nCur40MhzPrimeSC %d\n",
    + DRIVER_PREFIX, pHalData->CurrentChannelBW,
    + pHalData->nCur40MhzPrimeSC);

    if (pHalData->nCur40MhzPrimeSC == HAL_PRIME_CHNL_OFFSET_UPPER)
    SCSettingOf20 = VHT_DATA_SC_20_UPPER_OF_80MHZ;
    else if (pHalData->nCur40MhzPrimeSC == HAL_PRIME_CHNL_OFFSET_LOWER)
    SCSettingOf20 = VHT_DATA_SC_20_LOWER_OF_80MHZ;
    else
    - RT_TRACE(_module_hal_init_c_, _drv_err_, ("SCMapping: Not Correct Primary40MHz Setting\n"));
    + pr_err("%s SCMapping: Not Correct Primary40MHz Setting\n",
    + DRIVER_PREFIX);
    }

    - RT_TRACE(_module_hal_init_c_, _drv_info_, ("SCMapping: SC Value %x\n", ((SCSettingOf40 << 4) | SCSettingOf20)));
    + pr_info("%s SCMapping: SC Value %x\n",
    + DRIVER_PREFIX, ((SCSettingOf40 << 4) | SCSettingOf20));
    +
    return (SCSettingOf40 << 4) | SCSettingOf20;
    }

    --
    2.20.1
    \
     
     \ /
      Last update: 2021-03-31 12:10    [W:6.582 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site