From b1465f9bcc2a44d54c199c60b946c4595576019c Mon Sep 17 00:00:00 2001 From: Philipp Hortmann Date: Mon, 9 Jan 2023 20:08:58 +0100 Subject: [PATCH] staging: rtl8192e: Rename TxPowerLevelOFDM24G... Rename variable TxPowerLevelOFDM24G to tx_pwr_level_ofdm_24g, TxPowerLevelOFDM24G_A to tx_pwr_level_ofdm_24g_a and TxPowerLevelOFDM24G_C to tx_pwr_level_ofdm_24g_c to avoid CamelCase which is not accepted by checkpatch. Signed-off-by: Philipp Hortmann Link: https://lore.kernel.org/r/6bb354bd6f6387a26378de3b154d975b826a1a88.1673290428.git.philipp.g.hortmann@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 14 +++++++------- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 12 ++++++------ drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 6 +++--- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c index ec817de..ab9e226 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -410,7 +410,7 @@ static void _rtl92e_read_eeprom_info(struct net_device *dev) for (i = 0; i < 14; i++) { priv->tx_pwr_level_cck[i] = priv->EEPROMTxPowerLevelCCK[i]; - priv->TxPowerLevelOFDM24G[i] = + priv->tx_pwr_level_ofdm_24g[i] = priv->EEPROMTxPowerLevelOFDM24G[i]; } priv->LegacyHTTxPowerDiff = @@ -429,31 +429,31 @@ static void _rtl92e_read_eeprom_info(struct net_device *dev) for (i = 0; i < 3; i++) { priv->tx_pwr_level_cck_a[i] = priv->EEPROMRfACCKChnl1TxPwLevel[0]; - priv->TxPowerLevelOFDM24G_A[i] = + priv->tx_pwr_level_ofdm_24g_a[i] = priv->EEPROMRfAOfdmChnlTxPwLevel[0]; priv->tx_pwr_level_cck_c[i] = priv->EEPROMRfCCCKChnl1TxPwLevel[0]; - priv->TxPowerLevelOFDM24G_C[i] = + priv->tx_pwr_level_ofdm_24g_c[i] = priv->EEPROMRfCOfdmChnlTxPwLevel[0]; } for (i = 3; i < 9; i++) { priv->tx_pwr_level_cck_a[i] = priv->EEPROMRfACCKChnl1TxPwLevel[1]; - priv->TxPowerLevelOFDM24G_A[i] = + priv->tx_pwr_level_ofdm_24g_a[i] = priv->EEPROMRfAOfdmChnlTxPwLevel[1]; priv->tx_pwr_level_cck_c[i] = priv->EEPROMRfCCCKChnl1TxPwLevel[1]; - priv->TxPowerLevelOFDM24G_C[i] = + priv->tx_pwr_level_ofdm_24g_c[i] = priv->EEPROMRfCOfdmChnlTxPwLevel[1]; } for (i = 9; i < 14; i++) { priv->tx_pwr_level_cck_a[i] = priv->EEPROMRfACCKChnl1TxPwLevel[2]; - priv->TxPowerLevelOFDM24G_A[i] = + priv->tx_pwr_level_ofdm_24g_a[i] = priv->EEPROMRfAOfdmChnlTxPwLevel[2]; priv->tx_pwr_level_cck_c[i] = priv->EEPROMRfCCCKChnl1TxPwLevel[2]; - priv->TxPowerLevelOFDM24G_C[i] = + priv->tx_pwr_level_ofdm_24g_c[i] = priv->EEPROMRfCOfdmChnlTxPwLevel[2]; } priv->LegacyHTTxPowerDiff = diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c index ee61386..19c65aa 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c @@ -593,17 +593,17 @@ void rtl92e_set_tx_power(struct net_device *dev, u8 channel) if (priv->epromtype == EEPROM_93C46) { powerlevel = priv->tx_pwr_level_cck[channel - 1]; - powerlevelOFDM24G = priv->TxPowerLevelOFDM24G[channel-1]; + powerlevelOFDM24G = priv->tx_pwr_level_ofdm_24g[channel - 1]; } else if (priv->epromtype == EEPROM_93C56) { if (priv->rf_type == RF_1T2R) { powerlevel = priv->tx_pwr_level_cck_c[channel - 1]; - powerlevelOFDM24G = priv->TxPowerLevelOFDM24G_C[channel-1]; + powerlevelOFDM24G = priv->tx_pwr_level_ofdm_24g_c[channel - 1]; } else if (priv->rf_type == RF_2T4R) { powerlevel = priv->tx_pwr_level_cck_a[channel - 1]; - powerlevelOFDM24G = priv->TxPowerLevelOFDM24G_A[channel-1]; + powerlevelOFDM24G = priv->tx_pwr_level_ofdm_24g_a[channel - 1]; - ant_pwr_diff = priv->TxPowerLevelOFDM24G_C[channel-1] - - priv->TxPowerLevelOFDM24G_A[channel-1]; + ant_pwr_diff = priv->tx_pwr_level_ofdm_24g_c[channel - 1] + - priv->tx_pwr_level_ofdm_24g_a[channel - 1]; priv->RF_C_TxPwDiff = ant_pwr_diff; @@ -727,7 +727,7 @@ static void _rtl92e_set_tx_power_level(struct net_device *dev, u8 channel) { struct r8192_priv *priv = rtllib_priv(dev); u8 powerlevel = priv->tx_pwr_level_cck[channel - 1]; - u8 powerlevelOFDM24G = priv->TxPowerLevelOFDM24G[channel-1]; + u8 powerlevelOFDM24G = priv->tx_pwr_level_ofdm_24g[channel - 1]; switch (priv->rf_chip) { case RF_8225: diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h index 1efaea9..ca61fc6 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -473,9 +473,9 @@ struct r8192_priv { 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]; + u8 tx_pwr_level_ofdm_24g[14]; + u8 tx_pwr_level_ofdm_24g_a[14]; + u8 tx_pwr_level_ofdm_24g_c[14]; u8 LegacyHTTxPowerDiff; s8 RF_C_TxPwDiff; u8 AntennaTxPwDiff[3]; -- 2.7.4