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 X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7A41FC433F5 for ; Tue, 21 Sep 2021 19:47:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5E3736109E for ; Tue, 21 Sep 2021 19:47:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234818AbhIUTtH (ORCPT ); Tue, 21 Sep 2021 15:49:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54236 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234727AbhIUTs5 (ORCPT ); Tue, 21 Sep 2021 15:48:57 -0400 Received: from mail-wr1-x432.google.com (mail-wr1-x432.google.com [IPv6:2a00:1450:4864:20::432]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B6F72C06175F for ; Tue, 21 Sep 2021 12:47:28 -0700 (PDT) Received: by mail-wr1-x432.google.com with SMTP id d6so42326261wrc.11 for ; Tue, 21 Sep 2021 12:47:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BRmr7Kn+ch2D7Rk91cbzSX80Ai6rUJ5p2SRm6PQqTeg=; b=MxVMOeyP8hhcfjb/d+Sdlmhx9+zPCqyl8N5m+nYdqgXv65t4IyKZHIUsqTjV+FTSnF vBUtogjQ4SCsGrbTzZFWvq2IKGH6k/Q5uVLo2OmLJnxvuHZFoTRZFDk12H1Zb4wnKMrG sXT9OF6ijv/dhzWwpr5/sh4e2IPuAJy0XAVJ/suapao4JRRKbyBL9U8aZLQSzSQlGI3C SNbrOVgyVC86R85NbhpE9vjRZ2DE7qEJ+GPinGzc/D6zz7HWw1dUCml95NNLPgImMXHB 4jCBMKYM4a1h77fBQnLHNuNS08etVdrUgxpt2jHaWXWlY8ga7CrNfvHQHfn3K9OS/NCl ZB5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=BRmr7Kn+ch2D7Rk91cbzSX80Ai6rUJ5p2SRm6PQqTeg=; b=fLuOM66jKplpIyFevR8gzg8ph2+ydFwxPfwP6Sq1aj7QDWi4vHae4nvOnV+VPldYQt bLP7DeH+il753v5zwhi0uGLTf6dvLryhOq0FneIQjpjQdUeRdcwrmeX2Ce4Eob6LwZLK qQC6xutRFAPK8hIWd/U0eSNaQmbRfnPTZC08L4oSfA4HdpyIhtwKPiWFGRWuJhRZWFz+ iFxApgiUrLwSdd3ifWHj6GOw1dBKxyaIh5NLbFWRfPU0LI+GmFwiSBTRrtEtO2OiC6PZ KRMzPoGJf6wKSErFyB2rmodbNXOPuCBAR65XehTfQ6XPM96PcXib2G8hB5FdK4SbzuIL 6+lg== X-Gm-Message-State: AOAM530N9SBUHnfITYieC4dRGLw+9MkMA8ksCrU/2Fw4KajdPGf+sg9j 69qSGEdZAlVdEOJEEtNJ940= X-Google-Smtp-Source: ABdhPJxwX3o6UMofJ40335sri1zn/PwJCDWx/J6qg+im67i+DwaWwjiKftyfHbHSGAsn7OGUyK3TcQ== X-Received: by 2002:a05:6000:14a:: with SMTP id r10mr37468236wrx.380.1632253647233; Tue, 21 Sep 2021 12:47:27 -0700 (PDT) Received: from localhost.localdomain ([2a02:8108:96c0:3b88::cde]) by smtp.gmail.com with ESMTPSA id s13sm3891243wmc.47.2021.09.21.12.47.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Sep 2021 12:47:26 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, martin@kaiser.cx, fmdefrancesco@gmail.com, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 6/8] staging: r8188eu: remove dead code from rtl8188e_rf6052.c Date: Tue, 21 Sep 2021 21:46:56 +0200 Message-Id: <20210921194658.10654-7-straube.linux@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210921194658.10654-1-straube.linux@gmail.com> References: <20210921194658.10654-1-straube.linux@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In this driver DynamicTxHighPowerLvl is set to TxHighPwrLevel_Normal and never changed. In the file rtl8188e_rf6052.c there are some if statements that check DynamicTxHighPowerLvl for other values than TxHighPwrLevel_Normal. The code in the if blocks is never executed. Remove the dead code. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/hal/rtl8188e_rf6052.c | 57 +++++-------------- 1 file changed, 14 insertions(+), 43 deletions(-) diff --git a/drivers/staging/r8188eu/hal/rtl8188e_rf6052.c b/drivers/staging/r8188eu/hal/rtl8188e_rf6052.c index edaa9a6dfdb1..946a1b97d96f 100644 --- a/drivers/staging/r8188eu/hal/rtl8188e_rf6052.c +++ b/drivers/staging/r8188eu/hal/rtl8188e_rf6052.c @@ -85,7 +85,6 @@ rtl8188e_PHY_RF6052SetCckTxPower( u8 *pPowerlevel) { struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter); - struct dm_priv *pdmpriv = &pHalData->dmpriv; struct mlme_ext_priv *pmlmeext = &Adapter->mlmeextpriv; u32 TxAGC[2] = {0, 0}, tmpval = 0, pwrtrac_value; bool TurboScanOff = false; @@ -112,34 +111,19 @@ rtl8188e_PHY_RF6052SetCckTxPower( } } } else { - /* Driver dynamic Tx power shall not affect Tx power. - * It shall be determined by power training mechanism. -i * Currently, we cannot fully disable driver dynamic - * tx power mechanism because it is referenced by BT - * coexist mechanism. - * In the future, two mechanism shall be separated from - * each other and maintained independently. */ - if (pdmpriv->DynamicTxHighPowerLvl == TxHighPwrLevel_Level1) { - TxAGC[RF_PATH_A] = 0x10101010; - TxAGC[RF_PATH_B] = 0x10101010; - } else if (pdmpriv->DynamicTxHighPowerLvl == TxHighPwrLevel_Level2) { - TxAGC[RF_PATH_A] = 0x00000000; - TxAGC[RF_PATH_B] = 0x00000000; - } else { - for (idx1 = RF_PATH_A; idx1 <= RF_PATH_B; idx1++) { - TxAGC[idx1] = - pPowerlevel[idx1] | (pPowerlevel[idx1] << 8) | - (pPowerlevel[idx1] << 16) | (pPowerlevel[idx1] << 24); - } - if (pHalData->EEPROMRegulatory == 0) { - tmpval = (pHalData->MCSTxPowerLevelOriginalOffset[0][6]) + - (pHalData->MCSTxPowerLevelOriginalOffset[0][7] << 8); - TxAGC[RF_PATH_A] += tmpval; - - tmpval = (pHalData->MCSTxPowerLevelOriginalOffset[0][14]) + - (pHalData->MCSTxPowerLevelOriginalOffset[0][15] << 24); - TxAGC[RF_PATH_B] += tmpval; - } + for (idx1 = RF_PATH_A; idx1 <= RF_PATH_B; idx1++) { + TxAGC[idx1] = + pPowerlevel[idx1] | (pPowerlevel[idx1] << 8) | + (pPowerlevel[idx1] << 16) | (pPowerlevel[idx1] << 24); + } + if (pHalData->EEPROMRegulatory == 0) { + tmpval = (pHalData->MCSTxPowerLevelOriginalOffset[0][6]) + + (pHalData->MCSTxPowerLevelOriginalOffset[0][7] << 8); + TxAGC[RF_PATH_A] += tmpval; + + tmpval = (pHalData->MCSTxPowerLevelOriginalOffset[0][14]) + + (pHalData->MCSTxPowerLevelOriginalOffset[0][15] << 24); + TxAGC[RF_PATH_B] += tmpval; } } for (idx1 = RF_PATH_A; idx1 <= RF_PATH_B; idx1++) { @@ -207,7 +191,6 @@ static void get_rx_power_val_by_reg(struct adapter *Adapter, u8 Channel, u32 *pOutWriteVal) { struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter); - struct dm_priv *pdmpriv = &pHalData->dmpriv; u8 i, chnlGroup = 0, pwr_diff_limit[4], customer_pwr_limit; s8 pwr_diff = 0; u32 writeVal, customer_limit, rf; @@ -283,19 +266,7 @@ static void get_rx_power_val_by_reg(struct adapter *Adapter, u8 Channel, ((index < 2) ? powerBase0[rf] : powerBase1[rf]); break; } -/* 20100427 Joseph: Driver dynamic Tx power shall not affect Tx power. It shall be determined by power training mechanism. */ -/* Currently, we cannot fully disable driver dynamic tx power mechanism because it is referenced by BT coexist mechanism. */ -/* In the future, two mechanism shall be separated from each other and maintained independently. Thanks for Lanhsin's reminder. */ - /* 92d do not need this */ - if (pdmpriv->DynamicTxHighPowerLvl == TxHighPwrLevel_Level1) - writeVal = 0x14141414; - else if (pdmpriv->DynamicTxHighPowerLvl == TxHighPwrLevel_Level2) - writeVal = 0x00000000; - - /* 20100628 Joseph: High power mode for BT-Coexist mechanism. */ - /* This mechanism is only applied when Driver-Highpower-Mechanism is OFF. */ - if (pdmpriv->DynamicTxHighPowerLvl == TxHighPwrLevel_BT1) - writeVal = writeVal - 0x06060606; + *(pOutWriteVal + rf) = writeVal; } } -- 2.33.0