From patchwork Sun Apr 16 07:20:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 83790 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1420518vqo; Sun, 16 Apr 2023 00:26:01 -0700 (PDT) X-Google-Smtp-Source: AKy350btK1KysE/ayzc2EJq/Zt0VUq/3e9cJFjc3K2q1NCJjg+jsYoRSp/omRmPeNh+Z/Y4D8GGL X-Received: by 2002:a17:90b:8ce:b0:23d:e2b:cf1f with SMTP id ds14-20020a17090b08ce00b0023d0e2bcf1fmr12279920pjb.16.1681629961074; Sun, 16 Apr 2023 00:26:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681629961; cv=none; d=google.com; s=arc-20160816; b=k520SUbRcDfPeJWQ225fqvWZmlfi69ZK6tF82jqfgPUJmJIi0jBNau/Ar4R5l+eV4m NP9BBfj3o5xwqqAZIhT8FhE4djqWcHyCCaQXbExacUEHJzHU2MZSoU+6EDnrYhiBw4gv J/Z90mAFIcXu5y+Wf9shClxIKPt1DIvBQPEWuf84i8SL/uZcgHYk8uDxPw4XqNMd77Jc Qm0XTp4UwzTFvt+JcBpzzWsSNdGTaIl987xJibBRhz4UaQULXwVhAY6lqhbvlZQ92Yzn 50Tx5/4AVUTQx8ZdMa/HGwxzqrm4KFjZRGGRULditd+BAmkG/gu2XuBqS1xMr/hDfW5m Rubw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:to:from:date:dkim-signature; bh=AUb4sZWN17aC9uOKE2iR6leNu0T6NHURX++nzdcY5IQ=; b=YAFajyPHbpC8ZMA8hgdnCiHbSmdVNEZgCM+RC/sqdcJw0fcjOe29QmDKykEruEaRmV L13FnFM94P6pCiRQ81rn3h+veaLAA5rh58srhB0+D3lzpocoUzh47IKbPnP/1cOyvD1S xN5dNr+jQbqNv/LPQzce+kWd5nv1wUcwq2Hn7wXw/TupnOGDxba8PxyXu7jIYOUbiIOf NG1dMUC7HW3fsvMHLsSRIKUZl63UtwW+dlbClp1xY4zazN8qTgwdt5Mwx8uE0AwHorCs wCcVVZDub89+BkNpZU82xQ4wlXtPRErcYlwvddBGSicIEU8YWf9ZeOCY3WHVeBce3Kt6 jiKg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=MylfWUa6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 18-20020a630112000000b0051820b42b56si6467614pgb.717.2023.04.16.00.25.48; Sun, 16 Apr 2023 00:26:01 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=MylfWUa6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230267AbjDPHUo (ORCPT + 99 others); Sun, 16 Apr 2023 03:20:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58274 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230232AbjDPHUi (ORCPT ); Sun, 16 Apr 2023 03:20:38 -0400 Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [IPv6:2a00:1450:4864:20::331]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ED91A30C7 for ; Sun, 16 Apr 2023 00:20:21 -0700 (PDT) Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-3f167d0cbb7so1330645e9.0 for ; Sun, 16 Apr 2023 00:20:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681629621; x=1684221621; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=AUb4sZWN17aC9uOKE2iR6leNu0T6NHURX++nzdcY5IQ=; b=MylfWUa6l5E2JtYJ7hpuPbEowIeba5IImp/dH6hgWNM0p9QGdUDaDmtisIubZwQikE mxbLM6ZUClNtfMR3LTvZcpcsGxu1aOWLXm2yEgq1hwd7Cw5rsfinlP41oSTV2yuf5i5b VJsHlBQBQpco06d6T6/kDyihQwNxfJWEKIpdYAP16tzjwrs4ugGWk1l1+il/z6qYeNPX /XENEnca5zJTrglitawS/ZrwzBcZLlUTuY33QE7DbTvi0lRwUVuLl1oGdyu+w8pZDJvU Dn083f7fDbTaIIsK2PKzZKG9anqP3xoYXaII+lj/QRY7onhngkOWpy84Lj8kq3YpJSxp lUKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681629621; x=1684221621; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=AUb4sZWN17aC9uOKE2iR6leNu0T6NHURX++nzdcY5IQ=; b=ZT2UfO9lXMJzGa6byw+78s0jktqnZ54sHTJTXWMexknywV2fsDTZRf50bSA77HDSwB mILcLGFvWbCOAdZIZiKFAh5mLPRXCYzB1DPp1rL3LfY4NSHxZK66Y45O5rYN6LXIJ0S9 RXVcO0UrF8uhhgft0mHBQ3CN1tDeCBGlGU6XI0wLqX2U65Hc58lEe7jqNAaFMlu090KN 2chqcbnCo3EW/4dULzXV09YcdNXRi61liIedh1bzJPqJfUxvZKb1duZqlTduFf27643w cakRvJX0BhlM/HEf8wfbp+Znu7aSwlCL4IR8BEzn4kTrPH/lylHbLBGNGBaskgyYk/92 lFgA== X-Gm-Message-State: AAQBX9eqQucwmNpEwgHBywqXVmY/j6b1xIoCeEQBPpd5DAF1NWVfsixb xIYCEdTGMdF/NwCKtdslgns= X-Received: by 2002:a5d:58d8:0:b0:2f7:ee2:c2a3 with SMTP id o24-20020a5d58d8000000b002f70ee2c2a3mr4343301wrf.3.1681629621442; Sun, 16 Apr 2023 00:20:21 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57935146.dip0.t-ipconnect.de. [87.147.81.70]) by smtp.gmail.com with ESMTPSA id d4-20020a056000114400b002cea8f07813sm7351663wrx.81.2023.04.16.00.20.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 16 Apr 2023 00:20:20 -0700 (PDT) Date: Sun, 16 Apr 2023 09:20:19 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 7/8] staging: rtl8192e: Remove unchanged variable frame_sync_monitor Message-ID: <0c4bdca5f5dbb93bb05c6b7f32136d4dfb3b0e4b.1681627603.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1763316817911642963?= X-GMAIL-MSGID: =?utf-8?q?1763316817911642963?= Remove unchanged variable frame_sync_monitor and equations that have always the same result to shorten code. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 2 - drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 73 ++++++++------------ 2 files changed, 30 insertions(+), 45 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h index 0eca73e4540f..c97e315a9091 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -382,8 +382,6 @@ struct r8192_priv { u32 continue_diff_count; bool bswitch_fsync; u8 framesync; - u8 frame_sync_monitor; - u32 reset_count; enum reset_type rst_progress; diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c index ed8b39d3c856..43e335ab0733 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c @@ -1826,7 +1826,6 @@ 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->frame_sync_monitor = 1; timer_setup(&priv->fsync_timer, _rtl92e_dm_fsync_timer_callback, 0); } @@ -2053,12 +2052,10 @@ static void _rtl92e_dm_check_fsync(struct net_device *dev) } } - if (priv->frame_sync_monitor) { - if (reg_c38_State != RegC38_Fsync_AP_BCM) { - rtl92e_writeb(dev, rOFDM0_RxDetector3, 0x95); + if (reg_c38_State != RegC38_Fsync_AP_BCM) { + rtl92e_writeb(dev, rOFDM0_RxDetector3, 0x95); - reg_c38_State = RegC38_Fsync_AP_BCM; - } + reg_c38_State = RegC38_Fsync_AP_BCM; } } else { switch (priv->rtllib->fsync_state) { @@ -2075,50 +2072,40 @@ static void _rtl92e_dm_check_fsync(struct net_device *dev) break; } - if (priv->frame_sync_monitor) { - if (priv->rtllib->state == RTLLIB_LINKED) { - if (priv->undecorated_smoothed_pwdb <= - RegC38_TH) { - if (reg_c38_State != - RegC38_NonFsync_Other_AP) { - rtl92e_writeb(dev, - rOFDM0_RxDetector3, - 0x90); - - reg_c38_State = - RegC38_NonFsync_Other_AP; - } - } else if (priv->undecorated_smoothed_pwdb >= - (RegC38_TH+5)) { - if (reg_c38_State) { - rtl92e_writeb(dev, - rOFDM0_RxDetector3, - priv->framesync); - reg_c38_State = RegC38_Default; - } + if (priv->rtllib->state == RTLLIB_LINKED) { + if (priv->undecorated_smoothed_pwdb <= + RegC38_TH) { + if (reg_c38_State != + RegC38_NonFsync_Other_AP) { + rtl92e_writeb(dev, + rOFDM0_RxDetector3, + 0x90); + + reg_c38_State = + RegC38_NonFsync_Other_AP; } - } else { + } else if (priv->undecorated_smoothed_pwdb >= + (RegC38_TH+5)) { if (reg_c38_State) { - rtl92e_writeb(dev, rOFDM0_RxDetector3, - priv->framesync); + rtl92e_writeb(dev, + rOFDM0_RxDetector3, + priv->framesync); reg_c38_State = RegC38_Default; } } + } else { + if (reg_c38_State) { + rtl92e_writeb(dev, rOFDM0_RxDetector3, + priv->framesync); + reg_c38_State = RegC38_Default; + } } } - if (priv->frame_sync_monitor) { - if (priv->reset_count != reset_cnt) { - rtl92e_writeb(dev, rOFDM0_RxDetector3, - priv->framesync); - reg_c38_State = RegC38_Default; - reset_cnt = priv->reset_count; - } - } else { - if (reg_c38_State) { - rtl92e_writeb(dev, rOFDM0_RxDetector3, - priv->framesync); - reg_c38_State = RegC38_Default; - } + if (priv->reset_count != reset_cnt) { + rtl92e_writeb(dev, rOFDM0_RxDetector3, + priv->framesync); + reg_c38_State = RegC38_Default; + reset_cnt = priv->reset_count; } }