From 18651492d516607c6d60eaae106c04635120928e Mon Sep 17 00:00:00 2001 From: Philipp Hortmann Date: Sun, 15 Jan 2023 21:20:32 +0100 Subject: [PATCH] staging: rtl8192e: Rename bResetInPro.., framesyncMo.. and nCur40MhzPri.. Rename variable bResetInProgress to reset_in_progress, framesyncMonitor to frame_sync_monitor and nCur40MhzPrimeSC to n_cur_40mhz_prime_sc to avoid CamelCase which is not accepted by checkpatch. Signed-off-by: Philipp Hortmann Link: https://lore.kernel.org/r/dc9a6353e2342f524d8cbf0de6a6340990dc913b.1673812849.git.philipp.g.hortmann@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 2 +- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 10 +++++----- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 10 +++++----- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 6 +++--- drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 10 +++++----- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c index 1f0c53d..734a097 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -1074,7 +1074,7 @@ void rtl92e_fill_tx_desc(struct net_device *dev, struct tx_desc *pdesc, pTxFwInfo->TxSubCarrier = 0; } else { pTxFwInfo->TxBandwidth = 0; - pTxFwInfo->TxSubCarrier = priv->nCur40MhzPrimeSC; + pTxFwInfo->TxSubCarrier = priv->n_cur_40mhz_prime_sc; } } else { pTxFwInfo->TxBandwidth = 0; diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c index a023328..59b2e83 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c @@ -1156,9 +1156,9 @@ static void _rtl92e_set_bw_mode_work_item(struct net_device *dev) } rtl92e_set_bb_reg(dev, rCCK0_System, bCCKSideBand, - (priv->nCur40MhzPrimeSC>>1)); + (priv->n_cur_40mhz_prime_sc>>1)); rtl92e_set_bb_reg(dev, rOFDM1_LSTF, 0xC00, - priv->nCur40MhzPrimeSC); + priv->n_cur_40mhz_prime_sc); rtl92e_set_bb_reg(dev, rFPGA0_AnalogParameter1, 0x00100000, 0); break; @@ -1208,11 +1208,11 @@ void rtl92e_set_bw_mode(struct net_device *dev, enum ht_channel_width bandwidth, priv->CurrentChannelBW = bandwidth; if (Offset == HT_EXTCHNL_OFFSET_LOWER) - priv->nCur40MhzPrimeSC = HAL_PRIME_CHNL_OFFSET_UPPER; + priv->n_cur_40mhz_prime_sc = HAL_PRIME_CHNL_OFFSET_UPPER; else if (Offset == HT_EXTCHNL_OFFSET_UPPER) - priv->nCur40MhzPrimeSC = HAL_PRIME_CHNL_OFFSET_LOWER; + priv->n_cur_40mhz_prime_sc = HAL_PRIME_CHNL_OFFSET_LOWER; else - priv->nCur40MhzPrimeSC = HAL_PRIME_CHNL_OFFSET_DONT_CARE; + priv->n_cur_40mhz_prime_sc = HAL_PRIME_CHNL_OFFSET_DONT_CARE; _rtl92e_set_bw_mode_work_item(dev); diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c index 050f043..8e1180b 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -1138,7 +1138,7 @@ static void _rtl92e_if_silent_reset(struct net_device *dev) goto END; } priv->rf_change_in_progress = true; - priv->bResetInProgress = true; + priv->reset_in_progress = true; spin_unlock_irqrestore(&priv->rf_ps_lock, flag); RESET_START: @@ -1229,7 +1229,7 @@ RESET_START: END: priv->rst_progress = RESET_TYPE_NORESET; priv->reset_count++; - priv->bResetInProgress = false; + priv->reset_in_progress = false; rtl92e_writeb(dev, UFWP, 1); } @@ -1397,7 +1397,7 @@ static void _rtl92e_watchdog_wq_cb(void *data) if ((priv->force_reset || ResetType == RESET_TYPE_SILENT)) _rtl92e_if_silent_reset(dev); priv->force_reset = false; - priv->bResetInProgress = false; + priv->reset_in_progress = false; } static void _rtl92e_watchdog_timer_cb(struct timer_list *t) @@ -1486,7 +1486,7 @@ static void _rtl92e_hard_data_xmit(struct sk_buff *skb, struct net_device *dev, u8 queue_index = tcb_desc->queue_index; if ((priv->rtllib->rf_power_state == rf_off) || !priv->up || - priv->bResetInProgress) { + priv->reset_in_progress) { kfree_skb(skb); return; } @@ -1519,7 +1519,7 @@ static int _rtl92e_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) if (queue_index != TXCMD_QUEUE) { if ((priv->rtllib->rf_power_state == rf_off) || - !priv->up || priv->bResetInProgress) { + !priv->up || priv->reset_in_progress) { kfree_skb(skb); return 0; } diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h index be87bb9..ed9ddb2 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -442,7 +442,7 @@ struct r8192_priv { u8 SwChnlStep; u8 SetBWModeInProgress; - u8 nCur40MhzPrimeSC; + u8 n_cur_40mhz_prime_sc; u32 rf_reg_0value[4]; u8 num_total_rf_path; @@ -515,14 +515,14 @@ struct r8192_priv { bool bswitch_fsync; u8 framesync; u32 framesyncC34; - u8 framesyncMonitor; + u8 frame_sync_monitor; u32 reset_count; enum reset_type rst_progress; u16 tx_counter; u16 rx_ctr; - bool bResetInProgress; + bool reset_in_progress; bool force_reset; bool force_lps; diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c index 2a570c28..0e278b8 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c @@ -640,7 +640,7 @@ static void _rtl92e_dm_tx_power_tracking_callback_tssi(struct net_device *dev) if (Pwr_Flag == 0) { mdelay(1); - if (priv->bResetInProgress) { + if (priv->reset_in_progress) { rtl92e_writeb(dev, Pw_Track_Flag, 0); rtl92e_writeb(dev, FW_Busy_Flag, 0); return; @@ -1969,7 +1969,7 @@ static void _rtl92e_dm_init_fsync(struct net_device *dev) priv->rtllib->fsync_firstdiff_ratethreshold = 100; priv->rtllib->fsync_seconddiff_ratethreshold = 200; priv->rtllib->fsync_state = Default_Fsync; - priv->framesyncMonitor = 1; + priv->frame_sync_monitor = 1; timer_setup(&priv->fsync_timer, _rtl92e_dm_fsync_timer_callback, 0); } @@ -2196,7 +2196,7 @@ static void _rtl92e_dm_check_fsync(struct net_device *dev) } } - if (priv->framesyncMonitor) { + if (priv->frame_sync_monitor) { if (reg_c38_State != RegC38_Fsync_AP_BCM) { rtl92e_writeb(dev, rOFDM0_RxDetector3, 0x95); @@ -2218,7 +2218,7 @@ static void _rtl92e_dm_check_fsync(struct net_device *dev) break; } - if (priv->framesyncMonitor) { + if (priv->frame_sync_monitor) { if (priv->rtllib->state == RTLLIB_LINKED) { if (priv->undecorated_smoothed_pwdb <= RegC38_TH) { @@ -2249,7 +2249,7 @@ static void _rtl92e_dm_check_fsync(struct net_device *dev) } } } - if (priv->framesyncMonitor) { + if (priv->frame_sync_monitor) { if (priv->reset_count != reset_cnt) { rtl92e_writeb(dev, rOFDM0_RxDetector3, priv->framesync); -- 2.7.4