From nobody Sun Apr 28 22:55:31 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5F57EC4332F for ; Sat, 1 Oct 2022 09:40:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229545AbiJAJkn (ORCPT ); Sat, 1 Oct 2022 05:40:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45358 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229548AbiJAJki (ORCPT ); Sat, 1 Oct 2022 05:40:38 -0400 Received: from mail-ej1-x634.google.com (mail-ej1-x634.google.com [IPv6:2a00:1450:4864:20::634]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 367C043E69 for ; Sat, 1 Oct 2022 02:40:33 -0700 (PDT) Received: by mail-ej1-x634.google.com with SMTP id bj12so13446506ejb.13 for ; Sat, 01 Oct 2022 02:40:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:from:to:cc:subject:date; bh=odNlku/fCB1Yowy4jooGlZap4i4f7PBMesjt3jUU6no=; b=MgTFyiDKe6Bw+E1PreJyd5fK6VXZd8cTFxznwErue8pKqT4JCauVnWLVlumklLtOkm OBDytSP4TUPUCzYOWlwIVthvw5x/Q5+rHidxBqeG4ZQfgET4d5Zc0/Ro+TPURNyrD9Ls hgWJZFMw5vQ2JqujnN5C5KwJuL4Yd1vsQTTpXji549qVM/kXZ1HAjnA58WYaAnTZV2Bo EGauzP4IN4SwhAUVRl2pkh2NmIqwUSBMe4Ao7k7zUiOLM4VozpUmbiv+IcPPirnAdpRv iUlD/VhJGk1Rj7NzjVLCBb2Z8MqTQYiMre8gEwL50Cu+MFJraGDVNcCRmanpnRLw6Q+2 MYdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:x-gm-message-state:from:to:cc:subject:date; bh=odNlku/fCB1Yowy4jooGlZap4i4f7PBMesjt3jUU6no=; b=aDaPg3ETrTDOc4zzdOhoG86FBRel9HnroNPxtgwzuQpZ4gbKfg4UtUn0BXeX/Hrloi ii6s+juVZ6DRX7mA7qkBTbOoVVhtPwye1J/YsB/tB7E4HnlHUYb7g2eP8ryxpDmagGnj sBmdDpbOh+UlGzFAZkXK71tUr68uNOj66Gup7+7Kdn/jjIyj25dqbrnnMlFuYtGCf5UE ebHL0i8VM0LM4ZDZr1/kF1F/moMXC7Yz2ik945qdm+056p4NreubQONZFrrqa711Kfbp 9whRM0K538bKJdGj0cJQs8qOzbqcv3CU7qjF5JPA0icVWnY14amGnB7nBcLom7hIL3O/ Y+PA== X-Gm-Message-State: ACrzQf1GlW7pWWZHhraoBD6sDJBoCOPehq7CyDzsbZq5UEYC2+yGUoAe jFYsfHuhd61W66jKhn0rGBnbCnUUQOY= X-Google-Smtp-Source: AMsMyM7hkgs+NJuyji0aersw2hfU/2jVhWYKR2dOBHuRrB10wwtrzkJH8ZPOFfuC5yBObvR5J2TQbA== X-Received: by 2002:a17:907:1c9b:b0:783:43c:10b with SMTP id nb27-20020a1709071c9b00b00783043c010bmr9233340ejc.320.1664617231889; Sat, 01 Oct 2022 02:40:31 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57ba2cf5.dip0.t-ipconnect.de. [87.186.44.245]) by smtp.gmail.com with ESMTPSA id dn12-20020a05640222ec00b004585a21df62sm3319990edb.0.2022.10.01.02.40.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Oct 2022 02:40:31 -0700 (PDT) Date: Sat, 1 Oct 2022 11:40:29 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 01/10] staging: rtl8192e: Remove unchanged variable bFwCtrlLPS Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" bFwCtrlLPS is just once initialized and never changed. The evaluation will always have the same result. Remove resulting dead code. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 1 - drivers/staging/rtl8192e/rtl8192e/rtl_ps.c | 15 ++++----------- drivers/staging/rtl8192e/rtllib.h | 3 --- 3 files changed, 4 insertions(+), 15 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.c index 89bc989cffba..10b79003c633 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -889,7 +889,6 @@ static void _rtl92e_init_priv_variable(struct net_devic= e *dev) priv->rtllib->PowerSaveControl.bInactivePs =3D true; priv->rtllib->PowerSaveControl.bIPSModeBackup =3D false; priv->rtllib->PowerSaveControl.bLeisurePs =3D true; - priv->rtllib->PowerSaveControl.bFwCtrlLPS =3D false; priv->rtllib->LPSDelayCnt =3D 0; priv->rtllib->sta_sleep =3D LPS_IS_WAKE; priv->rtllib->rf_power_state =3D rf_on; diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c b/drivers/staging/r= tl8192e/rtl8192e/rtl_ps.c index 8c00b111ddb2..49c50ec21d04 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c @@ -229,11 +229,8 @@ void rtl92e_leisure_ps_enter(struct net_device *dev) if (pPSC->LpsIdleCount >=3D RT_CHECK_FOR_HANG_PERIOD) { =20 if (priv->rtllib->ps =3D=3D RTLLIB_PS_DISABLED) { - if (!pPSC->bFwCtrlLPS) { - if (priv->rtllib->SetFwCmdHandler) - priv->rtllib->SetFwCmdHandler( - dev, FW_CMD_LPS_ENTER); - } + if (priv->rtllib->SetFwCmdHandler) + priv->rtllib->SetFwCmdHandler(dev, FW_CMD_LPS_ENTER); _rtl92e_ps_set_mode(dev, RTLLIB_PS_MBCAST | RTLLIB_PS_UNICAST); } @@ -251,12 +248,8 @@ void rtl92e_leisure_ps_leave(struct net_device *dev) if (pPSC->bLeisurePs) { if (priv->rtllib->ps !=3D RTLLIB_PS_DISABLED) { _rtl92e_ps_set_mode(dev, RTLLIB_PS_DISABLED); - - if (!pPSC->bFwCtrlLPS) { - if (priv->rtllib->SetFwCmdHandler) - priv->rtllib->SetFwCmdHandler(dev, - FW_CMD_LPS_LEAVE); - } + if (priv->rtllib->SetFwCmdHandler) + priv->rtllib->SetFwCmdHandler(dev, FW_CMD_LPS_LEAVE); } } } diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/r= tllib.h index 3c72ed2a30a4..40bea71bcb22 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -1264,9 +1264,6 @@ struct rt_pwr_save_ctrl { =20 u32 CurPsLevel; u32 RegRfPsLevel; - - bool bFwCtrlLPS; - }; =20 #define RT_RF_CHANGE_SOURCE u32 --=20 2.37.3 From nobody Sun Apr 28 22:55:31 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 83BA9C433FE for ; Sat, 1 Oct 2022 09:41:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229675AbiJAJk7 (ORCPT ); Sat, 1 Oct 2022 05:40:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45316 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229722AbiJAJkp (ORCPT ); Sat, 1 Oct 2022 05:40:45 -0400 Received: from mail-ed1-x52d.google.com (mail-ed1-x52d.google.com [IPv6:2a00:1450:4864:20::52d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 25FC34AD5F for ; Sat, 1 Oct 2022 02:40:40 -0700 (PDT) Received: by mail-ed1-x52d.google.com with SMTP id c30so8806195edn.2 for ; Sat, 01 Oct 2022 02:40:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:from:to:cc:subject:date; bh=0UpbusMjYi3AOMkTCv2sFWZZfqa+P6NDlaD0VD5CbS0=; b=RZZ7IFnakfw1dGSC5/xOBYjytSIw85PBc/aHnqetPZWiCBu7lJhvtjlHFUF7hKYwHw RQ6nWidfy6SUzeBhPPu+QZ9UOsTHLR6PsAWAJBkoa2qbZYqEduVkEvqj7qd1866DnaAb C2+hlAMrYtPkgXBLe1yKiJVOEBa+wkVJf8kwKQFPN8gsvXmhZm2kXBSnnpjJXy37HVhR Kk5HLp/1lltTZm1FAoOj6IKoBkoHdTcxOkNDTYog1VShriSWBVxG0JwjxPKeKyMuC628 GdZYKAT51fb4x4cej6yNiV1VdNYQukEJ3zsIc0nfHbWrORo3Me3kejGJfTVAe+IA+oU/ LpSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:x-gm-message-state:from:to:cc:subject:date; bh=0UpbusMjYi3AOMkTCv2sFWZZfqa+P6NDlaD0VD5CbS0=; b=oTg1fc8NKAwHZ6zv4v/nR+16KBHFJAKULFcwtE3EVyDPNbMap4YLGJ0OmT1GaVEsLk S8VSqeYtKHYOnFxkgXxJO+ky3SwuPRMarNJzsnUtgZv+ShIkWU2MIfJrtdhmKjeqAfla RM5xkAXvFqgSqA3SCXDFJKXvHRFmDXoMe8XGDWsoYu+xJBbFQbPvzCEd9GB2lykNVvDC I93PiNRv1u6sYKHiwmqNQvB+rXKfNDxlRBad45drkp9Z5nD9mLHiJPvTigU00pm5+WF9 Z8LjYVvZPKgZnmirxvvDzvyWXFvYYRK+WGzShuYfE6lvWvrxu636zt3GJsPvR7S85cLZ M30w== X-Gm-Message-State: ACrzQf2TG3q2BAIGvEOugHaZf/VEZxYSB/xvdhdqipI/vKzPIFvMJuMi QR5ZOo9wVii1Au0AMTCYICIypFH4AgQ= X-Google-Smtp-Source: AMsMyM7Bu5QkwQXRQnmQ9nhmPWVlZXFC8AFljaIxu+cZ3JgtypgDEFvKkoSrKAgNMSMimNTV8KCGHA== X-Received: by 2002:a05:6402:5419:b0:457:c955:a40f with SMTP id ev25-20020a056402541900b00457c955a40fmr10774769edb.391.1664617238908; Sat, 01 Oct 2022 02:40:38 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57ba2cf5.dip0.t-ipconnect.de. [87.186.44.245]) by smtp.gmail.com with ESMTPSA id c63-20020a509fc5000000b00456f569f31dsm3184415edf.75.2022.10.01.02.40.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Oct 2022 02:40:38 -0700 (PDT) Date: Sat, 1 Oct 2022 11:40:36 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 02/10] staging: rtl8192e: Remove unchanged variable bInactivePs Message-ID: <9f46eebf8220a06a1889eaf2d6bac74dd08cfd1f.1664616227.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" bInactivePs is just once initialized and never changed. The evaluation will always have the same result. Remove resulting dead code. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/rtl_cam.c | 18 ++++--- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 1 - drivers/staging/rtl8192e/rtl8192e/rtl_ps.c | 49 +++++++++----------- drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 48 +++++++++---------- drivers/staging/rtl8192e/rtllib.h | 2 - 5 files changed, 51 insertions(+), 67 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c b/drivers/staging/= rtl8192e/rtl8192e/rtl_cam.c index 41faeb4b9b9b..8c3ce6cc2541 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c @@ -81,17 +81,15 @@ void rtl92e_set_key(struct net_device *dev, u8 EntryNo,= u8 KeyIndex, enum rt_rf_power_state rt_state; =20 rt_state =3D priv->rtllib->rf_power_state; - if (priv->rtllib->PowerSaveControl.bInactivePs) { - if (rt_state =3D=3D rf_off) { - if (priv->rtllib->rf_off_reason > RF_CHANGE_BY_IPS) { - netdev_warn(dev, "%s(): RF is OFF.\n", - __func__); - return; - } - mutex_lock(&priv->rtllib->ips_mutex); - rtl92e_ips_leave(dev); - mutex_unlock(&priv->rtllib->ips_mutex); + if (rt_state =3D=3D rf_off) { + if (priv->rtllib->rf_off_reason > RF_CHANGE_BY_IPS) { + netdev_warn(dev, "%s(): RF is OFF.\n", + __func__); + return; } + mutex_lock(&priv->rtllib->ips_mutex); + rtl92e_ips_leave(dev); + mutex_unlock(&priv->rtllib->ips_mutex); } priv->rtllib->is_set_key =3D true; if (EntryNo >=3D TOTAL_CAM_ENTRY) { diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.c index 10b79003c633..7c0fd2bce923 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -886,7 +886,6 @@ static void _rtl92e_init_priv_variable(struct net_devic= e *dev) priv->rf_change_in_progress =3D false; priv->bHwRfOffAction =3D 0; priv->SetRFPowerStateInProgress =3D false; - priv->rtllib->PowerSaveControl.bInactivePs =3D true; priv->rtllib->PowerSaveControl.bIPSModeBackup =3D false; priv->rtllib->PowerSaveControl.bLeisurePs =3D true; priv->rtllib->LPSDelayCnt =3D 0; diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c b/drivers/staging/r= tl8192e/rtl8192e/rtl_ps.c index 49c50ec21d04..fba86ef730b5 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c @@ -116,16 +116,14 @@ void rtl92e_ips_enter(struct net_device *dev) &(priv->rtllib->PowerSaveControl); enum rt_rf_power_state rt_state; =20 - if (pPSC->bInactivePs) { - rt_state =3D priv->rtllib->rf_power_state; - if (rt_state =3D=3D rf_on && !pPSC->bSwRfProcessing && - (priv->rtllib->state !=3D RTLLIB_LINKED) && - (priv->rtllib->iw_mode !=3D IW_MODE_MASTER)) { - pPSC->eInactivePowerState =3D rf_off; - priv->isRFOff =3D true; - priv->bInPowerSaveMode =3D true; - _rtl92e_ps_update_rf_state(dev); - } + rt_state =3D priv->rtllib->rf_power_state; + if (rt_state =3D=3D rf_on && !pPSC->bSwRfProcessing && + (priv->rtllib->state !=3D RTLLIB_LINKED) && + (priv->rtllib->iw_mode !=3D IW_MODE_MASTER)) { + pPSC->eInactivePowerState =3D rf_off; + priv->isRFOff =3D true; + priv->bInPowerSaveMode =3D true; + _rtl92e_ps_update_rf_state(dev); } } =20 @@ -136,14 +134,12 @@ void rtl92e_ips_leave(struct net_device *dev) &(priv->rtllib->PowerSaveControl); enum rt_rf_power_state rt_state; =20 - if (pPSC->bInactivePs) { - rt_state =3D priv->rtllib->rf_power_state; - if (rt_state !=3D rf_on && !pPSC->bSwRfProcessing && - priv->rtllib->rf_off_reason <=3D RF_CHANGE_BY_IPS) { - pPSC->eInactivePowerState =3D rf_on; - priv->bInPowerSaveMode =3D false; - _rtl92e_ps_update_rf_state(dev); - } + rt_state =3D priv->rtllib->rf_power_state; + if (rt_state !=3D rf_on && !pPSC->bSwRfProcessing && + priv->rtllib->rf_off_reason <=3D RF_CHANGE_BY_IPS) { + pPSC->eInactivePowerState =3D rf_on; + priv->bInPowerSaveMode =3D false; + _rtl92e_ps_update_rf_state(dev); } } =20 @@ -165,18 +161,15 @@ void rtl92e_rtllib_ips_leave_wq(struct net_device *de= v) enum rt_rf_power_state rt_state; =20 rt_state =3D priv->rtllib->rf_power_state; - - if (priv->rtllib->PowerSaveControl.bInactivePs) { - if (rt_state =3D=3D rf_off) { - if (priv->rtllib->rf_off_reason > RF_CHANGE_BY_IPS) { - netdev_warn(dev, "%s(): RF is OFF.\n", - __func__); - return; - } - netdev_info(dev, "=3D=3D=3D=3D=3D=3D=3D=3D=3D>%s(): rtl92e_ips_leave\n", + if (rt_state =3D=3D rf_off) { + if (priv->rtllib->rf_off_reason > RF_CHANGE_BY_IPS) { + netdev_warn(dev, "%s(): RF is OFF.\n", __func__); - schedule_work(&priv->rtllib->ips_leave_wq); + return; } + netdev_info(dev, "=3D=3D=3D=3D=3D=3D=3D=3D=3D>%s(): rtl92e_ips_leave\n", + __func__); + schedule_work(&priv->rtllib->ips_leave_wq); } } =20 diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c b/drivers/staging/r= tl8192e/rtl8192e/rtl_wx.c index 4920cb49e381..12eea4fcb9dd 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c @@ -252,22 +252,20 @@ static int _rtl92e_wx_set_mode(struct net_device *dev, mutex_lock(&priv->wx_mutex); if (wrqu->mode =3D=3D IW_MODE_ADHOC || wrqu->mode =3D=3D IW_MODE_MONITOR = || ieee->bNetPromiscuousMode) { - if (priv->rtllib->PowerSaveControl.bInactivePs) { - if (rt_state =3D=3D rf_off) { - if (priv->rtllib->rf_off_reason > - RF_CHANGE_BY_IPS) { - netdev_warn(dev, "%s(): RF is OFF.\n", - __func__); - mutex_unlock(&priv->wx_mutex); - return -1; - } - netdev_info(dev, - "=3D=3D=3D=3D=3D=3D=3D=3D=3D>%s(): rtl92e_ips_leave\n", + if (rt_state =3D=3D rf_off) { + if (priv->rtllib->rf_off_reason > + RF_CHANGE_BY_IPS) { + netdev_warn(dev, "%s(): RF is OFF.\n", __func__); - mutex_lock(&priv->rtllib->ips_mutex); - rtl92e_ips_leave(dev); - mutex_unlock(&priv->rtllib->ips_mutex); + mutex_unlock(&priv->wx_mutex); + return -1; } + netdev_info(dev, + "=3D=3D=3D=3D=3D=3D=3D=3D=3D>%s(): rtl92e_ips_leave\n", + __func__); + mutex_lock(&priv->rtllib->ips_mutex); + rtl92e_ips_leave(dev); + mutex_unlock(&priv->rtllib->ips_mutex); } } ret =3D rtllib_wx_set_mode(priv->rtllib, a, wrqu, b); @@ -414,19 +412,17 @@ static int _rtl92e_wx_set_scan(struct net_device *dev, priv->rtllib->FirstIe_InScan =3D true; =20 if (priv->rtllib->state !=3D RTLLIB_LINKED) { - if (priv->rtllib->PowerSaveControl.bInactivePs) { - if (rt_state =3D=3D rf_off) { - if (priv->rtllib->rf_off_reason > - RF_CHANGE_BY_IPS) { - netdev_warn(dev, "%s(): RF is OFF.\n", - __func__); - mutex_unlock(&priv->wx_mutex); - return -1; - } - mutex_lock(&priv->rtllib->ips_mutex); - rtl92e_ips_leave(dev); - mutex_unlock(&priv->rtllib->ips_mutex); + if (rt_state =3D=3D rf_off) { + if (priv->rtllib->rf_off_reason > + RF_CHANGE_BY_IPS) { + netdev_warn(dev, "%s(): RF is OFF.\n", + __func__); + mutex_unlock(&priv->wx_mutex); + return -1; } + mutex_lock(&priv->rtllib->ips_mutex); + rtl92e_ips_leave(dev); + mutex_unlock(&priv->rtllib->ips_mutex); } rtllib_stop_scan(priv->rtllib); if (priv->rtllib->LedControlHandler) diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/r= tllib.h index 40bea71bcb22..d23d1c3ce39b 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -1250,8 +1250,6 @@ enum rt_rf_power_state { }; =20 struct rt_pwr_save_ctrl { - - bool bInactivePs; bool bIPSModeBackup; bool bSwRfProcessing; enum rt_rf_power_state eInactivePowerState; --=20 2.37.3 From nobody Sun Apr 28 22:55:31 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 698D0C433FE for ; Sat, 1 Oct 2022 09:41:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229650AbiJAJlP (ORCPT ); Sat, 1 Oct 2022 05:41:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45610 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229794AbiJAJk6 (ORCPT ); Sat, 1 Oct 2022 05:40:58 -0400 Received: from mail-ej1-x62d.google.com (mail-ej1-x62d.google.com [IPv6:2a00:1450:4864:20::62d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6E0A8476D9 for ; Sat, 1 Oct 2022 02:40:53 -0700 (PDT) Received: by mail-ej1-x62d.google.com with SMTP id a26so13513870ejc.4 for ; Sat, 01 Oct 2022 02:40:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:from:to:cc:subject:date; bh=1MtTj3cT/5VTPlvXh/pGzQBDICycaSPpTW526Zz8N3w=; b=EW8byPsve0k20XTqJ0YLQ5udpxEwQaGE7Wjls6o6hzjAdfhVZnGIxUdxoEsjfrO6Zi I+2FS4yKyjIzR0c7yGST3t35VzfblDiZNLi4p9S14aioUTdiUgfL3O0WavMDi+lA1ulg 0gNq7kMV0EhOsFQBwGdWjHgicBhxbeNiEh6rLXqUMPj668CDgNmYbLoT0ypddf/KwibV RZT38zoBNUw17SSDbigfUrRrBTQJLcfcmT1WtgVEOXdj2bnJchJqRDGxaA4Picgex5Kv yL2ZwkL8lDvBgMy6iuY8/At/bQ2SqQErwwXRui+XB7ZpnK8UgMAAQTPbJq41ZQ88+VoS kVhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:x-gm-message-state:from:to:cc:subject:date; bh=1MtTj3cT/5VTPlvXh/pGzQBDICycaSPpTW526Zz8N3w=; b=XZpPOqB2aDans9mssho3kpO8O8LqxJbe1M2UbDG0rHqrL03dmhAYAx8mBCo/FRvzqy OHwb9nHGrQGD93+9bVxdQMeoCeff5FxJHMDV4F57ajONxOdgA+j1Crll7W3DHx/6fgH5 PYcPde/FslLJx28LtcrkkxVfxJvzPQL9yoGORKJ5sN4S56UtDh7oHa+F/4ArnAIlYPhE /o2/aOdTIb2Odw541Ee3QTtWwy/gOgf1awD4W5lXDW+vF0NxUsMFfcXHYzmz/gTYGOmQ d6Ha2tUAgZM9TYYwEbdf7Dx4vygV8KeITewoXldyKj6fjkR2U5zHa8EXPUrzXL7LWcr3 EQZA== X-Gm-Message-State: ACrzQf2C/1S5lRnyBkdLZnhhnoRa8dLGh1V0wiBwGmFgQTlV1jfEmWWC SCxBtT4iYJCf4xG073UU8f4= X-Google-Smtp-Source: AMsMyM5oFGYyDqHQAUn8E/FsLBHdUUxu5CKP0PRBhzvVZgEc0urh2Gdfke6Zwj6t96mBjfIGd+wI2w== X-Received: by 2002:a17:907:1b1f:b0:72f:56db:cce9 with SMTP id mp31-20020a1709071b1f00b0072f56dbcce9mr8884418ejc.605.1664617251958; Sat, 01 Oct 2022 02:40:51 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57ba2cf5.dip0.t-ipconnect.de. [87.186.44.245]) by smtp.gmail.com with ESMTPSA id bq10-20020a170906d0ca00b0073c82539183sm2464476ejb.91.2022.10.01.02.40.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Oct 2022 02:40:51 -0700 (PDT) Date: Sat, 1 Oct 2022 11:40:49 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 03/10] staging: rtl8192e: Remove unused variable bIPSModeBackup Message-ID: <657035f84d266fd5c6f96e9b530a96c2ab4ff900.1664616227.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" bIPSModeBackup is just once initialized and never used. Remove resulting dead code. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 1 - drivers/staging/rtl8192e/rtllib.h | 1 - 2 files changed, 2 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.c index 7c0fd2bce923..cbb65cfea83a 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -886,7 +886,6 @@ static void _rtl92e_init_priv_variable(struct net_devic= e *dev) priv->rf_change_in_progress =3D false; priv->bHwRfOffAction =3D 0; priv->SetRFPowerStateInProgress =3D false; - priv->rtllib->PowerSaveControl.bIPSModeBackup =3D false; priv->rtllib->PowerSaveControl.bLeisurePs =3D true; priv->rtllib->LPSDelayCnt =3D 0; priv->rtllib->sta_sleep =3D LPS_IS_WAKE; diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/r= tllib.h index d23d1c3ce39b..e0fa87b12ceb 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -1250,7 +1250,6 @@ enum rt_rf_power_state { }; =20 struct rt_pwr_save_ctrl { - bool bIPSModeBackup; bool bSwRfProcessing; enum rt_rf_power_state eInactivePowerState; enum ips_callback_function ReturnPoint; --=20 2.37.3 From nobody Sun Apr 28 22:55:31 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id F248FC433FE for ; Sat, 1 Oct 2022 09:41:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229853AbiJAJlV (ORCPT ); Sat, 1 Oct 2022 05:41:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47094 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229749AbiJAJlB (ORCPT ); Sat, 1 Oct 2022 05:41:01 -0400 Received: from mail-ej1-x62d.google.com (mail-ej1-x62d.google.com [IPv6:2a00:1450:4864:20::62d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E0E7B48E92 for ; Sat, 1 Oct 2022 02:40:59 -0700 (PDT) Received: by mail-ej1-x62d.google.com with SMTP id hy2so13479815ejc.8 for ; Sat, 01 Oct 2022 02:40:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:from:to:cc:subject:date; bh=tiHEeB6TjFnhc8x7qSHIzbwC1sWIPqTA0JDil3Jab/8=; b=PRunBM/zgiMysLtVxGQ/cec3nGW1rX8/tgYvx3oqT8xNd4zXZYXqG2pFXRHnSVHM8q NgMXWRtDtH6SDuR10iexHPCZjTwtUh0xOsk4C5ayRhkBMEzPFvVPbvcj1y0Xefrs2VEB +7BW+s2kqJbG6VaXKigjrdDOj7sRVUqiOMzOMvj7NF4NkfHZrkDcrKMite5CKXb80E4L ZlHieikXlMjwtDVQXOSpme/BdmTUWtYTS/y5SRB31YnNe1gST9PCc3N8xEZJlk5lDPz+ YIFPAETvdzolgljipkN6kfqvexBkEmaE1WCm48ZCGDs+miitiMYn0WvtXhn+T8mJG2mk uTUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:x-gm-message-state:from:to:cc:subject:date; bh=tiHEeB6TjFnhc8x7qSHIzbwC1sWIPqTA0JDil3Jab/8=; b=c3RF/z6Hq5NbP7NF1EIx2sCASnnHmTHYWx/mLPiIkSh4RoNoHcJlO8y/AziozToEFm fntUGwm9L7l5QT+WQXX2wCXPAgS9Z//sqZdpbjBFHkwAOwElNiOvEGKxIqJMrcBWzFA2 1GCJ/f1uD321nky9aM2hugHbVphw5Et5/6/Ne7hCVRx6i4PyxfyY79BKhYaigcxZZjD2 dZjTgFEso7TTwtei2QOPfzX2lYnRBNi4dAcOtgOGgDxuB64Cel1jrKP4Lc2mHy0Yv/Y6 LY5IoQfbJ1PlpCxa9YmTnWyc8XkYh8pGt69YvEnE6gzPUVh4pJHJuzc/nQSMwlzj6WRX FGPw== X-Gm-Message-State: ACrzQf13tuLO4yaimleMSd/g40Hz4Aexc1TPMRtOk/XJqXdYtXTO/Wea YkrncDfzbu3YEjO4mp2ZtqM= X-Google-Smtp-Source: AMsMyM68p6g31K1WfupGcvPa5F9voDNuO8IsIu6mvUojneC/8jfGxwPVErFJQ4ohP7YYvIwkngBsZQ== X-Received: by 2002:a17:907:78b:b0:741:3d29:33d2 with SMTP id xd11-20020a170907078b00b007413d2933d2mr9653610ejb.103.1664617258527; Sat, 01 Oct 2022 02:40:58 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57ba2cf5.dip0.t-ipconnect.de. [87.186.44.245]) by smtp.gmail.com with ESMTPSA id pk5-20020a170906d7a500b0077016f4c6d4sm2487384ejb.55.2022.10.01.02.40.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Oct 2022 02:40:58 -0700 (PDT) Date: Sat, 1 Oct 2022 11:40:56 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 04/10] staging: rtl8192e: Remove unused variable bInPowerSaveMode Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" bInPowerSaveMode is just once initialized and changed but never evaluated. Remove resulting dead code. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 1 - drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 1 - drivers/staging/rtl8192e/rtl8192e/rtl_ps.c | 2 -- 3 files changed, 4 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.c index cbb65cfea83a..db55b9b65192 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -881,7 +881,6 @@ static void _rtl92e_init_priv_variable(struct net_devic= e *dev) priv->hw_radio_off =3D false; priv->RegRfOff =3D false; priv->isRFOff =3D false; - priv->bInPowerSaveMode =3D false; priv->rtllib->rf_off_reason =3D 0; priv->rf_change_in_progress =3D false; priv->bHwRfOffAction =3D 0; diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.h index 7021f9c435d9..28733dc2038b 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -475,7 +475,6 @@ struct r8192_priv { =20 bool RegRfOff; bool isRFOff; - bool bInPowerSaveMode; u8 bHwRfOffAction; =20 bool rf_change_in_progress; diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c b/drivers/staging/r= tl8192e/rtl8192e/rtl_ps.c index fba86ef730b5..1ced5bcebdab 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c @@ -122,7 +122,6 @@ void rtl92e_ips_enter(struct net_device *dev) (priv->rtllib->iw_mode !=3D IW_MODE_MASTER)) { pPSC->eInactivePowerState =3D rf_off; priv->isRFOff =3D true; - priv->bInPowerSaveMode =3D true; _rtl92e_ps_update_rf_state(dev); } } @@ -138,7 +137,6 @@ void rtl92e_ips_leave(struct net_device *dev) if (rt_state !=3D rf_on && !pPSC->bSwRfProcessing && priv->rtllib->rf_off_reason <=3D RF_CHANGE_BY_IPS) { pPSC->eInactivePowerState =3D rf_on; - priv->bInPowerSaveMode =3D false; _rtl92e_ps_update_rf_state(dev); } } --=20 2.37.3 From nobody Sun Apr 28 22:55:31 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 30514C433F5 for ; Sat, 1 Oct 2022 09:41:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229606AbiJAJlg (ORCPT ); Sat, 1 Oct 2022 05:41:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46464 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229814AbiJAJlK (ORCPT ); Sat, 1 Oct 2022 05:41:10 -0400 Received: from mail-ed1-x530.google.com (mail-ed1-x530.google.com [IPv6:2a00:1450:4864:20::530]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4BDB45F109 for ; Sat, 1 Oct 2022 02:41:07 -0700 (PDT) Received: by mail-ed1-x530.google.com with SMTP id a41so8793604edf.4 for ; Sat, 01 Oct 2022 02:41:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:from:to:cc:subject:date; bh=Mm6M11oSPXoaRRBYLI9i9vIPcpu5jQ8WX2bWiDMVzWQ=; b=G6PsKa4ofVBU3Bq+tnNmvkdK9/erY1cQM7aH2RPCn4yP7Mr49qv3teuO0LdlxTnK5V 76cgq0XIWdyC2wO5nxYU8iJGQKKlzsrvCnaWZt67t+79e8WQ9zeOuIQq3ppnQRFSOslY 3EsrJJWbiLficXEFgCv5k+I3/K3DwtCaAKiqM2B6f6levAu/b0R2PxSLNsTq7yghS95Z uCtnU8kliF7MiDcxEN/vanp8ZY1u0KeWeuDy6BMcXWWYBuSsK1kqmkDDlnVtS+BHelGt ViivfjrtFbLZxJ6Jl7Pizt22cKpDcLKtgx8FvusAE4baNLThQF0053vuAwn2Pr1+tbka B69A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:x-gm-message-state:from:to:cc:subject:date; bh=Mm6M11oSPXoaRRBYLI9i9vIPcpu5jQ8WX2bWiDMVzWQ=; b=14ZU9T07soAyL+7zh2ro4eocsrmptAwFJxBZXRqmKZFKlbcM2FVcTciBp4lMNyEt+L cybaflVNq11S6xikdModCOmYoIMgTxDMgDErDMINHR5YDzQuBKdOa82F7445QAT9UC5A 2tYbWsphGfeFj/G4Lmxafs7CuzZJ/wXuds7Rfqa5uEK2yPJyutwPPYqTMzaKs6YK7L6Z RHbHopeBZeUrQW/xuTBpKmWEexW+HaUup17bkKYk3Mvs3p6335scCjaRyb0mPzRLmjOR kgFIvX6CpJx0GwmxuThO7P2R4XvgWvviblIk1xdBSbbJhpXoo3bWSUtYVNkYWeKugEPn rCXg== X-Gm-Message-State: ACrzQf3gnCXvw2Edorf5dKs2gTYAZuH16M627nTZfIYpS5hUkDvz7qXE vXR/fwKv/wdUNCyMxGs70go= X-Google-Smtp-Source: AMsMyM5p1maCVgENB6nH5wHfBkXxPAXAtRBr083llPSO5WVjpKYjH0TltyQADQ/CPwYwEwEibpad/g== X-Received: by 2002:a05:6402:4402:b0:453:6a9:ef8a with SMTP id y2-20020a056402440200b0045306a9ef8amr10594494eda.85.1664617266496; Sat, 01 Oct 2022 02:41:06 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57ba2cf5.dip0.t-ipconnect.de. [87.186.44.245]) by smtp.gmail.com with ESMTPSA id ky22-20020a170907779600b0074ae59d85a4sm2456884ejc.20.2022.10.01.02.41.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Oct 2022 02:41:06 -0700 (PDT) Date: Sat, 1 Oct 2022 11:41:04 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 05/10] staging: rtl8192e: Remove unused variable isRFOff Message-ID: <53242638126775f6698fdcfc49ac552a4e08578b.1664616227.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" isRFOff is just once initialized and changed but never evaluated. Remove resulting dead code. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 1 - drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 1 - drivers/staging/rtl8192e/rtl8192e/rtl_ps.c | 1 - 3 files changed, 3 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.c index db55b9b65192..3cddc9a86f28 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -880,7 +880,6 @@ static void _rtl92e_init_priv_variable(struct net_devic= e *dev) priv->rtllib->wx_set_enc =3D 0; priv->hw_radio_off =3D false; priv->RegRfOff =3D false; - priv->isRFOff =3D false; priv->rtllib->rf_off_reason =3D 0; priv->rf_change_in_progress =3D false; priv->bHwRfOffAction =3D 0; diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.h index 28733dc2038b..23dccd6079ea 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -474,7 +474,6 @@ struct r8192_priv { u16 ChannelPlan; =20 bool RegRfOff; - bool isRFOff; u8 bHwRfOffAction; =20 bool rf_change_in_progress; diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c b/drivers/staging/r= tl8192e/rtl8192e/rtl_ps.c index 1ced5bcebdab..1501f7be8eee 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c @@ -121,7 +121,6 @@ void rtl92e_ips_enter(struct net_device *dev) (priv->rtllib->state !=3D RTLLIB_LINKED) && (priv->rtllib->iw_mode !=3D IW_MODE_MASTER)) { pPSC->eInactivePowerState =3D rf_off; - priv->isRFOff =3D true; _rtl92e_ps_update_rf_state(dev); } } --=20 2.37.3 From nobody Sun Apr 28 22:55:31 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A9E7AC433FE for ; Sat, 1 Oct 2022 09:41:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229839AbiJAJlo (ORCPT ); Sat, 1 Oct 2022 05:41:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46552 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229689AbiJAJlP (ORCPT ); Sat, 1 Oct 2022 05:41:15 -0400 Received: from mail-ed1-x52d.google.com (mail-ed1-x52d.google.com [IPv6:2a00:1450:4864:20::52d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A3EE08051D for ; Sat, 1 Oct 2022 02:41:14 -0700 (PDT) Received: by mail-ed1-x52d.google.com with SMTP id m15so8773367edb.13 for ; Sat, 01 Oct 2022 02:41:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:from:to:cc:subject:date; bh=aCkr8qk5ZO2rVhVTWEWIP6+TWOWpwdW6xSFiVrbuIos=; b=PL/XzRHpegfVqBK8FO6quJouUt7zG3NxP5g4qA/AUNVfwGkAbOJawvlWPKmHnCVRuT qm9GEYpCljIhIP1hFmWXV/8S8UofuEgIYUtf2EEuJDSjzYjsSp3UGm7okE8rBvuBoWqS ZNfkDnGsoKaY3rFVqRdVLhVGFBQEoLNh5lB/4nBLzSNNmeaG2ZTFwbiJiImy1gtxH17d dHFnQE3IWMKDSHtMsgwjd4z7ro00FhFWIqx7nAcj0K4MgLaMwpDW748yPOrMCrXZ8DUD M1dXRz7dV5VsV6MfgSeDVQGvOdFacW+iV9Ww3Opi93qneuirUJ5rj+kYjZKbzSuUKSkw 1vnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:x-gm-message-state:from:to:cc:subject:date; bh=aCkr8qk5ZO2rVhVTWEWIP6+TWOWpwdW6xSFiVrbuIos=; b=XJaIFB3BWj1HSRJ9GUYGLU/Y3OgyN/glD74exfe8mIuLsIVp4lXhTpfgM5/htIDlpI N92a2N/tayPOtViMomCVIkSz6nK1moxS1GTTHUMWw0iOCo4yw+pC6SZ53HN+mSlZHxZH kQ4LqbRCpfkK8428ghukxcvJFg6RCLxY1Vfb7Pket0YPxZFaIdPCk9iXcjjdLiXFAGOC glu+OW6lDsqsYXSrHDbu2F1LYt3QX6W3LfgDP2yVJqrQgvtuFpyL7cpJyLK08+vmq+Pd IazWL/mIRmPwbxYA3u6ybi5mQ6SxctWV2W25GK4Mi4g9mPFRkETE1kW4LMY+/bZmU1lI +hKg== X-Gm-Message-State: ACrzQf0j7zP4v4oawMz2ljEPaHxh5pvORSes8l/QIBOnRtl2j/wE2kRU SuXG/4lbZo95gLi6clMkzWGIdfmd9G0= X-Google-Smtp-Source: AMsMyM5/KC85qeACNLVaRwtsvESTas+p8tyMuovWELs50vRMetEmUrf1/9jJ7DaEyNf9dxnyMVGNTQ== X-Received: by 2002:a05:6402:1e8d:b0:454:79a9:201f with SMTP id f13-20020a0564021e8d00b0045479a9201fmr11221668edf.176.1664617272811; Sat, 01 Oct 2022 02:41:12 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57ba2cf5.dip0.t-ipconnect.de. [87.186.44.245]) by smtp.gmail.com with ESMTPSA id rp9-20020a170906d96900b0077fb63da010sm2449730ejb.114.2022.10.01.02.41.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Oct 2022 02:41:12 -0700 (PDT) Date: Sat, 1 Oct 2022 11:41:10 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 06/10] staging: rtl8192e: Remove unchanged variable RegRfOff Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" RegRfOff is just once initialized with false and then set to false again. All evaluations will result in false. Remove resulting dead code. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 7 +------ drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 1 - drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 1 - drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 2 -- 4 files changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_dev.c index 18e4e5d84878..f2cbec6eb08f 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -624,9 +624,6 @@ bool rtl92e_start_adapter(struct net_device *dev) } priv->pFirmware->status =3D FW_STATUS_0_INIT; =20 - if (priv->RegRfOff) - priv->rtllib->rf_power_state =3D rf_off; - ulRegRead =3D rtl92e_readl(dev, CPU_GEN); if (priv->pFirmware->status =3D=3D FW_STATUS_0_INIT) ulRegRead |=3D CPU_GEN_SYSTEM_RESET; @@ -756,9 +753,7 @@ bool rtl92e_start_adapter(struct net_device *dev) =20 rtl92e_writeb(dev, 0x87, 0x0); =20 - if (priv->RegRfOff) { - rtl92e_set_rf_state(dev, rf_off, RF_CHANGE_BY_SW); - } else if (priv->rtllib->rf_off_reason > RF_CHANGE_BY_PS) { + if (priv->rtllib->rf_off_reason > RF_CHANGE_BY_PS) { rtl92e_set_rf_state(dev, rf_off, priv->rtllib->rf_off_reason); } else if (priv->rtllib->rf_off_reason >=3D RF_CHANGE_BY_IPS) { rtl92e_set_rf_state(dev, rf_off, priv->rtllib->rf_off_reason); diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_phy.c index 1b592258e640..a44dffa76a39 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c @@ -1325,7 +1325,6 @@ static bool _rtl92e_set_rf_power_state(struct net_dev= ice *dev, =20 do { InitilizeCount--; - priv->RegRfOff =3D false; rtstatus =3D rtl92e_enable_nic(dev); } while (!rtstatus && (InitilizeCount > 0)); =20 diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.c index 3cddc9a86f28..e77a73df9bc5 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -879,7 +879,6 @@ static void _rtl92e_init_priv_variable(struct net_devic= e *dev) priv->RxCounter =3D 0; priv->rtllib->wx_set_enc =3D 0; priv->hw_radio_off =3D false; - priv->RegRfOff =3D false; priv->rtllib->rf_off_reason =3D 0; priv->rf_change_in_progress =3D false; priv->bHwRfOffAction =3D 0; diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.h index 23dccd6079ea..7d716fa12995 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -472,8 +472,6 @@ struct r8192_priv { =20 u16 RegChannelPlan; u16 ChannelPlan; - - bool RegRfOff; u8 bHwRfOffAction; =20 bool rf_change_in_progress; --=20 2.37.3 From nobody Sun Apr 28 22:55:31 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id ABD26C433FE for ; Sat, 1 Oct 2022 09:42:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229782AbiJAJl7 (ORCPT ); Sat, 1 Oct 2022 05:41:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46756 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229812AbiJAJlZ (ORCPT ); Sat, 1 Oct 2022 05:41:25 -0400 Received: from mail-ej1-x62d.google.com (mail-ej1-x62d.google.com [IPv6:2a00:1450:4864:20::62d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B033258149 for ; Sat, 1 Oct 2022 02:41:22 -0700 (PDT) Received: by mail-ej1-x62d.google.com with SMTP id a26so13515246ejc.4 for ; Sat, 01 Oct 2022 02:41:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:from:to:cc:subject:date; bh=O4Um8Ahpe4fGsaE3pfc2y2JDj9dfhTxsFAj901n8Dqc=; b=G1OfJFwuWmNwBOInZiSVDuwNpThyDHrbZPk2OhZvZliL2z5cByO0DmZreG2tvgdzGd Ihw/YpLkJ1qVBqQVOE0iRcMDNPPq+gJdeMedrMyBXoWDpgQL2Yyg0OMyJCSUBq05TJWr iywTsRQbj8Ao5Dsrfy6lbFiyacMg5fPMokfr55bOqtMnCwye8AIPRa+F2AUyuKFkciuu k7lgImuzSZ5huB01B1jTmGXPcbby370h2CfXyy3D8VuXKahjAahZd/w7/dAMKVFAiHmz gEXYBO7uZ0f+WOHZQ2gkAekbtJDhvcsuEc6Lqmy4hgHcTNhahSav/vF7zC7OWV678Zm9 01SA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:x-gm-message-state:from:to:cc:subject:date; bh=O4Um8Ahpe4fGsaE3pfc2y2JDj9dfhTxsFAj901n8Dqc=; b=YTW2nkRnfRpksZFHGOVfWF4R8Ntzlj3rLYrCA5esPsgLwx2AwfWbkbfIFs5VkZc6wX vdvQxRihwFKi85I34JgraUYllwUBdJhFbe/0J0fUXw8KUZchUljW9Cb+BgfJuv+ATz9A aaaAxp0ZQYudCgP0LT9x9SHuOfz0l+LytOXpMb4uAzSG7leVnHka0OVcgrddbRjuecdw YFKbdKjIh/trC9N50Nu7IH8pGkAINhOhGw11qg5ZubABaPyEkklLddQdSSGaycO6wY7M H9ygCyONTWWpHwLswKz6vIo8qDNGClQ2FD0LMe4dKFmQj3o6MrfQozgXktokJqyB4cvR NBqw== X-Gm-Message-State: ACrzQf0dwqkyPFme1XX5Gz6zQNxiAgoNayyhNVkNJIlnlqsfbw5bbUkn T+wRkKRbtXztFhkaZPE9Gn0= X-Google-Smtp-Source: AMsMyM4RHLCJYhDiLDCAtJw+NmB8sEODCHPwUt4syAxkCB01VCxoDS4o6OyKjeq+8wpAEq9FOPNruA== X-Received: by 2002:a17:907:a4e:b0:77d:94d:8148 with SMTP id be14-20020a1709070a4e00b0077d094d8148mr8818059ejc.607.1664617280851; Sat, 01 Oct 2022 02:41:20 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57ba2cf5.dip0.t-ipconnect.de. [87.186.44.245]) by smtp.gmail.com with ESMTPSA id r4-20020aa7cfc4000000b0044f21c69608sm3258698edy.10.2022.10.01.02.41.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Oct 2022 02:41:20 -0700 (PDT) Date: Sat, 1 Oct 2022 11:41:18 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 07/10] staging: rtl8192e: Remove unchanged variable bDisableNormalResetCheck Message-ID: <026313f17cf708bf8fa0661f83b2c2b515e55b12.1664616227.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" bDisableNormalResetCheck is just once initialized with false. All evaluations will result in !false. Remove resulting dead code. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 6 ++---- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 1 - 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.c index e77a73df9bc5..9dcae5d71fb9 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -871,7 +871,6 @@ static void _rtl92e_init_priv_variable(struct net_devic= e *dev) priv->ScanDelay =3D 50; priv->ResetProgress =3D RESET_TYPE_NORESET; priv->bForcedSilentReset =3D false; - priv->bDisableNormalResetCheck =3D false; priv->force_reset =3D false; memset(priv->rtllib->swcamtable, 0, sizeof(struct sw_cam_table) * 32); =20 @@ -1403,13 +1402,12 @@ static void _rtl92e_watchdog_wq_cb(void *data) } spin_unlock_irqrestore(&priv->tx_lock, flags); =20 - if (!priv->bDisableNormalResetCheck && ResetType =3D=3D RESET_TYPE_NORMAL= ) { + if (ResetType =3D=3D RESET_TYPE_NORMAL) { priv->ResetProgress =3D RESET_TYPE_NORMAL; return; } =20 - if (((priv->force_reset) || (!priv->bDisableNormalResetCheck && - ResetType =3D=3D RESET_TYPE_SILENT))) + if ((priv->force_reset || ResetType =3D=3D RESET_TYPE_SILENT)) _rtl92e_if_silent_reset(dev); priv->force_reset =3D false; priv->bForcedSilentReset =3D false; diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.h index 7d716fa12995..8a24037a93ec 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -541,7 +541,6 @@ struct r8192_priv { =20 enum reset_type ResetProgress; bool bForcedSilentReset; - bool bDisableNormalResetCheck; u16 TxCounter; u16 RxCounter; bool bResetInProgress; --=20 2.37.3 From nobody Sun Apr 28 22:55:31 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 874E1C433FE for ; Sat, 1 Oct 2022 09:42:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229586AbiJAJmH (ORCPT ); Sat, 1 Oct 2022 05:42:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45354 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229563AbiJAJlg (ORCPT ); Sat, 1 Oct 2022 05:41:36 -0400 Received: from mail-ej1-x62e.google.com (mail-ej1-x62e.google.com [IPv6:2a00:1450:4864:20::62e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C86BDC1486 for ; Sat, 1 Oct 2022 02:41:28 -0700 (PDT) Received: by mail-ej1-x62e.google.com with SMTP id lh5so13457437ejb.10 for ; Sat, 01 Oct 2022 02:41:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:from:to:cc:subject:date; bh=1UXfEwG6W+kKP5gjdCvT8XoeJBtVWkn+le2gvc+19Bo=; b=ddgWHzAmhkc62h3MIwIf8SIiSgihb1YrpJGwzeNuZRCyjVwYuw8OeK+hKfpT+4Wotf 8C1RAb1nhz1i1nVSbLt91EJwPd45xIIWOff2+S0Kgmc66iEdpeIqy1rynQj5NCIml4F0 NbSKhgNPL2dm7jfRKXAyCwsaE5UG5PrvZwIAx8y3/36MxNtcnCXTHbYIwxn4fZxwOakL NkhSO4KXPFMKPsG5MugwgYwPorS0ZDznVB3qEIHUmuRJ5rirDdVGrh8roEsB7vPrAuHE 1AC0YKB7L2Kg8j675EDahPwwswrnHmmvQ/K8nVwwpr0MtRo2HRCLy54brXhuJfXgUnmd U4sQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:x-gm-message-state:from:to:cc:subject:date; bh=1UXfEwG6W+kKP5gjdCvT8XoeJBtVWkn+le2gvc+19Bo=; b=l0V6rXaWhB2cuUQm+VFRs3G/sj5VTON8YXLsIDUKS73zxdP/qjP7e62gHT0uLRr/ds wpHyuLe1aN0pSLBm1ppJJRN9EQFr12LL5ajYnbseCH23vmF+qSS4eKxY73LVjPhNlJGp NFqGvDifN2F8QYRJWVZh5BRJJn1SIaRvJsVRerU41D6jv7jZBuOL5JKlPAhzFirrOxZj KTYWms+rVgDLx5VHQv/kmH6gTBQNNEvKHKMW4G6P4Ly/x7Gwx/25lHa94l5D5ftdAlJx rRUoBlQ8MEuQLNx0Fw9H6+qI2OZKrthQ14cC/pajnt5Xj7szG0ii9fSLjSknGb4PUhnr Nljg== X-Gm-Message-State: ACrzQf3WZMjJ1FRt37JB/jhcxs0H4zmsrEFFumoZiAUWHhIUym8th11A 9ickc/DTzDIkjPwKaI8dtwbxXkh/t4U= X-Google-Smtp-Source: AMsMyM5ZuO0Ab5wX8LEbVB1bK0w1BKuSxjO5/35e20d4DBuFxCJmNz+C/m6ftGIxDgRqQwjTtSzujw== X-Received: by 2002:a17:907:9717:b0:783:b2e4:23de with SMTP id jg23-20020a170907971700b00783b2e423demr8922396ejc.364.1664617286887; Sat, 01 Oct 2022 02:41:26 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57ba2cf5.dip0.t-ipconnect.de. [87.186.44.245]) by smtp.gmail.com with ESMTPSA id 10-20020a170906200a00b0074136cac2e7sm2422132ejo.81.2022.10.01.02.41.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Oct 2022 02:41:26 -0700 (PDT) Date: Sat, 1 Oct 2022 11:41:24 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 08/10] staging: rtl8192e: Remove unused variable bForcedSilentReset Message-ID: <10504e628eae110d73cd43050e7cc5801ce7f17b.1664616227.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" bForcedSilentReset is never evaluated. Remove resulting dead code. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 4 ---- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 1 - 2 files changed, 5 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.c index 9dcae5d71fb9..ae0fcbbee2bb 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -870,7 +870,6 @@ static void _rtl92e_init_priv_variable(struct net_devic= e *dev) priv->CckPwEnl =3D 6; priv->ScanDelay =3D 50; priv->ResetProgress =3D RESET_TYPE_NORESET; - priv->bForcedSilentReset =3D false; priv->force_reset =3D false; memset(priv->rtllib->swcamtable, 0, sizeof(struct sw_cam_table) * 32); =20 @@ -1240,8 +1239,6 @@ static void _rtl92e_if_silent_reset(struct net_device= *dev) END: priv->ResetProgress =3D RESET_TYPE_NORESET; priv->reset_count++; - - priv->bForcedSilentReset =3D false; priv->bResetInProgress =3D false; =20 rtl92e_writeb(dev, UFWP, 1); @@ -1410,7 +1407,6 @@ static void _rtl92e_watchdog_wq_cb(void *data) if ((priv->force_reset || ResetType =3D=3D RESET_TYPE_SILENT)) _rtl92e_if_silent_reset(dev); priv->force_reset =3D false; - priv->bForcedSilentReset =3D false; priv->bResetInProgress =3D false; } =20 diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.h index 8a24037a93ec..763ed761bb38 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -540,7 +540,6 @@ struct r8192_priv { u32 reset_count; =20 enum reset_type ResetProgress; - bool bForcedSilentReset; u16 TxCounter; u16 RxCounter; bool bResetInProgress; --=20 2.37.3 From nobody Sun Apr 28 22:55:31 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D50E5C433F5 for ; Sat, 1 Oct 2022 09:42:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229891AbiJAJmT (ORCPT ); Sat, 1 Oct 2022 05:42:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46154 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229747AbiJAJly (ORCPT ); Sat, 1 Oct 2022 05:41:54 -0400 Received: from mail-ej1-x636.google.com (mail-ej1-x636.google.com [IPv6:2a00:1450:4864:20::636]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A6BBFC7444 for ; Sat, 1 Oct 2022 02:41:35 -0700 (PDT) Received: by mail-ej1-x636.google.com with SMTP id dv25so13465348ejb.12 for ; Sat, 01 Oct 2022 02:41:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:from:to:cc:subject:date; bh=QebgOJCMMd7aL0SENMI3D3xLF5otmlOv1Qyo2XKNJuc=; b=EfNGeGd1tInuCofbuCama1/NKS6boZJHSdKp0qCIKseKBhXD+6AUG8tFcyzm1eR/zg GC0ET1ZtDwCw2fCI5hQfw49fOHxf48OD27hH9tVaviPntpT++viHX5+Hri13IlROwNS9 YNhyzMZNt1Hs+1tgnSsytE1FeVweIYq0UAp4fg0unOdn9/aZO+swKuKmDWhA08WAG0j1 pefswubvqxvQ/wzzsO6RAKspURqe8ISRnB51NOy83cW01vgpgm4cxzO0OS0ea58eD+Jd ig64wlO6z6ErH6vWekUNem849NKX2FN4BtPGAupis0NC9I2Wq/fqgJ0qoOW5q7iZrJ3m 5GYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:x-gm-message-state:from:to:cc:subject:date; bh=QebgOJCMMd7aL0SENMI3D3xLF5otmlOv1Qyo2XKNJuc=; b=RvouR8u2cV4eTSzZE1WQyQ3sTJmK/crmZUQI5f5703lclnqMHxM9yycxGo49aZNgYA j4jweMZ2aNmC/2NPb41RZ+TMb91FbK4cZNZhqRawgoCNkAiCWjJonu1QDD5EcHO8DGTU /ivMCjn2qA4kEMqwuKfPgbNiX5rm2mFo5Qk2MiQ3mpH9FCp2DYBsgXNGsNjxmV5VDmis 9BTRDNSY5bRBPxi7EFmea+0E6xU1IB54CuNkchmOJ0qREPJD7K+AVLhWOYOx6PIx+lHo 2x4iQ5f+F1jybZpx1fkk6CE9V9sC6ot9AOTI+ZXvVeIHlsgdUDOfHtquVRAHnbf/sbEl +DEQ== X-Gm-Message-State: ACrzQf2BI5cHR7W4NBKODJmnb1uuzxiNxWEJodd21jykQl5NeXr2qVOk Y718RwZwgfg0gNOFkxIOwRHsXao+uO0= X-Google-Smtp-Source: AMsMyM4E0nxncAwpRHl8Bp0FOW1Fnwd0w6TGq8XVIdTq7xRnbRjyz293H+ghyCotrWdMFXb1Fmp4ow== X-Received: by 2002:a17:907:2c77:b0:77c:59aa:c011 with SMTP id ib23-20020a1709072c7700b0077c59aac011mr9410696ejc.724.1664617294208; Sat, 01 Oct 2022 02:41:34 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57ba2cf5.dip0.t-ipconnect.de. [87.186.44.245]) by smtp.gmail.com with ESMTPSA id i26-20020a50fc1a000000b00457c9b7ac07sm3220134edr.84.2022.10.01.02.41.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Oct 2022 02:41:33 -0700 (PDT) Date: Sat, 1 Oct 2022 11:41:31 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 09/10] staging: rtl8192e: Remove unused variable ScanDelay Message-ID: <13d0b993d077490c65768f2b11a631a447f8e86f.1664616227.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" ScanDelay is never evaluated. Remove resulting dead code. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 1 - drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 1 - drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 2 -- 3 files changed, 4 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_dev.c index f2cbec6eb08f..c3dcaa27fd2e 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -503,7 +503,6 @@ static void _rtl92e_read_eeprom_info(struct net_device = *dev) priv->ChannelPlan =3D 0x0; break; case EEPROM_CID_Nettronix: - priv->ScanDelay =3D 100; priv->CustomerID =3D RT_CID_Nettronix; break; case EEPROM_CID_Pronet: diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.c index ae0fcbbee2bb..f07f0fc690a3 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -868,7 +868,6 @@ static void _rtl92e_init_priv_variable(struct net_devic= e *dev) priv->rfa_txpowertrackingindex =3D 0; priv->rfc_txpowertrackingindex =3D 0; priv->CckPwEnl =3D 6; - priv->ScanDelay =3D 50; priv->ResetProgress =3D RESET_TYPE_NORESET; priv->force_reset =3D false; memset(priv->rtllib->swcamtable, 0, sizeof(struct sw_cam_table) * 32); diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.h index 763ed761bb38..c536131ecd5d 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -410,8 +410,6 @@ struct r8192_priv { short chan; short sens; short max_sens; - - u8 ScanDelay; bool ps_force; =20 u32 irq_mask[2]; --=20 2.37.3 From nobody Sun Apr 28 22:55:31 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3B0E5C433F5 for ; Sat, 1 Oct 2022 09:42:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229822AbiJAJmX (ORCPT ); Sat, 1 Oct 2022 05:42:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46830 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229780AbiJAJl5 (ORCPT ); Sat, 1 Oct 2022 05:41:57 -0400 Received: from mail-ed1-x531.google.com (mail-ed1-x531.google.com [IPv6:2a00:1450:4864:20::531]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BF0B2816B9 for ; Sat, 1 Oct 2022 02:41:42 -0700 (PDT) Received: by mail-ed1-x531.google.com with SMTP id m3so8784098eda.12 for ; Sat, 01 Oct 2022 02:41:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:from:to:cc:subject:date; bh=Ca9/JtjBAXJ7Q/8G7d35DLgFmFXGEU6y4hZXwsO0isA=; b=CgBGAp8RNTb0dLB7cxjyWocMCTUYTjRUlaCLbpBUUXE/v3vW8YOasfJF9JNuq3MKlf CBl/ozhfugPlpwjPgJKX0LkrlTS6xjkunpxlEdLpD8Ndg3kK8spa9MmE2+GrabCjwNtX LVrHBgnLdtAtHLuq57f08s+c/mdIo6DHL5cMpHkGIO3+EA06818U7YRqxwMLI0rOZnw8 NLCB6GyNOUOiCMrnDnX8eJA1GTQpNfljbO4Lr2Gij2fVsk31ILcBXHBTXvF5CgzmSJ3+ WRGJ59FBSY1rOxs92dANuuCOgSxk0Nk5X2esfKZJEAS4ZxxnxTG3V1QBDMZyoQGUCwgl /iDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:x-gm-message-state:from:to:cc:subject:date; bh=Ca9/JtjBAXJ7Q/8G7d35DLgFmFXGEU6y4hZXwsO0isA=; b=nt7OdFGcny4B7tU9uoi/RYKj6gf0ZSNKZJbhA3ExPy/9U0Zyds0qo+eGevSaVf8i9W BTvRBWeIIWoK+9b0S8fLjfA+1B0sy0/jWq67KAOgsAe8Wpf8Zi0jQaSBpPAk2ulHriyG /SneTB8UmX5hHADVS37QgP1WBt/Ku0psiO7vEAxstcsQjqLTv6hRVULu6ycYC22OXgBC jRikyDrQzzOwpzGSQ/c2ujyVZ9SPfYN0qN2e+wszM/OvcxWuHEKieDUX/TW/qZEGWzt9 kQWMrKyAsClKX7gX9ZFtuBrNM3fb7YgNeHvtMIpgxOfJoYAEV6IunaO4y6+InqXVb/1q eJuw== X-Gm-Message-State: ACrzQf094Ff0pfSieRjKEQOZHIBiuTOh+P6DBtn+0KO2tjEGdwfl5t0/ Baj2Z7zRgogBn1fRBBw5McQ= X-Google-Smtp-Source: AMsMyM65+/F7PMcMt7l0HNHwPmRBYZP58HiM14eRdaqKqNMSqnxNCyc6U4obN4KkD0gw1O/Mj9vADg== X-Received: by 2002:a05:6402:518d:b0:451:6655:5fb4 with SMTP id q13-20020a056402518d00b0045166555fb4mr11036255edd.150.1664617300895; Sat, 01 Oct 2022 02:41:40 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57ba2cf5.dip0.t-ipconnect.de. [87.186.44.245]) by smtp.gmail.com with ESMTPSA id p12-20020a17090653cc00b0074150f51d86sm2442272ejo.162.2022.10.01.02.41.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Oct 2022 02:41:40 -0700 (PDT) Date: Sat, 1 Oct 2022 11:41:38 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 10/10] staging: rtl8192e: Remove unused variable bDriverIsGoingToUnload Message-ID: <48a84cbe359f159cc9c296b261256a405ee3884e.1664616227.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" bDriverIsGoingToUnload is never evaluated. Remove resulting dead code. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 3 --- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 1 - 2 files changed, 4 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.c index f07f0fc690a3..213aac943ef7 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -686,7 +686,6 @@ static int _rtl92e_sta_up(struct net_device *dev, bool = is_silent_reset) (&priv->rtllib->PowerSaveControl); bool init_status; =20 - priv->bDriverIsGoingToUnload =3D false; priv->bdisable_nic =3D false; =20 priv->up =3D 1; @@ -735,7 +734,6 @@ static int _rtl92e_sta_down(struct net_device *dev, boo= l shutdownrf) if (priv->rtllib->state =3D=3D RTLLIB_LINKED) rtl92e_leisure_ps_leave(dev); =20 - priv->bDriverIsGoingToUnload =3D true; priv->up =3D 0; priv->rtllib->ieee_up =3D 0; priv->bfirst_after_down =3D true; @@ -838,7 +836,6 @@ static void _rtl92e_init_priv_variable(struct net_devic= e *dev) priv->polling_timer_on =3D 0; priv->up_first_time =3D 1; priv->blinked_ingpio =3D false; - priv->bDriverIsGoingToUnload =3D false; priv->being_init_adapter =3D false; priv->initialized_at_probe =3D false; priv->bdisable_nic =3D false; diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.h index c536131ecd5d..1ae3c77e2fef 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -311,7 +311,6 @@ struct r8192_priv { bool bfirst_after_down; bool initialized_at_probe; bool being_init_adapter; - bool bDriverIsGoingToUnload; =20 int irq; short irq_enabled; --=20 2.37.3