Commit 1cd8fbfa authored by Philipp Hortmann's avatar Philipp Hortmann Committed by Greg Kroah-Hartman

staging: rtl8192e: Rename EEPROMTxPower.., AutoloadF.. and SilentReset..

Rename variable SilentResetRxSlotIndex to silent_reset_rx_slot_index,
IC_Cut to ic_cut and Rf_Mode to rf_mode to avoid CamelCase which is not
accepted by checkpatch.
Signed-off-by: default avatarPhilipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/60c1fb2861143c8736f061cf85e737b78c210a09.1673812850.git.philipp.g.hortmann@gmail.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 69c382a5
...@@ -614,7 +614,7 @@ bool rtl92e_start_adapter(struct net_device *dev) ...@@ -614,7 +614,7 @@ bool rtl92e_start_adapter(struct net_device *dev)
start: start:
rtl92e_reset_desc_ring(dev); rtl92e_reset_desc_ring(dev);
priv->Rf_Mode = RF_OP_By_SW_3wire; priv->rf_mode = RF_OP_By_SW_3wire;
if (priv->rst_progress == RESET_TYPE_NORESET) { if (priv->rst_progress == RESET_TYPE_NORESET) {
rtl92e_writeb(dev, ANAPAR, 0x37); rtl92e_writeb(dev, ANAPAR, 0x37);
mdelay(500); mdelay(500);
...@@ -724,7 +724,7 @@ bool rtl92e_start_adapter(struct net_device *dev) ...@@ -724,7 +724,7 @@ bool rtl92e_start_adapter(struct net_device *dev)
} }
tmpvalue = rtl92e_readb(dev, IC_VERRSION); tmpvalue = rtl92e_readb(dev, IC_VERRSION);
priv->IC_Cut = tmpvalue; priv->ic_cut = tmpvalue;
bfirmwareok = rtl92e_init_fw(dev); bfirmwareok = rtl92e_init_fw(dev);
if (!bfirmwareok) { if (!bfirmwareok) {
...@@ -760,14 +760,14 @@ bool rtl92e_start_adapter(struct net_device *dev) ...@@ -760,14 +760,14 @@ bool rtl92e_start_adapter(struct net_device *dev)
} }
if (priv->rtllib->FwRWRF) if (priv->rtllib->FwRWRF)
priv->Rf_Mode = RF_OP_By_FW; priv->rf_mode = RF_OP_By_FW;
else else
priv->Rf_Mode = RF_OP_By_SW_3wire; priv->rf_mode = RF_OP_By_SW_3wire;
if (priv->rst_progress == RESET_TYPE_NORESET) { if (priv->rst_progress == RESET_TYPE_NORESET) {
rtl92e_dm_init_txpower_tracking(dev); rtl92e_dm_init_txpower_tracking(dev);
if (priv->IC_Cut >= IC_VersionCut_D) { if (priv->ic_cut >= IC_VersionCut_D) {
tmpRegA = rtl92e_get_bb_reg(dev, rOFDM0_XATxIQImbalance, tmpRegA = rtl92e_get_bb_reg(dev, rOFDM0_XATxIQImbalance,
bMaskDWord); bMaskDWord);
rtl92e_get_bb_reg(dev, rOFDM0_XCTxIQImbalance, bMaskDWord); rtl92e_get_bb_reg(dev, rOFDM0_XCTxIQImbalance, bMaskDWord);
...@@ -2123,7 +2123,7 @@ bool rtl92e_is_rx_stuck(struct net_device *dev) ...@@ -2123,7 +2123,7 @@ bool rtl92e_is_rx_stuck(struct net_device *dev)
} }
SlotIndex = (priv->SilentResetRxSlotIndex++)%SilentResetRxSoltNum; SlotIndex = (priv->silent_reset_rx_slot_index++)%SilentResetRxSoltNum;
if (priv->rx_ctr == RegRxCounter) { if (priv->rx_ctr == RegRxCounter) {
priv->silent_reset_rx_stuck_event[SlotIndex] = 1; priv->silent_reset_rx_stuck_event[SlotIndex] = 1;
......
...@@ -203,7 +203,7 @@ void rtl92e_set_rf_reg(struct net_device *dev, enum rf90_radio_path eRFPath, ...@@ -203,7 +203,7 @@ void rtl92e_set_rf_reg(struct net_device *dev, enum rf90_radio_path eRFPath,
if (priv->rtllib->rf_power_state != rf_on && !priv->being_init_adapter) if (priv->rtllib->rf_power_state != rf_on && !priv->being_init_adapter)
return; return;
if (priv->Rf_Mode == RF_OP_By_FW) { if (priv->rf_mode == RF_OP_By_FW) {
if (BitMask != bMask12Bits) { if (BitMask != bMask12Bits) {
Original_Value = _rtl92e_phy_rf_fw_read(dev, eRFPath, Original_Value = _rtl92e_phy_rf_fw_read(dev, eRFPath,
RegAddr); RegAddr);
...@@ -240,7 +240,7 @@ u32 rtl92e_get_rf_reg(struct net_device *dev, enum rf90_radio_path eRFPath, ...@@ -240,7 +240,7 @@ u32 rtl92e_get_rf_reg(struct net_device *dev, enum rf90_radio_path eRFPath,
if (priv->rtllib->rf_power_state != rf_on && !priv->being_init_adapter) if (priv->rtllib->rf_power_state != rf_on && !priv->being_init_adapter)
return 0; return 0;
mutex_lock(&priv->rf_mutex); mutex_lock(&priv->rf_mutex);
if (priv->Rf_Mode == RF_OP_By_FW) { if (priv->rf_mode == RF_OP_By_FW) {
Original_Value = _rtl92e_phy_rf_fw_read(dev, eRFPath, RegAddr); Original_Value = _rtl92e_phy_rf_fw_read(dev, eRFPath, RegAddr);
udelay(200); udelay(200);
} else { } else {
...@@ -533,7 +533,7 @@ static bool _rtl92e_bb_config_para_file(struct net_device *dev) ...@@ -533,7 +533,7 @@ static bool _rtl92e_bb_config_para_file(struct net_device *dev)
_rtl92e_phy_config_bb(dev, BaseBand_Config_AGC_TAB); _rtl92e_phy_config_bb(dev, BaseBand_Config_AGC_TAB);
if (priv->IC_Cut > VERSION_8190_BD) { if (priv->ic_cut > VERSION_8190_BD) {
if (priv->rf_type == RF_2T4R) if (priv->rf_type == RF_2T4R)
dwRegValue = priv->antenna_tx_pwr_diff[2] << 8 | dwRegValue = priv->antenna_tx_pwr_diff[2] << 8 |
priv->antenna_tx_pwr_diff[1] << 4 | priv->antenna_tx_pwr_diff[1] << 4 |
...@@ -886,7 +886,7 @@ static u8 _rtl92e_phy_switch_channel_step(struct net_device *dev, u8 channel, ...@@ -886,7 +886,7 @@ static u8 _rtl92e_phy_switch_channel_step(struct net_device *dev, u8 channel,
continue; continue;
switch (CurrentCmd->CmdID) { switch (CurrentCmd->CmdID) {
case CmdID_SetTxPowerLevel: case CmdID_SetTxPowerLevel:
if (priv->IC_Cut > VERSION_8190_BD) if (priv->ic_cut > VERSION_8190_BD)
_rtl92e_set_tx_power_level(dev, _rtl92e_set_tx_power_level(dev,
channel); channel);
break; break;
...@@ -1088,7 +1088,7 @@ static void _rtl92e_cck_tx_power_track_bw_switch(struct net_device *dev) ...@@ -1088,7 +1088,7 @@ static void _rtl92e_cck_tx_power_track_bw_switch(struct net_device *dev)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
if (priv->IC_Cut >= IC_VersionCut_D) if (priv->ic_cut >= IC_VersionCut_D)
_rtl92e_cck_tx_power_track_bw_switch_tssi(dev); _rtl92e_cck_tx_power_track_bw_switch_tssi(dev);
else else
_rtl92e_cck_tx_power_track_bw_switch_thermal(dev); _rtl92e_cck_tx_power_track_bw_switch_thermal(dev);
......
...@@ -396,16 +396,16 @@ struct r8192_priv { ...@@ -396,16 +396,16 @@ struct r8192_priv {
u32 irq_mask[2]; u32 irq_mask[2];
u8 Rf_Mode; u8 rf_mode;
enum nic_t card_8192; enum nic_t card_8192;
u8 card_8192_version; u8 card_8192_version;
u8 rf_type; u8 rf_type;
u8 IC_Cut; u8 ic_cut;
char nick[IW_ESSID_MAX_SIZE + 1]; char nick[IW_ESSID_MAX_SIZE + 1];
u8 check_roaming_cnt; u8 check_roaming_cnt;
u32 SilentResetRxSlotIndex; u32 silent_reset_rx_slot_index;
u32 silent_reset_rx_stuck_event[MAX_SILENT_RESET_RX_SLOT_NUM]; u32 silent_reset_rx_stuck_event[MAX_SILENT_RESET_RX_SLOT_NUM];
u16 basic_rate; u16 basic_rate;
......
...@@ -857,7 +857,7 @@ void rtl92e_dm_txpower_tracking_wq(void *data) ...@@ -857,7 +857,7 @@ void rtl92e_dm_txpower_tracking_wq(void *data)
struct r8192_priv, txpower_tracking_wq); struct r8192_priv, txpower_tracking_wq);
struct net_device *dev = priv->rtllib->dev; struct net_device *dev = priv->rtllib->dev;
if (priv->IC_Cut >= IC_VersionCut_D) if (priv->ic_cut >= IC_VersionCut_D)
_rtl92e_dm_tx_power_tracking_callback_tssi(dev); _rtl92e_dm_tx_power_tracking_callback_tssi(dev);
else else
_rtl92e_dm_tx_power_tracking_cb_thermal(dev); _rtl92e_dm_tx_power_tracking_cb_thermal(dev);
...@@ -891,7 +891,7 @@ void rtl92e_dm_init_txpower_tracking(struct net_device *dev) ...@@ -891,7 +891,7 @@ void rtl92e_dm_init_txpower_tracking(struct net_device *dev)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
if (priv->IC_Cut >= IC_VersionCut_D) if (priv->ic_cut >= IC_VersionCut_D)
_rtl92e_dm_initialize_tx_power_tracking_tssi(dev); _rtl92e_dm_initialize_tx_power_tracking_tssi(dev);
else else
_rtl92e_dm_init_tx_power_tracking_thermal(dev); _rtl92e_dm_init_tx_power_tracking_thermal(dev);
...@@ -952,7 +952,7 @@ static void _rtl92e_dm_check_tx_power_tracking(struct net_device *dev) ...@@ -952,7 +952,7 @@ static void _rtl92e_dm_check_tx_power_tracking(struct net_device *dev)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
if (priv->IC_Cut >= IC_VersionCut_D) if (priv->ic_cut >= IC_VersionCut_D)
_rtl92e_dm_check_tx_power_tracking_tssi(dev); _rtl92e_dm_check_tx_power_tracking_tssi(dev);
else else
_rtl92e_dm_check_tx_power_tracking_thermal(dev); _rtl92e_dm_check_tx_power_tracking_thermal(dev);
...@@ -1038,7 +1038,7 @@ void rtl92e_dm_cck_txpower_adjust(struct net_device *dev, bool binch14) ...@@ -1038,7 +1038,7 @@ void rtl92e_dm_cck_txpower_adjust(struct net_device *dev, bool binch14)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
if (priv->IC_Cut >= IC_VersionCut_D) if (priv->ic_cut >= IC_VersionCut_D)
_rtl92e_dm_cck_tx_power_adjust_tssi(dev, binch14); _rtl92e_dm_cck_tx_power_adjust_tssi(dev, binch14);
else else
_rtl92e_dm_cck_tx_power_adjust_thermal_meter(dev, binch14); _rtl92e_dm_cck_tx_power_adjust_thermal_meter(dev, binch14);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment