From patchwork Fri Jan 20 20:17:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 46621 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp406770wrn; Fri, 20 Jan 2023 12:18:49 -0800 (PST) X-Google-Smtp-Source: AMrXdXvPaebLQmfklp8407hW+oRJKSzJylmcFP/5yeQN2M4eCHKatgqfGajXnysHbmk+Yd5I0aM9 X-Received: by 2002:a17:907:d401:b0:7c0:c220:a33d with SMTP id vi1-20020a170907d40100b007c0c220a33dmr18509332ejc.9.1674245928937; Fri, 20 Jan 2023 12:18:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674245928; cv=none; d=google.com; s=arc-20160816; b=KwKSbZY4G+pi9wgcQBJuzOB0JwhX7uic+uEUX0ED0X15K1Gu5Okyu3bETusTKSNJF9 T9OGmeZhAHXDVsCHEhylI9IKT5Gu9Q3gxa3iH6lG7+u/96mjm7EUt8GRllM0sgYKLPPQ YBqhy/yUI+ejRux/wSysPlfxevGtUg9gOPbnckV9o3g0g+gpn+uLkYgtdsLaJHr5i5ew LdUxXvcmPXNceyvqTMUboRAeGtVuMdIwcGIA1nAKlx/7fVYYnPQxarGeOStn6dcum5c3 AUOo3caposYx20ePJKkkcZbN1HgMZ4lO0V3TWzRJD748O4oxITnbrbt2ukYDmaZEg30S PTLA== 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=7EOF6sBpuGhuHA/s9uQZVEpVdnpfpby63eHc5MQV10o=; b=gpWHn/UIcwwO70sa8vtVNoVvxeszspo+TrtMByKLCa8H5Rw8SNYQmegyoJlkWXS9K/ NurPt1bb4NRSm/N4qkcfqG2In526jsOMSVqB8yV+4SRbR5f+HF5zTqWIK+UX5XJbqZ74 J17d2xocerfgnk3dPexy3WIv923eJK/K2CSr2r4CIhbniq+SciIMhslEl3cLT/UcFEmB rdJfCn7jg+LLEjargmqqExtj2oQ53dFMcrOlrwVW64t2qYxxGIuQ/ACwxzklslLG4yu9 D8+OBMv9fAyakeUAYyVwQJeUprkwVYVE5hm9VvqE7iZZrt0ZXvDORlje94cU2wnG81sc g7QA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=bKw+hyon; 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 gj14-20020a170906e10e00b00870d2ca67a3si14304916ejb.211.2023.01.20.12.18.25; Fri, 20 Jan 2023 12:18:48 -0800 (PST) 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=20210112 header.b=bKw+hyon; 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 S230290AbjATUR6 (ORCPT + 99 others); Fri, 20 Jan 2023 15:17:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34376 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229787AbjATUR4 (ORCPT ); Fri, 20 Jan 2023 15:17:56 -0500 Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3B644707D2 for ; Fri, 20 Jan 2023 12:17:54 -0800 (PST) Received: by mail-wr1-x430.google.com with SMTP id r2so5819501wrv.7 for ; Fri, 20 Jan 2023 12:17:54 -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=7EOF6sBpuGhuHA/s9uQZVEpVdnpfpby63eHc5MQV10o=; b=bKw+hyonZwvdOtEcuIAl+Q81FXgLbybNyU7fzkiwmtX4n/ww57YCHua3t++ImQ7tGs tJacpa/4rVctETWyNisGfsSVKCt5KklVHrTAVfTsh+pzrF2UhWE40esDBo5HPX+Npu3b bI7eq2t76QwuhYqqUkfWYBDfxN/K1CgLZXAiuroZwmNSWyiiOm8QYYAj7bJgtS3ll3ua biJaEKlxmu6DRKjBtOzHDyfnoyGxo9DSxuBGRYzHbmVIzQubrvt0tQdYgR5f/DtuNLH1 03XrUDOtz1DKoBa6xaagJkFJ9guI0SRB/X1GjZTNDXcezSfHkDD8EizNcu0E215uBG9u N4ag== 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=7EOF6sBpuGhuHA/s9uQZVEpVdnpfpby63eHc5MQV10o=; b=T0Xg603hr/saU3hoDy/cZ7pNjeWZ6b90elli4XlpDkTlMYYaG04/Ju/9B3xPx7sSTu 0xGT5EwSpWsfz8HlEXryJiy1zlBmGywW+vRFoBOUAaFPAYulkzAqMRW39SHaKnhvGVny mOhvRzzmvupkLRx0unAit3JS/EQCKjJERh3HMVAm5shmOVgNqGWVHFoSsELrUDqb2OMJ d2ezHYbK3Z+i3Bz36Hnv4oK4njFcrtCicNhBNiYIsJtZnOx3m1PPMdhvOlkOr0p5CzT4 KPmR4qxmJe75WXaO+Psona3zfb6Q0PJcyn8KRdfyk3Fq/K2xnEIarQtOEBUx5Grn+4+c 5PoA== X-Gm-Message-State: AFqh2koP1bHIJRk1zKm9VCcLRtczQJT7x3xpAwo3gqhXcJmbEleC7XvG JGuas9NobshGgzWzt0jpyZQaAyQGIhU= X-Received: by 2002:a05:6000:1088:b0:2be:5295:bd9e with SMTP id y8-20020a056000108800b002be5295bd9emr797718wrw.7.1674245872660; Fri, 20 Jan 2023 12:17:52 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p57935ca5.dip0.t-ipconnect.de. [87.147.92.165]) by smtp.gmail.com with ESMTPSA id f3-20020adfdb43000000b00236883f2f5csm37249409wrj.94.2023.01.20.12.17.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Jan 2023 12:17:52 -0800 (PST) Date: Fri, 20 Jan 2023 21:17:50 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 1/6] staging: rtl8192e: Combine three loops to one to init tx_pwr_level_... Message-ID: 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 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?1755574098814450829?= X-GMAIL-MSGID: =?utf-8?q?1755574098814450829?= The arrays EEPROMRfACCKChnl1TxPwLevel, EEPROMRfAOfdmChnlTxPwLevel, EEPROMRfCCCKChnl1TxPwLevel, EEPROMRfCOfdmChnlTxPwLevel are initialized to zero and never changed. The three loops contain the same code. Only the index of the upper named arrays go from 0 to 2. Therefore the three loops can be combined to one loop from 0 to 13 which removes useless code. Signed-off-by: Philipp Hortmann --- .../staging/rtl8192e/rtl8192e/r8192E_dev.c | 22 +------------------ 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c index 227c13d552fc..7187ee4c75f6 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -426,7 +426,7 @@ static void _rtl92e_read_eeprom_info(struct net_device *dev) 0xf0) >> 4; } else if (priv->epromtype == EEPROM_93C56) { - for (i = 0; i < 3; i++) { + for (i = 0; i < 14; i++) { priv->tx_pwr_level_cck_a[i] = priv->EEPROMRfACCKChnl1TxPwLevel[0]; priv->tx_pwr_level_ofdm_24g_a[i] = @@ -436,26 +436,6 @@ static void _rtl92e_read_eeprom_info(struct net_device *dev) priv->tx_pwr_level_ofdm_24g_c[i] = priv->EEPROMRfCOfdmChnlTxPwLevel[0]; } - for (i = 3; i < 9; i++) { - priv->tx_pwr_level_cck_a[i] = - priv->EEPROMRfACCKChnl1TxPwLevel[1]; - priv->tx_pwr_level_ofdm_24g_a[i] = - priv->EEPROMRfAOfdmChnlTxPwLevel[1]; - priv->tx_pwr_level_cck_c[i] = - priv->EEPROMRfCCCKChnl1TxPwLevel[1]; - priv->tx_pwr_level_ofdm_24g_c[i] = - priv->EEPROMRfCOfdmChnlTxPwLevel[1]; - } - for (i = 9; i < 14; i++) { - priv->tx_pwr_level_cck_a[i] = - priv->EEPROMRfACCKChnl1TxPwLevel[2]; - priv->tx_pwr_level_ofdm_24g_a[i] = - priv->EEPROMRfAOfdmChnlTxPwLevel[2]; - priv->tx_pwr_level_cck_c[i] = - priv->EEPROMRfCCCKChnl1TxPwLevel[2]; - priv->tx_pwr_level_ofdm_24g_c[i] = - priv->EEPROMRfCOfdmChnlTxPwLevel[2]; - } priv->legacy_ht_tx_pwr_diff = priv->eeprom_legacy_ht_tx_pwr_diff; priv->antenna_tx_pwr_diff[0] = 0; From patchwork Fri Jan 20 20:18:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 46622 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp406873wrn; Fri, 20 Jan 2023 12:19:04 -0800 (PST) X-Google-Smtp-Source: AMrXdXtg/5zxekB5TTmmSdVTdiEMXuqoFkYWDlOaAZ3sHiEgu53n7KVsy0MGEvmNKv6z6orbN9fG X-Received: by 2002:a17:906:a07:b0:877:9b75:2e56 with SMTP id w7-20020a1709060a0700b008779b752e56mr3800797ejf.73.1674245944441; Fri, 20 Jan 2023 12:19:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674245944; cv=none; d=google.com; s=arc-20160816; b=AHajaKyF55txKLKb0ZCwftehWuX2aBD3zo0tTu7s1wC8njeYrfs0P7c7gG4KZs51Da NIITuXvYbNxtQsyfmhnurlNkA5BeWetsuIrKOiN0hubR0gfKd/SznK1vrDq3fKpPfhhE f1SMY6p0vARyuXFOGgpq+di3sdDZn0OrKZnAu9BPn0HdxBbpVA2qfGeqsOgkGHQMaKvp s++Wj130jF9OwnoA96yWCHvJ7G8bkpJZOx3mBT8x4A2xFoW316rrRQWoWZCQCA/g9XC6 zxHgvYFoSkJ7Ieq8Ezr+TboQF2r+6vEJd9BSizADp02CKBBiNsHGus51pyfUNoLQ+JRD bEIA== 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=4oBOra3KNxpaRSP68PMJL5xu9uXddKdpCIitMmZNYSE=; b=qzsukf+u4GFyrBPVwl1pauo5DmEHyVZxk+ohZu7ZTIRWpHRtHxsANBr7pyWwCdTcbF IpTlpq0J3fBD9xlQ4edweH6JWU815J/ZAljmGg19OTIfOuohd/yc6OEEa5R9ciX/SY4q 98rhpAyKYgOIXFadUjjsl/NxtXJEfVx0tQab+EsOfyKBXJ7Vem0fP/6Nj58yUs/Vntm8 6SwLVc2rgdn3oOe/QAW1l95B8s0dfr2BJ1G0/Vfg68Ag8CVJTMrQHtd8quxBFktu2S4/ aYgzg+led8vMmS4rN/dskPzDn4dZU/g+zia7Mmcnb8OE5yN0TmO4sD0/QZC1fAkdRFs4 jtgg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=CBsQrGnu; 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 ho19-20020a1709070e9300b00872236c2730si16919308ejc.216.2023.01.20.12.18.40; Fri, 20 Jan 2023 12:19:04 -0800 (PST) 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=20210112 header.b=CBsQrGnu; 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 S229787AbjATUSP (ORCPT + 99 others); Fri, 20 Jan 2023 15:18:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34816 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230152AbjATUSO (ORCPT ); Fri, 20 Jan 2023 15:18:14 -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 4F307BF5DB for ; Fri, 20 Jan 2023 12:18:06 -0800 (PST) Received: by mail-wr1-x42d.google.com with SMTP id n7so5831066wrx.5 for ; Fri, 20 Jan 2023 12:18:06 -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=4oBOra3KNxpaRSP68PMJL5xu9uXddKdpCIitMmZNYSE=; b=CBsQrGnuSh6+NaBDW1SBSpRTpQBE/F0Rg4GJEBjY/08vaqawQjnlallftotbxBbOmW SuGWfGDDBN4MuDvY/swBkwo6JVnuQJdq6sU42z/YOKEUo6D5yL1flMH1RiqjHbkRMmmj Tk00YIjAciXBY8xeHOwrhcl5eFK2kCbDhtKIl6W3doR8FIg9DPqgxrH/ASU/4jfh5zoN UMAPGo16Vvc6Z5RCf0t96koDz8mzrwRcWTndSvisbdbCAT80SWrPOfOE0xIS62JmFrkw 1CecAwJR/rztp2/kJVAISF/0sJ7JWa8vng8NRq4moTaqOKbn7jGvE+e4meDFewIKyrWo mUGw== 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=4oBOra3KNxpaRSP68PMJL5xu9uXddKdpCIitMmZNYSE=; b=i1/sbTW9sLFIgeB9RJ0lLC7iBNpZ0J7N2NbzMAQn96Jzy2Xsqpa8U1vFEDiLGOMMMM XkNz+wMAABiYn1xuBiaMarBkdHQMkS6WpICMgyD6Mgdrm88Pbe5Np4yW9eC3yxtE+sjb KHyf2USi13KYN+W0JePsNHQOnTycb3AQsZqFuwN2jBdQmSgQHU+6G2llooOfD6l8MK3/ 1wQ0U1vaDNrGhOrFyjAdeoWcwZ/+i/6o9r2+pYHQxMH3q340Cy8j4MLAAH/R9tsE9Mx9 dWXAB/xlqifIDeBDF+IMWlvw27Nm1pmq5RfwmeBHkoi3gRZHwWHoWXXSfbU0KN66ZtS8 KbVQ== X-Gm-Message-State: AFqh2kpkgZIWOiX+i2AUrmdaSIrhEKtJnatLYd1XCIk21EPgyh8UmI91 WuEqT6Dhbch9JK8TJk3hhyI= X-Received: by 2002:a05:6000:98f:b0:2bd:c6ce:7bee with SMTP id by15-20020a056000098f00b002bdc6ce7beemr3017695wrb.5.1674245884844; Fri, 20 Jan 2023 12:18:04 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p57935ca5.dip0.t-ipconnect.de. [87.147.92.165]) by smtp.gmail.com with ESMTPSA id u24-20020adfa198000000b002bc84c55758sm34844003wru.63.2023.01.20.12.18.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Jan 2023 12:18:04 -0800 (PST) Date: Fri, 20 Jan 2023 21:18:02 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 2/6] staging: rtl8192e: Init tx_pwr_level_cck_a and friends directly Message-ID: <9874e99fb9a803be2a89e81e2ecd01ba80398ea1.1674244819.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 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?1755574115723538147?= X-GMAIL-MSGID: =?utf-8?q?1755574115723538147?= The arrays EEPROMRfACCKChnl1TxPwLevel, EEPROMRfAOfdmChnlTxPwLevel, EEPROMRfCCCKChnl1TxPwLevel, EEPROMRfCOfdmChnlTxPwLevel are initialized to zero and never changed. Delete the arrays and set the variables directly to zero to avoid CamelCase which is not accepted by checkpatch. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 12 ++++-------- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 4 ---- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c index 7187ee4c75f6..fdf37c56066c 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -427,14 +427,10 @@ static void _rtl92e_read_eeprom_info(struct net_device *dev) } else if (priv->epromtype == EEPROM_93C56) { for (i = 0; i < 14; i++) { - priv->tx_pwr_level_cck_a[i] = - priv->EEPROMRfACCKChnl1TxPwLevel[0]; - priv->tx_pwr_level_ofdm_24g_a[i] = - priv->EEPROMRfAOfdmChnlTxPwLevel[0]; - priv->tx_pwr_level_cck_c[i] = - priv->EEPROMRfCCCKChnl1TxPwLevel[0]; - priv->tx_pwr_level_ofdm_24g_c[i] = - priv->EEPROMRfCOfdmChnlTxPwLevel[0]; + 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; diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h index 11f3f88491b2..596693fbee4c 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -423,10 +423,6 @@ struct r8192_priv { u8 eeprom_tx_pwr_level_cck[14]; u8 eeprom_tx_pwr_level_ofdm24g[14]; - u8 EEPROMRfACCKChnl1TxPwLevel[3]; - u8 EEPROMRfAOfdmChnlTxPwLevel[3]; - u8 EEPROMRfCCCKChnl1TxPwLevel[3]; - u8 EEPROMRfCOfdmChnlTxPwLevel[3]; u16 eeprom_ant_pwr_diff; u8 eeprom_thermal_meter; u8 eeprom_crystal_cap; From patchwork Fri Jan 20 20:18:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 46623 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp407035wrn; Fri, 20 Jan 2023 12:19:34 -0800 (PST) X-Google-Smtp-Source: AMrXdXv0uJEcM4ysiPDed/L7ITEwdScP/4vJQZ3KeMsS6pL7qE1KcnJme9qSlLmALJAEP7s64Lt7 X-Received: by 2002:a17:906:1e42:b0:86f:763c:2695 with SMTP id i2-20020a1709061e4200b0086f763c2695mr14937112ejj.17.1674245973937; Fri, 20 Jan 2023 12:19:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674245973; cv=none; d=google.com; s=arc-20160816; b=vrvGMM8RW0nrUvN3h91DW578odPcYPOLoOcbcaRg6G+QEVuZv5g2VzNUa68iBcd+2o AXlc61qy21W9wBN2hz5efKX4PSTAuP8Q8j9aU8hrqau0WnUcO23EuqgeAnLaxcdBWJwS 18oKg6isw3ninSXvCHoHxmfgb1TLakUuxHnX7Ze1UCUapG2GNxSF6plPi2XEknfyyjR1 HfGxHIL5S3yV+cE9D7qQjVos9qIBJUXB+f9R3avFfQrJd2b6Vob40wL1IOOpj5GCLnNk KOxxo+V3DR2DWQwZj7kM6UDZVsD+76gqzw0L/NkWKhudpJpwsfg8BuMKOQdwqPWjvcxm m2qQ== 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=m+SU2+uXQhTiSFcXfZwoK7cDeG3Nmwib98E2dexqroc=; b=cQ3XSLk9TMkOsSl1FfnL3c/S9/jK0bknsgbGQZ+oUZ4wymXYoeQ0a2rYWWfXUIsNO2 kbDa/5X/zssjTJnppxbOIGBfYP1+X9AgS/hmM6qX81Rek+lA7lxH2pFszGUvW3WRovFb h2EuSLeU+c/xqTCMhpgFX7m3cUDUsUbZdBEs+EAmvKhx4xQl5LgervVD7BjluGaTgvMr vJCQ9YbfsxIR+2wfcT0KGOefuBKWAEfjiZlESmgW9oQJY70i9eIycxc80RoJ4E/q8qGA nFRY7yb/yoASYuJxuCq43JN8oWQiJfbS+19gCBlEV9HdfRuiEkqqWi/cjlfHao84CuXa TnxQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b="A9/0gWrl"; 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 y16-20020a056402271000b0049e667887c2si8856999edd.398.2023.01.20.12.19.10; Fri, 20 Jan 2023 12:19:33 -0800 (PST) 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=20210112 header.b="A9/0gWrl"; 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 S230306AbjATUSY (ORCPT + 99 others); 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-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-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 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?1755574145916507883?= X-GMAIL-MSGID: =?utf-8?q?1755574145916507883?= 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]; From patchwork Fri Jan 20 20:18: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: 46624 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp407364wrn; Fri, 20 Jan 2023 12:20:12 -0800 (PST) X-Google-Smtp-Source: AMrXdXvztL0OWlTctGKDKkG6IAs+unnTiTtxQDZc0u5XzKaG5ev1mOG/gowpAvpi+R8iR8+0V4tA X-Received: by 2002:a05:6402:3706:b0:49e:a174:329c with SMTP id ek6-20020a056402370600b0049ea174329cmr4527326edb.36.1674246012385; Fri, 20 Jan 2023 12:20:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674246012; cv=none; d=google.com; s=arc-20160816; b=LJYbZkcycMQJEmlEQSMk0E6XEiIocBsEeRRmGqusCimlyDuGuUT4CIim4o7MoGo4Kj ikx0jQhF3dOYbUNntQ+sGnNlRQO4wczQHXhi1lq4qUPB/4FadpTXhOsC2H6mtgrK2ZMo PxD5pngetKm8xChhEQY2SUB4bpJt/8zEtrrC7hd/Cr6tRypRKAdDI4d8Uk2ljA1Y2iNv cwR01GavdmMNLMrsrf9C2xLPcvAlKUpgsYYZtc3AeLIEOzKR0oR04thl7SKPBzqgBY53 RGbREwBfBsQ8UQSdHtCWylJfXXrpVzxnlUpLU+2atxyRR5mTNB4L+aa3+bxwjnI2KeGe fbQQ== 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=uiygPQ43h/TyrnBCK1EPAnMPnfYQRYi9ihjA+N7LKWY=; b=OYZZClFPMoK7luOHYg3DBC8zOf8hi5w43as38qh4gHSuwvV1NgK4n+bV/izZgOtkI/ zLqR/FNxG4xZmzkqE+EYYwttM/9leBuy/GcP4yvcxU36SZKmMq8cTU92AWP1ZxaX+UJh UacgUwNnS0SnQ3Cyn5FyPjcL6TFub3xksfv3ROa2pmzbcZL+5t2Fh06YSFfwea5WO+am hSdUPGhfIGXAmf7MVYrVZEiEEVPUGI+ljum2XBfIaVzCrmdanUmD7GZ+GYPWz3GJpeSt xg3MhP6uIJzI+rCyMbUWukimBDWXLWjHS7ORenja2EToTXiWBc4B0AB1y8zfAM0mOCiX EV2A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=qwAu39Da; 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 cx12-20020a05640222ac00b00486b6ed8fa9si8119385edb.374.2023.01.20.12.19.48; Fri, 20 Jan 2023 12:20:12 -0800 (PST) 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=20210112 header.b=qwAu39Da; 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 S230300AbjATUSa (ORCPT + 99 others); Fri, 20 Jan 2023 15:18:30 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35326 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230303AbjATUS3 (ORCPT ); Fri, 20 Jan 2023 15:18:29 -0500 Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [IPv6:2a00:1450:4864:20::32a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7F6397135B for ; Fri, 20 Jan 2023 12:18:23 -0800 (PST) Received: by mail-wm1-x32a.google.com with SMTP id fl11-20020a05600c0b8b00b003daf72fc844so6641764wmb.0 for ; Fri, 20 Jan 2023 12:18:23 -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=uiygPQ43h/TyrnBCK1EPAnMPnfYQRYi9ihjA+N7LKWY=; b=qwAu39Da47bxut80nQTtpUUoYBrQQ9MJzqE01elmxTr8gWBx5gjJVcBR/sJ13pdigo yjODR4EgK9UzG9LShkfKFoiAifSKwHjDLvPse3hd7R1FFit+ICidg0FHixWh/R7tdg9x 53T/lPbeYRGmt4JAJ7lLTholZ1jL3tUTGQbMx9UMgmNglSXed1WcDE1LtGpd44y0YPUg 8lGjSY/F3xznmNQ9Mq3hbG+wUYryTN9hCVDY1qy+Nvc+oPdAv/y0ewwOZ4PFmyAijQ7r ZxDQ0ChjjwyvJLlqIVfzdkLzuWXyrYQmjZRzxYimHODSys+sd6bZsCrGnfTQnS+S/6rY td/A== 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=uiygPQ43h/TyrnBCK1EPAnMPnfYQRYi9ihjA+N7LKWY=; b=HFgi0B5aPnXfwg4Y8cX6iEGTKF5CFuAdmguRYH+64oQvYvORPttRYr9iKEN56Ia9nx 3SeH2M11aSzewvqiAZWcHcIcArsl+sJhYUjPnCL9YknoFH8bLY3Z/pxoD0lHOp98fnJz vpsWK4+kYE13kMhXLd9OVAMF4beq6yPWu2OYMFznDc86TKR6CzsxvV91iSr+MoRNwxz9 eP4j3hCM+FoiPikGppQHWiYF4BxNwCA+8fdTy6mQeI+tcGeJHj3UYDYkF90A7LwnMUVm dvtayl8PIuV/l/fHy0P1SlbCQ/5kFnf2pZs3tn3NiVhAO3j8Aeo9whzX5/MXXZM1CxEa GQMg== X-Gm-Message-State: AFqh2kqONCA7LxUBjmtCPR/fDNyi/ChGo87VBpNyKwWvx2fatgim5HEM 5cGfHm+Eqk6sOZYxnlBLuITbB5EluCA= X-Received: by 2002:a05:600c:1e22:b0:3db:2063:425e with SMTP id ay34-20020a05600c1e2200b003db2063425emr1959885wmb.1.1674245901642; Fri, 20 Jan 2023 12:18:21 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p57935ca5.dip0.t-ipconnect.de. [87.147.92.165]) by smtp.gmail.com with ESMTPSA id p19-20020a1c5453000000b003db09692364sm3203653wmi.11.2023.01.20.12.18.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Jan 2023 12:18:21 -0800 (PST) Date: Fri, 20 Jan 2023 21:18:19 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 4/6] staging: rtl8192e: Remove ant_pwr_diff which is always zero Message-ID: 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 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?1755574186403278411?= X-GMAIL-MSGID: =?utf-8?q?1755574186403278411?= ant_pwr_diff is set to zero and then masked which will always result in zero. Remove ant_pwr_diff and use zero direct as it is just useless code. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c index 33e3435b50b2..c969c40c3979 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c @@ -586,7 +586,6 @@ void rtl92e_set_tx_power(struct net_device *dev, u8 channel) { struct r8192_priv *priv = rtllib_priv(dev); u8 powerlevel = 0, powerlevelOFDM24G = 0; - s8 ant_pwr_diff; u32 u4RegValue; if (priv->epromtype == EEPROM_93C46) { @@ -600,12 +599,8 @@ void rtl92e_set_tx_power(struct net_device *dev, u8 channel) powerlevel = 0; powerlevelOFDM24G = 0; - ant_pwr_diff = 0; - - ant_pwr_diff &= 0xf; - priv->antenna_tx_pwr_diff[2] = 0; - priv->antenna_tx_pwr_diff[1] = (u8)(ant_pwr_diff); + priv->antenna_tx_pwr_diff[1] = 0; priv->antenna_tx_pwr_diff[0] = 0; u4RegValue = priv->antenna_tx_pwr_diff[2] << 8 | From patchwork Fri Jan 20 20:18:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 46629 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp417172wrn; Fri, 20 Jan 2023 12:44:35 -0800 (PST) X-Google-Smtp-Source: AMrXdXuBpd5xbCrPNlQDH+dOyCQHI8mDArBfP8rsGBF/SWamOFtztMdJe6zZ68s5mw4XzeOqYn81 X-Received: by 2002:a17:902:c408:b0:194:6afa:ca with SMTP id k8-20020a170902c40800b001946afa00camr23268714plk.56.1674247475655; Fri, 20 Jan 2023 12:44:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674247475; cv=none; d=google.com; s=arc-20160816; b=SUG5oXNRW6hzSIDPBMxmJftSMSFo+EmZK9i5iemzZ3zYDDncrJC79FYXUmZwVgnQSw upc7wpyQzdcNvOv+b8xRRleSlSC6ndXlE8j+KStWf6yy34V4GODlsWkh8gw5e4yp7c3X W8fUyK3hZoRKSj5ICptLS6wJ4VxLaerbg7nRC1Wr5cDXaBBmiULn7Fut62VNWNVSq95/ /Tt5ao5FZ9vteSj1tg584vRS3Ioi3bILPSF4YjDgR8UojRNvZ8sgrnCoO+qmvspSMFmH Hhfmb+dCqzXKD43uxl4pTOcI/dupMrnQomlBg6yYTbjIRS1n5P96WwF+DYv3eDdoUi/e Euow== 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=M5PEEpYbd9JR0sOvYfHmr/vW+Rpo6V/62Q72U9s8gzY=; b=vvQ7aTB1YaO9CNcVUwESmbI1FjpLsnEld09uJLXZr2OMf+odU+HrRjqvTvFCQQUOJq XFeBW7AyyPGfmXmWMh537nPdG7aU6BWqvZZ5PwWt3EmNUYmZAsBDaqhttsIpiAGmWepW qG+cVIhzEea2rua/HrESpXosBOhML03NdtBeL8Pq1kO06d+j8M0MRUWk84DDQNd/GNG7 eKR/qr8SHYPx9RUqWE+3DmCjVUKJaNpSRnM1+l78rRv4p2tbiCMtQUBJ6mydiDV3jKhB TyRhqFW2p02tVi/R2TGDybU3eJ9p3Qwz0w1BNG2J+cL/C0z1L/Dk/aYjm4Gy39e7lBFF vxKg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=DbUQV68q; 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 p16-20020a170902e75000b00194d2dbe67esi5563186plf.413.2023.01.20.12.44.20; Fri, 20 Jan 2023 12:44:35 -0800 (PST) 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=20210112 header.b=DbUQV68q; 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 S230326AbjATUSj (ORCPT + 99 others); Fri, 20 Jan 2023 15:18:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35658 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230297AbjATUSh (ORCPT ); Fri, 20 Jan 2023 15:18:37 -0500 Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7159C79EB5 for ; Fri, 20 Jan 2023 12:18:30 -0800 (PST) Received: by mail-wr1-x436.google.com with SMTP id y1so1330452wru.2 for ; Fri, 20 Jan 2023 12:18:30 -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=M5PEEpYbd9JR0sOvYfHmr/vW+Rpo6V/62Q72U9s8gzY=; b=DbUQV68qiUmqYwTvudP7uOeZobN81AfWmNWt0Nh3auBFSBNVx+O3ch4S55njTe4jBn X44UQKRcWOggjFtlTVeAxFqaRafmwdKlcU1PBvd8v3zF6wubTdyz/QgnC+zZcclCoi5F 3UOBcTONrozvF6Uy4xJ4WKuBTCReitgoOaJSPO+FVp/xJnEZilXZIGw6HiIC6qcvjD3v I8W8FuLxeuY/h6iNKFoSqlb9OqJSe44VMU0PfNTzp6W6bWXVtRGZ0UcQNbnEYQGZ3Ly2 11BgQDZT71InEewOUFTD56aLyLEACYqSifYr3BW+Dq52B9aPkFZxdWRenY0ULlOVAZk7 GodA== 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=M5PEEpYbd9JR0sOvYfHmr/vW+Rpo6V/62Q72U9s8gzY=; b=dMJkX9M/y4CC1fzy4Qo6k4oUBTnV3Ppu4zZYjisYg5yV9QmBK5FoMU/M1c3uKarNLd w8FTooGhiDZUkdtydPiBX5Nd1guDhS89DbWqgmsQc7OJG4HDiMNQOpugcp7a69PJ4dLu opCxwyqWjkPC59IeKUOGVV+5F7EGcRAFwP9Rzk2FRrcmVjdgtl//ggX6uDlWbmmPCSkw rIycQU80hW797DOc0XpU3EAtcjLMacPCH6UtrWEmGpVB6mEIjNxirmgNNfXx/ywlTQqD yVEPz5nyCP8DzZy1o86Wh2Vk7j2XTgdYXUhEg0ZKOo9/dSlw9Y5BRTM0eLHC7LHSrirj gPow== X-Gm-Message-State: AFqh2kqJK/EwXThlnU9o5JWwuoOqeJaE8qN/oHrjkXzb9NqQShYYTgyL /3DouE74U5V4yv857oyfLlg= X-Received: by 2002:adf:f992:0:b0:2bb:62bf:f5cb with SMTP id f18-20020adff992000000b002bb62bff5cbmr2670640wrr.4.1674245909015; Fri, 20 Jan 2023 12:18:29 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p57935ca5.dip0.t-ipconnect.de. [87.147.92.165]) by smtp.gmail.com with ESMTPSA id m5-20020a056000024500b00267bcb1bbe5sm37671154wrz.56.2023.01.20.12.18.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Jan 2023 12:18:28 -0800 (PST) Date: Fri, 20 Jan 2023 21:18:26 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 5/6] staging: rtl8192e: Remove u4RegValue which is always zero Message-ID: <2aa104c0f7a5cede7eea289fe92390295592b0e9.1674244819.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 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?1755575720953809303?= X-GMAIL-MSGID: =?utf-8?q?1755575720953809303?= As the array antenna_tx_pwr_diff is always zero, u4RegValue is always set to zero. Replace u4RegValue to avoid CamelCase which is not accepted by checkpatch. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c index c969c40c3979..d56c58ecc19f 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c @@ -586,7 +586,6 @@ void rtl92e_set_tx_power(struct net_device *dev, u8 channel) { struct r8192_priv *priv = rtllib_priv(dev); u8 powerlevel = 0, powerlevelOFDM24G = 0; - u32 u4RegValue; if (priv->epromtype == EEPROM_93C46) { powerlevel = priv->tx_pwr_level_cck[channel - 1]; @@ -603,13 +602,8 @@ void rtl92e_set_tx_power(struct net_device *dev, u8 channel) priv->antenna_tx_pwr_diff[1] = 0; priv->antenna_tx_pwr_diff[0] = 0; - u4RegValue = priv->antenna_tx_pwr_diff[2] << 8 | - priv->antenna_tx_pwr_diff[1] << 4 | - priv->antenna_tx_pwr_diff[0]; - rtl92e_set_bb_reg(dev, rFPGA0_TxGainStage, - (bXBTxAGC|bXCTxAGC|bXDTxAGC), - u4RegValue); + (bXBTxAGC | bXCTxAGC | bXDTxAGC), 0); } } switch (priv->rf_chip) { From patchwork Fri Jan 20 20:18:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 46628 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp417171wrn; Fri, 20 Jan 2023 12:44:35 -0800 (PST) X-Google-Smtp-Source: AMrXdXuouPaHIZga8s/Soa/XSQNHGO+13SZLKDz4SVBRgxUp6wtZwzTrdxbuLi63o227rV9UKE/N X-Received: by 2002:a17:903:185:b0:194:dd86:587f with SMTP id z5-20020a170903018500b00194dd86587fmr6579432plg.54.1674247475547; Fri, 20 Jan 2023 12:44:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674247475; cv=none; d=google.com; s=arc-20160816; b=Cg/PBMjz+ojNrfFLA3pUMV7jFvIUVV0GrXhz43tTdlaQ/89ZJmSZB0xzxFa9RpIP9n TCawHnGnxRdjMKfInae/yOsXnrFqTsqRMSXXq4x/BrOzUT+R5oNPKq41NClBRykK+0iw 52ZY4covvzIPRc0Ze9iCcf4k+m92k1M1lFffGEdDxMN2Wyoi4mOf3wwMhvxg06lp8d6Y pIEijsJZ3i3kNWDhiAvFRN5NqjcSa9FzSBjBcfKbgLdbE+b2osnTUKZh4qkH5hONJ+Mk NecfHiJtiAFi/cdOduiSycxwRTsMQRtt/4Bj+GMnB8940JUrx5iRmg6O4nencX93ZJDH qxuw== 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=eQMkYfa6JOk29l+eO67ftMXjLXVNm5SDSgzNV32RifU=; b=DwwQJckP/FgDnCPltQQqfBk45eytJDKImwHguGww+dR3OUoRHNVMJv1z3RjLRWzRAO RxCyYTqJra61jd71Jau8aKsy21VhZ0HjfkYhDsm5GXndODEue/U8zPR1/w5iDrmPVbUU y0qiQpzmLBkhvq8YZ4A0ALVXUNb45igO8sAmL0+A+4ukXHYsd88tiQ+DvpDUBh1jFS8e ik5aKG7nBfsgmFQZUXZdZv77y1d2dSs1umi5P9BlLfoBY08SQ3JyHYR4ZTvcfhBl6Ka+ LfqiYJTzRoNl74iJ7XX7s8GnoCxv94bpp8Rju7eK3WNKAya1zDIo/dX8gDQyAZIGIfbK XhLQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=K39ljOyK; 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 c6-20020a170902aa4600b00194a6e1b334si12004935plr.327.2023.01.20.12.44.20; Fri, 20 Jan 2023 12:44:35 -0800 (PST) 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=20210112 header.b=K39ljOyK; 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 S230240AbjATUTK (ORCPT + 99 others); Fri, 20 Jan 2023 15:19:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36158 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230336AbjATUTB (ORCPT ); Fri, 20 Jan 2023 15:19:01 -0500 Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [IPv6:2a00:1450:4864:20::429]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1933ECC5E7 for ; Fri, 20 Jan 2023 12:18:40 -0800 (PST) Received: by mail-wr1-x429.google.com with SMTP id t5so5848064wrq.1 for ; Fri, 20 Jan 2023 12:18:40 -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=eQMkYfa6JOk29l+eO67ftMXjLXVNm5SDSgzNV32RifU=; b=K39ljOyKm7WfsPD6blBA9bm2U1CZ2NPUdgsfxWxrWlWrL31gRYh6+TpewUqlKIXXRJ toxK7u5kjFkXHB3AQFFN1zG1so22UmMFFzFDQEIIo5C8VMsiWZmPrmReyGk0q5PgcLFu Pnivp7AFHW1ZXF77zOMHITaRTGvxx8VsTFyF/QLtI7iBgFmzj8oC9Ku8UMg+mY9OExWf nuMHx3n7HARmJFg7iPIMM8jfhQq02y1q7p5PNZrhdIgtToBWjhg3WbJ44KOg/Ms+5WFO SqSErAO/+bxb6kYkAI65VRLta8pM1XeUKby2GfMgpIzKYeDm+YqbveYK+cwJFcW1qE2x YCKg== 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=eQMkYfa6JOk29l+eO67ftMXjLXVNm5SDSgzNV32RifU=; b=dvkgQ9b4KSkjT4JUznLg4R6KQbp9rh6cABfnQIhsEJisFTajnR9km9CIrKsIJDSzTA cngREKn0ufXYt/osARd33iV3BTGNjoUeJPnRSHE+I9kNxpVOcT1gcbnBJekvqFeyqv9u 4oW0xLv7vMhDAoYfcAbcWSLWEcQoPBhOM3qEeO5JEo2SK845/fDqK3+8aVOHP0q6icq7 vS7ErgJ5uuZscOSOaUO9K2mFAqFSvzimJnYXXBDmAv/PGTNnFuxxm4X4pK0Zh/Ep2bf2 sJqP4USM6hEQsHJYManzDZ/8i5HtxMoiE4BO6Zg9tL0r08pmOxwsIyE5kbfP04eR7t4h P3gA== X-Gm-Message-State: AFqh2kqbTiRTinxDGvPxsVAKzAbNUuUF0smGilsmYJHpuo0cz+kwhrXU 5dn3jsChw+eAIFlHTqyePMk= X-Received: by 2002:a05:6000:98d:b0:2bd:ea5e:740e with SMTP id by13-20020a056000098d00b002bdea5e740emr3080443wrb.3.1674245918522; Fri, 20 Jan 2023 12:18:38 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p57935ca5.dip0.t-ipconnect.de. [87.147.92.165]) by smtp.gmail.com with ESMTPSA id bt14-20020a056000080e00b0027cb20605e3sm13018064wrb.105.2023.01.20.12.18.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Jan 2023 12:18:38 -0800 (PST) Date: Fri, 20 Jan 2023 21:18:36 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 6/6] staging: rtl8192e: Remove repeated set to zero of powerlevel and friend Message-ID: <50f28816aa006821d3e3a8346e39ae68c4d53963.1674244819.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 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?1755575721008900158?= X-GMAIL-MSGID: =?utf-8?q?1755575721008900158?= Variables powerlevel and powerlevelOFDM24G are initialized to zero and unchanged. No reason to set them to zero again. Remove dead code. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c index d56c58ecc19f..95a21859c7e0 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c @@ -591,13 +591,7 @@ void rtl92e_set_tx_power(struct net_device *dev, u8 channel) powerlevel = priv->tx_pwr_level_cck[channel - 1]; powerlevelOFDM24G = priv->tx_pwr_level_ofdm_24g[channel - 1]; } else if (priv->epromtype == EEPROM_93C56) { - if (priv->rf_type == RF_1T2R) { - powerlevel = 0; - powerlevelOFDM24G = 0; - } else if (priv->rf_type == RF_2T4R) { - powerlevel = 0; - powerlevelOFDM24G = 0; - + if (priv->rf_type == RF_2T4R) { priv->antenna_tx_pwr_diff[2] = 0; priv->antenna_tx_pwr_diff[1] = 0; priv->antenna_tx_pwr_diff[0] = 0;