From nobody Sun Sep 14 12:20:25 2025 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 3CA1FC27C76 for ; Sat, 21 Jan 2023 21:45:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229667AbjAUVo7 (ORCPT ); Sat, 21 Jan 2023 16:44:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37738 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229587AbjAUVo6 (ORCPT ); Sat, 21 Jan 2023 16:44:58 -0500 Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com [IPv6:2a00:1450:4864:20::332]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1B52D2748F for ; Sat, 21 Jan 2023 13:44:57 -0800 (PST) Received: by mail-wm1-x332.google.com with SMTP id f19-20020a1c6a13000000b003db0ef4dedcso8118054wmc.4 for ; Sat, 21 Jan 2023 13:44:57 -0800 (PST) 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:message-id:reply-to; bh=/ZoNlyGEzH+kRtX90Fp6TGkEBqbyFKQBWafIzoqpx24=; b=gULpFAAhxcluTbRql5M1HyxwCkBQDxBZ+Tag4Rz4pndbVmvE8u/2CMFIWVKRyP6Vn3 1IcTQL93KsokkQCdS+tueBh2wMTu6D8jIJbrHVpA6JB0ygKQyF6YeeL8E++WCkGqNNv/ 5dA1aYTFhVSDHPjpvGZsknke1UmiEDDugBFrj1IiLKUOvoDEv9ChhuGemMVqp1zS9zF1 OZXasDcVb5x3+wYEjWdn9Ma+hSkJT1qqzSxit/XkWpk0gRXoOMBVLLBa7ORc52IWsXd2 sa3Uqp6tsbymBKZ+FVe6724c4vo9eMZVCHxmXlq5neHOjNSoddlS0+cqoE/HBDRJ2wEj UwPg== 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 :message-id:reply-to; bh=/ZoNlyGEzH+kRtX90Fp6TGkEBqbyFKQBWafIzoqpx24=; b=KR3fZ20ouv5hxixRBNUDimhp/O8O4Fe8pbUK0+60+4BWL95tXPOEKHu555Cq6KLwqx rZnqQQx0TDPtmF8evcKk0iowq9tRHqGtLob7t014l8oYX+PwJZ6dXO1rWsPNk3uEXUhG JDayGDPg0y4bA1aWmjx+QB3qgaXyG7huGZ3eLokcQPa2gTz+bsBybgKUggEcQ3tY5bxE WWkGGSYnugckr+RFIYSvUpG3Uxdm40vX2WBZf2/XEDwR/TcAxo8rSbnkHL10ODEvNrj2 6hoT+yWX6DZpWYPyGOvgqogW2e0SZ9KRsKf5YKfKXD98FQjsq5ZDIQXMrqB3HfJ9F/sY AGHg== X-Gm-Message-State: AFqh2ko2Kf/P1i1T60F1C6kH/8EBbUxPnZmQuLA117n06uTChmBMuxZu gCOS7kT0mvm7cxno89RhksJckuekCpY= X-Google-Smtp-Source: AMrXdXuXHtG0IVkGciFWV03e7ox79YQN8u3OPYVVrHgR9UM1otsGKleDBu7N825XRzuAMj2yHt5Eow== X-Received: by 2002:a05:600c:3b06:b0:3d3:446a:b493 with SMTP id m6-20020a05600c3b0600b003d3446ab493mr5089729wms.4.1674337495560; Sat, 21 Jan 2023 13:44:55 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p57935ca5.dip0.t-ipconnect.de. [87.147.92.165]) by smtp.gmail.com with ESMTPSA id m31-20020a05600c3b1f00b003dafadd2f77sm6956549wms.1.2023.01.21.13.44.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Jan 2023 13:44:54 -0800 (PST) Date: Sat, 21 Jan 2023 22:44:53 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 1/3] staging: rtl8192e: Remove unused variable bfirst_init 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" bfirst_init is six times set but never evaluated. Remove 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, 7 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.c index 7a89381bae50..80450d46191c 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -692,16 +692,13 @@ static int _rtl92e_sta_up(struct net_device *dev, boo= l is_silent_reset) priv->rtllib->ieee_up =3D 1; =20 priv->up_first_time =3D 0; - priv->bfirst_init =3D true; init_status =3D priv->ops->initialize_adapter(dev); if (!init_status) { netdev_err(dev, "%s(): Initialization failed!\n", __func__); - priv->bfirst_init =3D false; return -1; } =20 RT_CLEAR_PS_LEVEL(psc, RT_RF_OFF_LEVL_HALT_NIC); - priv->bfirst_init =3D false; =20 if (priv->polling_timer_on =3D=3D 0) rtl92e_check_rfctrl_gpio_timer(&priv->gpio_polling_timer); @@ -837,7 +834,6 @@ static void _rtl92e_init_priv_variable(struct net_devic= e *dev) priv->blinked_ingpio =3D false; priv->being_init_adapter =3D false; priv->bdisable_nic =3D false; - priv->bfirst_init =3D false; priv->txringcount =3D 64; priv->rxbuffersize =3D 9100; priv->rxringcount =3D MAX_RX_COUNT; @@ -2423,7 +2419,6 @@ bool rtl92e_enable_nic(struct net_device *dev) return false; } =20 - priv->bfirst_init =3D true; init_status =3D priv->ops->initialize_adapter(dev); if (!init_status) { netdev_warn(dev, "%s(): Initialization failed!\n", __func__); @@ -2431,7 +2426,6 @@ bool rtl92e_enable_nic(struct net_device *dev) return false; } RT_CLEAR_PS_LEVEL(psc, RT_RF_OFF_LEVL_HALT_NIC); - priv->bfirst_init =3D false; =20 rtl92e_irq_enable(dev); priv->bdisable_nic =3D false; diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.h index 59049ad349e0..e0f4a3b444ee 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -298,7 +298,6 @@ struct r8192_priv { struct pci_dev *pdev; struct pci_dev *bridge_pdev; =20 - bool bfirst_init; bool bfirst_after_down; bool being_init_adapter; =20 --=20 2.39.0 From nobody Sun Sep 14 12:20:25 2025 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 4BBF7C38142 for ; Sat, 21 Jan 2023 21:45:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229710AbjAUVpI (ORCPT ); Sat, 21 Jan 2023 16:45:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37986 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229587AbjAUVpG (ORCPT ); Sat, 21 Jan 2023 16:45:06 -0500 Received: from mail-wr1-x42f.google.com (mail-wr1-x42f.google.com [IPv6:2a00:1450:4864:20::42f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DD00C27D7B for ; Sat, 21 Jan 2023 13:45:04 -0800 (PST) Received: by mail-wr1-x42f.google.com with SMTP id n7so7683257wrx.5 for ; Sat, 21 Jan 2023 13:45:04 -0800 (PST) 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:message-id:reply-to; bh=HOjq/wSj4ryBWQj1clILRiIoFo7/d98llcbQTtn/TrQ=; b=UjiSJtWuendmrcUDy4s+WBMI9ZMTln9rTrCvhPe0uKtB5fp8RV/sfS2KYikHlBWg8o DZ/EWwrdQs7N+3H2qi7Hs7cKFpOTUfmj85rQao0BhDedGbGbVhalkpA1ZTJopIC+mz/X JC6GBcNSZEH6aw3IR1q0s0W34Ypj6moddR9hy5rHI20czFVvp8C4wGLz35zQt93ZBy16 fGmFj72KLKLyEYI5bQXlLnXXOo1B/MdPMl2Fvd1Hjx+LjXM50ooc9zVGSfDg5lG+gIIi vO5KBjRgqlblXh7ci6BeQ8m2+bpStovMRR81D3z9SNNf+3WjnYruDU468sWen6s+FdJo iksQ== 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 :message-id:reply-to; bh=HOjq/wSj4ryBWQj1clILRiIoFo7/d98llcbQTtn/TrQ=; b=wpRw5G8zTOXycOYNwwjtD7luV9+AwWOX/Pjmuw9tWknfK9P/jISa6L0PXiOMh5VtCc QUMLNbGvheGDGNJh3BEns2SAwA6Cm6H+7h3LdmS3jZz9N3AKrVMMTrMeMGzS//Ewarej 5BYspBAzoy7VXrRX4VtVLKYn7OHhVgb2JQKb5BFaVPNHLfnY+nNy5eOmgnxnc9Ddwbvu SVo/PKXdDscye7VKtGSozcqQSfbxESYYVwMBu6+M4Kqhc65rRmxHsuH+K8tJqtkgw0LK U1xFzrxdmBJyq9oigd3GIFotjM4lzFSkbnNKOcmFIfhfY5CPPXUS+wFGdjFAtCmVScGv E3QA== X-Gm-Message-State: AFqh2koeLaz6VZ/ca574hISlrQQOfzwY+LtV2izzuWk2HUbIt7mfYUVu QsHEpXMAMF4bv1hj/MGm090= X-Google-Smtp-Source: AMrXdXuqkjqGrmMBf1DAnqlFfdvPpMtdDPeB59Zf2H4RExxurqZQhJkvcwhfStlPkwGuLSkTODHgDw== X-Received: by 2002:a5d:5d0c:0:b0:2be:5402:18e7 with SMTP id ch12-20020a5d5d0c000000b002be540218e7mr1675873wrb.5.1674337503058; Sat, 21 Jan 2023 13:45:03 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p57935ca5.dip0.t-ipconnect.de. [87.147.92.165]) by smtp.gmail.com with ESMTPSA id r11-20020a5d694b000000b002bb28209744sm559375wrw.31.2023.01.21.13.45.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Jan 2023 13:45:02 -0800 (PST) Date: Sat, 21 Jan 2023 22:44:59 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 2/3] staging: rtl8192e: Rename eeprom_CustomerID, SwChnlStage and SwChnlStep Message-ID: <0d2e7bbd3a2f80d4652d4131c82294e172a2de30.1674336211.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" Rename variable eeprom_CustomerID to eeprom_customer_id, SwChnlStage to sw_chnl_stage and SwChnlStep to sw_chnl_step to avoid CamelCase which is not accepted by checkpatch. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 6 +++--- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 8 ++++---- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_dev.c index b721bb72007d..6c570582479d 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -303,7 +303,7 @@ static void _rtl92e_read_eeprom_info(struct net_device = *dev) =20 usValue =3D rtl92e_eeprom_read(dev, (EEPROM_Customer_ID >> 1)) >> 8; - priv->eeprom_CustomerID =3D usValue & 0xff; + priv->eeprom_customer_id =3D usValue & 0xff; usValue =3D rtl92e_eeprom_read(dev, EEPROM_ICVersion_ChannelPlan>>1); priv->eeprom_chnl_plan =3D usValue&0xff; @@ -327,7 +327,7 @@ static void _rtl92e_read_eeprom_info(struct net_device = *dev) priv->card_8192_version =3D VERSION_8190_BD; priv->eeprom_vid =3D 0; priv->eeprom_did =3D 0; - priv->eeprom_CustomerID =3D 0; + priv->eeprom_customer_id =3D 0; priv->eeprom_chnl_plan =3D 0; } =20 @@ -449,7 +449,7 @@ static void _rtl92e_read_eeprom_info(struct net_device = *dev) if (priv->eeprom_vid =3D=3D 0x1186 && priv->eeprom_did =3D=3D 0x3304) priv->customer_id =3D RT_CID_DLINK; =20 - switch (priv->eeprom_CustomerID) { + switch (priv->eeprom_customer_id) { case EEPROM_CID_DEFAULT: priv->customer_id =3D RT_CID_DEFAULT; break; diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_phy.c index 95a21859c7e0..ca10a14c63b4 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c @@ -907,8 +907,8 @@ static void _rtl92e_phy_switch_channel(struct net_devic= e *dev, u8 channel) u32 delay =3D 0; =20 while (!_rtl92e_phy_switch_channel_step(dev, channel, - &priv->SwChnlStage, - &priv->SwChnlStep, &delay)) { + &priv->sw_chnl_stage, + &priv->sw_chnl_step, &delay)) { if (delay > 0) msleep(delay); if (!priv->up) @@ -971,8 +971,8 @@ u8 rtl92e_set_channel(struct net_device *dev, u8 channe= l) =20 priv->chan =3D channel; =20 - priv->SwChnlStage =3D 0; - priv->SwChnlStep =3D 0; + priv->sw_chnl_stage =3D 0; + priv->sw_chnl_step =3D 0; =20 if (priv->up) _rtl92e_phy_switch_channel_work_item(dev); diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.h index e0f4a3b444ee..55a68bbe3861 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -417,7 +417,7 @@ struct r8192_priv { short epromtype; u16 eeprom_vid; u16 eeprom_did; - u8 eeprom_CustomerID; + u8 eeprom_customer_id; u16 eeprom_chnl_plan; =20 u8 eeprom_tx_pwr_level_cck[14]; @@ -432,8 +432,8 @@ struct r8192_priv { u8 thermal_meter[2]; =20 u8 sw_chnl_in_progress; - u8 SwChnlStage; - u8 SwChnlStep; + u8 sw_chnl_stage; + u8 sw_chnl_step; u8 set_bw_mode_in_progress; =20 u8 n_cur_40mhz_prime_sc; --=20 2.39.0 From nobody Sun Sep 14 12:20:25 2025 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 37C9AC38142 for ; Sat, 21 Jan 2023 21:45:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229780AbjAUVpf (ORCPT ); Sat, 21 Jan 2023 16:45:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38586 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229812AbjAUVp2 (ORCPT ); Sat, 21 Jan 2023 16:45:28 -0500 Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E40C428844 for ; Sat, 21 Jan 2023 13:45:14 -0800 (PST) Received: by mail-wr1-x433.google.com with SMTP id q5so3024073wrv.0 for ; Sat, 21 Jan 2023 13:45:14 -0800 (PST) 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:message-id:reply-to; bh=2Vx5DSmr5lxiARhdcInV5kBQVKTGumAreM6/77gMk5Q=; b=NYqxFwmMFi55/wN5xzVXFQr9rFmK0pvxpTENnmcWmqFN2T5kanNE6fpfB4EVBATjZ/ bWpr/Xtue1/20LK/GBLns8y2nnOgCREwH3OqeA/TXxjpSxgkjKGqLl+k1KAkAe0DzjXY wz7UkrEZRJA9CkEwbWaOb9dd1/oWbsSfexOo4h2z22eJgYRyU+qeKRd1Cft9cHsBVNzZ LU66XQjVQ9yrktaBgYg/y9LG0iN+NsuUD8ecIxFyd/BYwzd/3y77ubSsah5JIccH0xk6 9edButdmPEUKSuAhf+jPlX5WLh9R/6cvttGdSJesaOXyJtro33Vm3+rO+L+EHz12jmpJ OSUQ== 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 :message-id:reply-to; bh=2Vx5DSmr5lxiARhdcInV5kBQVKTGumAreM6/77gMk5Q=; b=F5TZpR1QerZUKISxdgfgJb6uGZ7X6aVfgpjcGjHLI+bYbIN0dOEh4iXGxFRQR/7mfH N4OWx/n1vX2MADI3SGZZCCESWCvO3wO39DaXJgw3pMhSGt7WzfZhgQ+RNeDdvnW7IrAE IngorGaWkccy4TF0tq6xNo5AInXFvdF0feASZ+ag+e/ny70C01jRVB1Q4ovli4f1sko8 xrOp+sw0doVgciAfO1lMd+XfGKyaP2XPe/p1wNLnZ3y6H4KMrxdgI5Hdw2zyEMBImG2f uccr6graXsQNckytJP3R1hBsmiH32y7/ayt81ZLwMiHDdgdbZ/t7CfZWoV7XsJoG8TJZ qk8A== X-Gm-Message-State: AFqh2kqnlqV1NFyuMSXESnhNd6Rg7MhwHQHcR58tDh1FRUzo1qc6MzMn WVuHcsk9+P6+KSVwebpz0Aw= X-Google-Smtp-Source: AMrXdXtmsf6qVmtghFPEzqERxS3oXnXFsy8wzNRBO1n+Xc3iJ2vrvHK4W43gpcnBrz64eep2+fr3HQ== X-Received: by 2002:a5d:4b47:0:b0:2bf:9437:30f0 with SMTP id w7-20020a5d4b47000000b002bf943730f0mr877365wrs.2.1674337513323; Sat, 21 Jan 2023 13:45:13 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p57935ca5.dip0.t-ipconnect.de. [87.147.92.165]) by smtp.gmail.com with ESMTPSA id r11-20020adff70b000000b002bdf290efdasm16266776wrp.58.2023.01.21.13.45.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Jan 2023 13:45:12 -0800 (PST) Date: Sat, 21 Jan 2023 22:45:11 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 3/3] staging: rtl8192e: Rename btxpower_trackin.., Slide_Beaco.. and Slide_B.. 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" Rename variable btxpower_trackingInit to tx_pwr_tracking_init, Slide_Beacon_pwdb to slide_beacon_pwdb and Slide_Beacon_Total to slide_beacon_total to avoid CamelCase which is not accepted by checkpatch. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 10 +++++----- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 6 +++--- drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 10 +++++----- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_dev.c index 6c570582479d..9260d308e68b 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -1574,17 +1574,17 @@ static void _rtl92e_process_phyinfo(struct r8192_pr= iv *priv, u8 *buffer, PHY_Beacon_RSSI_SLID_WIN_MAX) { slide_beacon_adc_pwdb_statistics =3D PHY_Beacon_RSSI_SLID_WIN_MAX; - last_beacon_adc_pwdb =3D priv->stats.Slide_Beacon_pwdb + last_beacon_adc_pwdb =3D priv->stats.slide_beacon_pwdb [slide_beacon_adc_pwdb_index]; - priv->stats.Slide_Beacon_Total -=3D last_beacon_adc_pwdb; + priv->stats.slide_beacon_total -=3D last_beacon_adc_pwdb; } - priv->stats.Slide_Beacon_Total +=3D prev_st->RxPWDBAll; - priv->stats.Slide_Beacon_pwdb[slide_beacon_adc_pwdb_index] =3D + priv->stats.slide_beacon_total +=3D prev_st->RxPWDBAll; + priv->stats.slide_beacon_pwdb[slide_beacon_adc_pwdb_index] =3D prev_st->RxPWDBAll; slide_beacon_adc_pwdb_index++; if (slide_beacon_adc_pwdb_index >=3D PHY_Beacon_RSSI_SLID_WIN_MAX) slide_beacon_adc_pwdb_index =3D 0; - prev_st->RxPWDBAll =3D priv->stats.Slide_Beacon_Total / + prev_st->RxPWDBAll =3D priv->stats.slide_beacon_total / slide_beacon_adc_pwdb_statistics; if (prev_st->RxPWDBAll >=3D 3) prev_st->RxPWDBAll -=3D 3; diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.h index 55a68bbe3861..983bc663a570 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -229,8 +229,8 @@ struct rt_stats { u8 rx_rssi_percentage[4]; u8 rx_evm_percentage[2]; long rxSNRdB[4]; - u32 Slide_Beacon_pwdb[100]; - u32 Slide_Beacon_Total; + u32 slide_beacon_pwdb[100]; + u32 slide_beacon_total; u32 CurrentShowTxate; }; =20 @@ -481,7 +481,7 @@ struct r8192_priv { bool bcck_in_ch14; =20 u8 txpower_count; - bool btxpower_trackingInit; + bool tx_pwr_tracking_init; =20 u8 ofdm_index[2]; u8 cck_index; diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/r= tl8192e/rtl8192e/rtl_dm.c index ba92dab682ec..79f993ab7cee 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c @@ -768,7 +768,7 @@ static void _rtl92e_dm_tx_power_tracking_cb_thermal(str= uct net_device *dev) u8 tmpOFDMindex, tmpCCKindex, tmpCCK20Mindex, tmpCCK40Mindex, tmpval; int i =3D 0, CCKSwingNeedUpdate =3D 0; =20 - if (!priv->btxpower_trackingInit) { + if (!priv->tx_pwr_tracking_init) { tmpRegA =3D rtl92e_get_bb_reg(dev, rOFDM0_XATxIQImbalance, bMaskDWord); for (i =3D 0; i < OFDM_Table_Length; i++) { @@ -783,7 +783,7 @@ static void _rtl92e_dm_tx_power_tracking_cb_thermal(str= uct net_device *dev) break; } } - priv->btxpower_trackingInit =3D true; + priv->tx_pwr_tracking_init =3D true; return; } =20 @@ -868,7 +868,7 @@ static void _rtl92e_dm_initialize_tx_power_tracking_tss= i(struct net_device *dev) =20 priv->btxpower_tracking =3D true; priv->txpower_count =3D 0; - priv->btxpower_trackingInit =3D false; + priv->tx_pwr_tracking_init =3D false; =20 } =20 @@ -882,7 +882,7 @@ static void _rtl92e_dm_init_tx_power_tracking_thermal(s= truct net_device *dev) else priv->btxpower_tracking =3D false; priv->txpower_count =3D 0; - priv->btxpower_trackingInit =3D false; + priv->tx_pwr_tracking_init =3D false; } =20 void rtl92e_dm_init_txpower_tracking(struct net_device *dev) @@ -1073,7 +1073,7 @@ void rtl92e_dm_restore_state(struct net_device *dev) ratr_value &=3D ~(RATE_ALL_OFDM_2SS); rtl92e_writel(dev, RATR0, ratr_value); rtl92e_writeb(dev, UFWP, 1); - if (priv->btxpower_trackingInit && priv->btxpower_tracking) + if (priv->tx_pwr_tracking_init && priv->btxpower_tracking) _rtl92e_dm_tx_power_reset_recovery(dev); =20 _rtl92e_dm_bb_initialgain_restore(dev); --=20 2.39.0