staging: rtl8192e: Remove r8192_private_handler _rtl92e_wx_force_reset()
authorPhilipp Hortmann <philipp.g.hortmann@gmail.com>
Sun, 1 Oct 2023 13:45:27 +0000 (15:45 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 5 Oct 2023 07:58:47 +0000 (09:58 +0200)
Remove r8192_private_handler _rtl92e_wx_force_reset() as driver does not
reset. Remove dead code.

Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/8447643122088ff03dab65ac15e5e5199603008d.1696165351.git.philipp.g.hortmann@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8192e/rtl8192e/rtl_core.c
drivers/staging/rtl8192e/rtl8192e/rtl_core.h
drivers/staging/rtl8192e/rtl8192e/rtl_wx.c

index 2b91c481df93b68e653e3cf67aab1b77f70bb19b..c4688c273f4b00ea8067038568b8e91d3980e7bb 100644 (file)
@@ -754,7 +754,6 @@ static void _rtl92e_init_priv_variable(struct net_device *dev)
        priv->rfa_txpowertrackingindex = 0;
        priv->rfc_txpowertrackingindex = 0;
        priv->cck_pwr_enl = 6;
-       priv->force_reset = false;
        memset(priv->rtllib->swcamtable, 0, sizeof(struct sw_cam_table) * 32);
        priv->rx_ctr = 0;
        priv->rtllib->wx_set_enc = 0;
@@ -1130,8 +1129,6 @@ static void _rtl92e_watchdog_wq_cb(void *data)
                check_reset_cnt = 3;
        }
        spin_unlock_irqrestore(&priv->tx_lock, flags);
-
-       priv->force_reset = false;
 }
 
 static void _rtl92e_watchdog_timer_cb(struct timer_list *t)
index 0ebebb3c2c35409b10269c4dbf967a74d11e1230..deb707dfa4436e867181607e2cb9a22651b6cdfa 100644 (file)
@@ -371,7 +371,6 @@ struct r8192_priv {
 
        u16             tx_counter;
        u16             rx_ctr;
-       bool            force_reset;
        bool            force_lps;
 };
 
index 17e7fcc01f707d65da9ec1dbaf24c42260d2806e..ec09066f2f32ada62871aea69442312d9c7bd5fc 100644 (file)
@@ -141,19 +141,6 @@ static int _rtl92e_wx_set_rawtx(struct net_device *dev,
        return ret;
 }
 
-static int _rtl92e_wx_force_reset(struct net_device *dev,
-                                 struct iw_request_info *info,
-                                 union iwreq_data *wrqu, char *extra)
-{
-       struct r8192_priv *priv = rtllib_priv(dev);
-
-       mutex_lock(&priv->wx_mutex);
-
-       priv->force_reset = *extra;
-       mutex_unlock(&priv->wx_mutex);
-       return 0;
-}
-
 static int _rtl92e_wx_adapter_power_status(struct net_device *dev,
                                           struct iw_request_info *info,
                                           union iwreq_data *wrqu, char *extra)
@@ -1060,9 +1047,6 @@ static const struct iw_priv_args r8192_private_args[] = {
        }, {
                SIOCIWFIRSTPRIV + 0x2,
                IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "rawtx"
-       }, {
-               SIOCIWFIRSTPRIV + 0x3,
-               IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "forcereset"
        }, {
                SIOCIWFIRSTPRIV + 0x6,
                IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, IW_PRIV_TYPE_NONE,
@@ -1089,7 +1073,7 @@ static iw_handler r8192_private_handler[] = {
        (iw_handler)_rtl92e_wx_set_debug,   /*SIOCIWSECONDPRIV*/
        (iw_handler)_rtl92e_wx_set_scan_type,
        (iw_handler)_rtl92e_wx_set_rawtx,
-       (iw_handler)_rtl92e_wx_force_reset,
+       (iw_handler)NULL,
        (iw_handler)NULL,
        (iw_handler)NULL,
        (iw_handler)_rtl92e_wx_adapter_power_status,