From mboxrd@z Thu Jan 1 00:00:00 1970 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 881DAC25B50 for ; Fri, 20 Jan 2023 20:18:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230314AbjATUSY (ORCPT ); Fri, 20 Jan 2023 15:18:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35048 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230300AbjATUSW (ORCPT ); Fri, 20 Jan 2023 15:18:22 -0500 Received: from mail-wr1-x42d.google.com (mail-wr1-x42d.google.com [IPv6:2a00:1450:4864:20::42d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 492FFBC895 for ; Fri, 20 Jan 2023 12:18:16 -0800 (PST) Received: by mail-wr1-x42d.google.com with SMTP id q5so1173278wrv.0 for ; Fri, 20 Jan 2023 12:18:16 -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=m+SU2+uXQhTiSFcXfZwoK7cDeG3Nmwib98E2dexqroc=; b=A9/0gWrlgCXVEsXeV6JMFbxrkJYkZxNM5SRAIdCqtCkLkm/1IFj3dafc1ZTFwYLWsV kdnV02KU0u7tl8r1Aa1WUXqyKSslcmQHna3IMvCAJW/b4+RHOeEpdMMKTnFeDS0McaDb QVe5t+nJ95nElVUjEhmn+mGiig3Pz1iYg1LZBTsXbPlTun1AEcTbeelTc+mlVv3J6PYB +kUM89ghduEliDUtPJdufn2/tvVZiHLYCKEV2tuaka5sT9B3D2jr1Hr50JPCBReGPIJ0 dhbLFaSZ7cHFN9tvrIDP4lHiJygBiXV7uq/6dvy0tC9bdZadIT5rLdnDIq3ipppbxnmN J+HQ== 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=m+SU2+uXQhTiSFcXfZwoK7cDeG3Nmwib98E2dexqroc=; b=3OVNk61OtpuGDfBpQcAYnh0sbQa0y0Lxo6DQgXWJ8PburATW4EE/cBhGzBYe4B6c/O dyELZkQOT0Ajl0rswBCKpwV2vN8XxCwnlmNn8ZVsso/+IuiY/eEk3xu4m5CYNcwQRixI l2d1/LQXhvh6GQQmGS7efZopWlhFD3jCV+8CKZs0Xh/rGW7r7rtCdJJooCyNYT8liTDg siDVgog9MkctaBwmiOtcAOXHSaqBsRIT9UpEB2uOVXicqPXLVhB+0RrUfe2+PUMqXtEj Azqptd+WW7FTUke8FvK01xYJXvfXqdpyapzrQaS1dH6BLDExIXLsijCaJIaHo7FkGKWY BBCA== X-Gm-Message-State: AFqh2kruF9e4oGci3No/FdjqDlFK3oWlTHGRAhEMZ6+Yr4J7FdjMOAKY roNZw+54DfzDoczKhkBp964i8HBNsuw= X-Google-Smtp-Source: AMrXdXtbJIi/QXUNGmcHN7kUdo7IWKChMeDCRQmR1o7GPsQRUxAbsF1DyEU+WOPme+Qd6MTMIqzU7A== X-Received: by 2002:adf:fa4e:0:b0:2bd:e8bd:79c7 with SMTP id y14-20020adffa4e000000b002bde8bd79c7mr2464032wrr.1.1674245894734; Fri, 20 Jan 2023 12:18:14 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p57935ca5.dip0.t-ipconnect.de. [87.147.92.165]) by smtp.gmail.com with ESMTPSA id z14-20020a5d4c8e000000b002bdbde1d3absm827528wrs.78.2023.01.20.12.18.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Jan 2023 12:18:14 -0800 (PST) Date: Fri, 20 Jan 2023 21:18:12 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 3/6] staging: rtl8192e: Remove zeroed arrays tx_pwr_level_cck_a and friends Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The arrays tx_pwr_level_cck_a, tx_pwr_level_ofdm_24g_a, tx_pwr_level_cck_c and tx_pwr_level_ofdm_24g_c are initialized to zero and never changed. Delete the upper named arrays and set the variables directly to zero to avoid useless code. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 7 ------- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 11 +++++------ drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 4 ---- 3 files changed, 5 insertions(+), 17 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c index fdf37c56066c..b721bb72007d 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -425,13 +425,6 @@ static void _rtl92e_read_eeprom_info(struct net_device *dev) priv->thermal_meter[1] = (priv->eeprom_thermal_meter & 0xf0) >> 4; } else if (priv->epromtype == EEPROM_93C56) { - - for (i = 0; i < 14; i++) { - priv->tx_pwr_level_cck_a[i] = 0; - priv->tx_pwr_level_ofdm_24g_a[i] = 0; - priv->tx_pwr_level_cck_c[i] = 0; - priv->tx_pwr_level_ofdm_24g_c[i] = 0; - } priv->legacy_ht_tx_pwr_diff = priv->eeprom_legacy_ht_tx_pwr_diff; priv->antenna_tx_pwr_diff[0] = 0; diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c index ff66a97b8763..33e3435b50b2 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c @@ -594,14 +594,13 @@ void rtl92e_set_tx_power(struct net_device *dev, u8 channel) powerlevelOFDM24G = priv->tx_pwr_level_ofdm_24g[channel - 1]; } else if (priv->epromtype == EEPROM_93C56) { if (priv->rf_type == RF_1T2R) { - powerlevel = priv->tx_pwr_level_cck_c[channel - 1]; - powerlevelOFDM24G = priv->tx_pwr_level_ofdm_24g_c[channel - 1]; + powerlevel = 0; + powerlevelOFDM24G = 0; } else if (priv->rf_type == RF_2T4R) { - powerlevel = priv->tx_pwr_level_cck_a[channel - 1]; - powerlevelOFDM24G = priv->tx_pwr_level_ofdm_24g_a[channel - 1]; + powerlevel = 0; + powerlevelOFDM24G = 0; - ant_pwr_diff = priv->tx_pwr_level_ofdm_24g_c[channel - 1] - - priv->tx_pwr_level_ofdm_24g_a[channel - 1]; + ant_pwr_diff = 0; ant_pwr_diff &= 0xf; diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h index 596693fbee4c..59049ad349e0 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -464,11 +464,7 @@ struct r8192_priv { u32 mcs_tx_pwr_level_org_offset[6]; u8 tx_pwr_level_cck[14]; - u8 tx_pwr_level_cck_a[14]; - u8 tx_pwr_level_cck_c[14]; u8 tx_pwr_level_ofdm_24g[14]; - u8 tx_pwr_level_ofdm_24g_a[14]; - u8 tx_pwr_level_ofdm_24g_c[14]; u8 legacy_ht_tx_pwr_diff; u8 antenna_tx_pwr_diff[3]; -- 2.39.0