lkml.org 
[lkml]   [2023]   [Jan]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 04/10] staging: rtl8192e: Rename rateCountDi.., ContinueDif.. and TxCounter
    Rename variable rateCountDiffRecord to rate_count_diff_rec,
    ContinueDiffCount to continue_diff_count and TxCounter to tx_counter to
    avoid CamelCase which is not accepted by checkpatch.

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

    diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
    index ebf1fa5ec295..1f0c53dcbb2d 100644
    --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
    +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
    @@ -2154,10 +2154,10 @@ bool rtl92e_is_tx_stuck(struct net_device *dev)
    bool bStuck = false;
    u16 RegTxCounter = rtl92e_readw(dev, 0x128);

    - if (priv->TxCounter == RegTxCounter)
    + if (priv->tx_counter == RegTxCounter)
    bStuck = true;

    - priv->TxCounter = RegTxCounter;
    + priv->tx_counter = RegTxCounter;

    return bStuck;
    }
    diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
    index af377f7c7f7b..be87bb9da6cc 100644
    --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
    +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
    @@ -510,8 +510,8 @@ struct r8192_priv {

    bool bfsync_processing;
    u32 rate_record;
    - u32 rateCountDiffRecord;
    - u32 ContinueDiffCount;
    + u32 rate_count_diff_rec;
    + u32 continue_diff_count;
    bool bswitch_fsync;
    u8 framesync;
    u32 framesyncC34;
    @@ -520,7 +520,7 @@ struct r8192_priv {
    u32 reset_count;

    enum reset_type rst_progress;
    - u16 TxCounter;
    + u16 tx_counter;
    u16 rx_ctr;
    bool bResetInProgress;
    bool force_reset;
    diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
    index 9789cdd8ac15..2a570c28e694 100644
    --- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
    +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
    @@ -2008,31 +2008,31 @@ static void _rtl92e_dm_fsync_timer_callback(struct timer_list *t)
    priv->rate_record;
    else
    rate_count_diff = rate_count - priv->rate_record;
    - if (rate_count_diff < priv->rateCountDiffRecord) {
    + if (rate_count_diff < priv->rate_count_diff_rec) {

    - u32 DiffNum = priv->rateCountDiffRecord -
    + u32 DiffNum = priv->rate_count_diff_rec -
    rate_count_diff;
    if (DiffNum >=
    priv->rtllib->fsync_seconddiff_ratethreshold)
    - priv->ContinueDiffCount++;
    + priv->continue_diff_count++;
    else
    - priv->ContinueDiffCount = 0;
    + priv->continue_diff_count = 0;

    - if (priv->ContinueDiffCount >= 2) {
    + if (priv->continue_diff_count >= 2) {
    bSwitchFromCountDiff = true;
    - priv->ContinueDiffCount = 0;
    + priv->continue_diff_count = 0;
    }
    } else {
    - priv->ContinueDiffCount = 0;
    + priv->continue_diff_count = 0;
    }

    if (rate_count_diff <=
    priv->rtllib->fsync_firstdiff_ratethreshold) {
    bSwitchFromCountDiff = true;
    - priv->ContinueDiffCount = 0;
    + priv->continue_diff_count = 0;
    }
    priv->rate_record = rate_count;
    - priv->rateCountDiffRecord = rate_count_diff;
    + priv->rate_count_diff_rec = rate_count_diff;
    if (priv->undecorated_smoothed_pwdb >
    priv->rtllib->fsync_rssi_threshold &&
    bSwitchFromCountDiff) {
    @@ -2073,7 +2073,7 @@ static void _rtl92e_dm_fsync_timer_callback(struct timer_list *t)
    rtl92e_writeb(dev, 0xC36, 0x5c);
    rtl92e_writeb(dev, 0xC3e, 0x96);
    }
    - priv->ContinueDiffCount = 0;
    + priv->continue_diff_count = 0;
    rtl92e_writel(dev, rOFDM0_RxDetector2, 0x465c52cd);
    }
    }
    @@ -2114,7 +2114,7 @@ static void _rtl92e_dm_end_sw_fsync(struct net_device *dev)
    rtl92e_writeb(dev, 0xC3e, 0x96);
    }

    - priv->ContinueDiffCount = 0;
    + priv->continue_diff_count = 0;
    rtl92e_writel(dev, rOFDM0_RxDetector2, 0x465c52cd);
    }

    @@ -2125,8 +2125,8 @@ static void _rtl92e_dm_start_sw_fsync(struct net_device *dev)
    u32 rate_bitmap;

    priv->rate_record = 0;
    - priv->ContinueDiffCount = 0;
    - priv->rateCountDiffRecord = 0;
    + priv->continue_diff_count = 0;
    + priv->rate_count_diff_rec = 0;
    priv->bswitch_fsync = false;

    if (priv->rtllib->mode == WIRELESS_MODE_N_24G) {
    --
    2.39.0
    \
     
     \ /
      Last update: 2023-03-26 23:42    [W:5.092 / U:0.052 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site