lkml.org 
[lkml]   [2022]   [Dec]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 4/7] staging: rtl8192e: Rename TxPowerLevelCCK...
    Rename variable TxPowerLevelCCK to tx_pwr_level_cck, TxPowerLevelCCK_A to
    tx_pwr_level_cck_a and TxPowerLevelCCK_C to tx_pwr_level_cck_c to avoid
    CamelCase which is not accepted by checkpatch.

    Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
    ---
    drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 14 +++++++-------
    drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 8 ++++----
    drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 6 +++---
    3 files changed, 14 insertions(+), 14 deletions(-)

    diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
    index e3b534206f20..c121784bd810 100644
    --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
    +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
    @@ -408,7 +408,7 @@ static void _rtl92e_read_eeprom_info(struct net_device *dev)
    }
    if (priv->epromtype == EEPROM_93C46) {
    for (i = 0; i < 14; i++) {
    - priv->TxPowerLevelCCK[i] =
    + priv->tx_pwr_level_cck[i] =
    priv->EEPROMTxPowerLevelCCK[i];
    priv->TxPowerLevelOFDM24G[i] =
    priv->EEPROMTxPowerLevelOFDM24G[i];
    @@ -427,31 +427,31 @@ static void _rtl92e_read_eeprom_info(struct net_device *dev)
    } else if (priv->epromtype == EEPROM_93C56) {

    for (i = 0; i < 3; i++) {
    - priv->TxPowerLevelCCK_A[i] =
    + priv->tx_pwr_level_cck_a[i] =
    priv->EEPROMRfACCKChnl1TxPwLevel[0];
    priv->TxPowerLevelOFDM24G_A[i] =
    priv->EEPROMRfAOfdmChnlTxPwLevel[0];
    - priv->TxPowerLevelCCK_C[i] =
    + priv->tx_pwr_level_cck_c[i] =
    priv->EEPROMRfCCCKChnl1TxPwLevel[0];
    priv->TxPowerLevelOFDM24G_C[i] =
    priv->EEPROMRfCOfdmChnlTxPwLevel[0];
    }
    for (i = 3; i < 9; i++) {
    - priv->TxPowerLevelCCK_A[i] =
    + priv->tx_pwr_level_cck_a[i] =
    priv->EEPROMRfACCKChnl1TxPwLevel[1];
    priv->TxPowerLevelOFDM24G_A[i] =
    priv->EEPROMRfAOfdmChnlTxPwLevel[1];
    - priv->TxPowerLevelCCK_C[i] =
    + priv->tx_pwr_level_cck_c[i] =
    priv->EEPROMRfCCCKChnl1TxPwLevel[1];
    priv->TxPowerLevelOFDM24G_C[i] =
    priv->EEPROMRfCOfdmChnlTxPwLevel[1];
    }
    for (i = 9; i < 14; i++) {
    - priv->TxPowerLevelCCK_A[i] =
    + priv->tx_pwr_level_cck_a[i] =
    priv->EEPROMRfACCKChnl1TxPwLevel[2];
    priv->TxPowerLevelOFDM24G_A[i] =
    priv->EEPROMRfAOfdmChnlTxPwLevel[2];
    - priv->TxPowerLevelCCK_C[i] =
    + priv->tx_pwr_level_cck_c[i] =
    priv->EEPROMRfCCCKChnl1TxPwLevel[2];
    priv->TxPowerLevelOFDM24G_C[i] =
    priv->EEPROMRfCOfdmChnlTxPwLevel[2];
    diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
    index 33b39b1dc655..ee6138699e10 100644
    --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
    +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
    @@ -592,14 +592,14 @@ void rtl92e_set_tx_power(struct net_device *dev, u8 channel)
    u32 u4RegValue;

    if (priv->epromtype == EEPROM_93C46) {
    - powerlevel = priv->TxPowerLevelCCK[channel-1];
    + powerlevel = priv->tx_pwr_level_cck[channel - 1];
    powerlevelOFDM24G = priv->TxPowerLevelOFDM24G[channel-1];
    } else if (priv->epromtype == EEPROM_93C56) {
    if (priv->rf_type == RF_1T2R) {
    - powerlevel = priv->TxPowerLevelCCK_C[channel-1];
    + powerlevel = priv->tx_pwr_level_cck_c[channel - 1];
    powerlevelOFDM24G = priv->TxPowerLevelOFDM24G_C[channel-1];
    } else if (priv->rf_type == RF_2T4R) {
    - powerlevel = priv->TxPowerLevelCCK_A[channel-1];
    + powerlevel = priv->tx_pwr_level_cck_a[channel - 1];
    powerlevelOFDM24G = priv->TxPowerLevelOFDM24G_A[channel-1];

    ant_pwr_diff = priv->TxPowerLevelOFDM24G_C[channel-1]
    @@ -726,7 +726,7 @@ u8 rtl92e_config_rf_path(struct net_device *dev, enum rf90_radio_path eRFPath)
    static void _rtl92e_set_tx_power_level(struct net_device *dev, u8 channel)
    {
    struct r8192_priv *priv = rtllib_priv(dev);
    - u8 powerlevel = priv->TxPowerLevelCCK[channel-1];
    + u8 powerlevel = priv->tx_pwr_level_cck[channel - 1];
    u8 powerlevelOFDM24G = priv->TxPowerLevelOFDM24G[channel-1];

    switch (priv->rf_chip) {
    diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
    index 1c5a2a622ccb..a74ef0125caa 100644
    --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
    +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
    @@ -470,9 +470,9 @@ struct r8192_priv {
    long undecorated_smoothed_pwdb;

    u32 MCSTxPowerLevelOriginalOffset[6];
    - u8 TxPowerLevelCCK[14];
    - u8 TxPowerLevelCCK_A[14];
    - u8 TxPowerLevelCCK_C[14];
    + u8 tx_pwr_level_cck[14];
    + u8 tx_pwr_level_cck_a[14];
    + u8 tx_pwr_level_cck_c[14];
    u8 TxPowerLevelOFDM24G[14];
    u8 TxPowerLevelOFDM24G_A[14];
    u8 TxPowerLevelOFDM24G_C[14];
    --
    2.39.0
    \
     
     \ /
      Last update: 2023-03-26 23:23    [W:4.110 / U:0.124 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site