lkml.org 
[lkml]   [2023]   [Oct]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 06/11] staging: rtl8192e: Remove unused variable reset_in_progress
    priv->reset_in_progress is set to false and never changed. All
    equations result accordingly. Remove dead code.

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

    diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
    index 7ca6a04d034c..9da858510211 100644
    --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
    +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
    @@ -1132,7 +1132,6 @@ static void _rtl92e_watchdog_wq_cb(void *data)
    spin_unlock_irqrestore(&priv->tx_lock, flags);

    priv->force_reset = false;
    - priv->reset_in_progress = false;
    }

    static void _rtl92e_watchdog_timer_cb(struct timer_list *t)
    @@ -1218,8 +1217,7 @@ static void _rtl92e_hard_data_xmit(struct sk_buff *skb, struct net_device *dev,
    MAX_DEV_ADDR_SIZE);
    u8 queue_index = tcb_desc->queue_index;

    - if ((priv->rtllib->rf_power_state == rf_off) || !priv->up ||
    - priv->reset_in_progress) {
    + if ((priv->rtllib->rf_power_state == rf_off) || !priv->up) {
    kfree_skb(skb);
    return;
    }
    @@ -1252,7 +1250,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->reset_in_progress) {
    + !priv->up) {
    kfree_skb(skb);
    return 0;
    }
    diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
    index 855bee78c674..fa5d0eec90d3 100644
    --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
    +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
    @@ -372,7 +372,6 @@ struct r8192_priv {

    u16 tx_counter;
    u16 rx_ctr;
    - 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 561ea68de56a..fd5228e7a462 100644
    --- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
    +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
    @@ -530,11 +530,6 @@ static void _rtl92e_dm_tx_power_tracking_callback_tssi(struct net_device *dev)
    if (Pwr_Flag == 0) {
    mdelay(1);

    - if (priv->reset_in_progress) {
    - rtl92e_writeb(dev, Pw_Track_Flag, 0);
    - rtl92e_writeb(dev, FW_Busy_Flag, 0);
    - return;
    - }
    if (priv->rtllib->rf_power_state != rf_on) {
    rtl92e_writeb(dev, Pw_Track_Flag, 0);
    rtl92e_writeb(dev, FW_Busy_Flag, 0);
    --
    2.42.0
    \
     
     \ /
      Last update: 2023-10-01 15:45    [W:3.615 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site