Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp2141295pxb; Thu, 11 Feb 2021 05:34:30 -0800 (PST) X-Google-Smtp-Source: ABdhPJxetZrAJquVlXEvpix0ku+Y+r7cQhPPcGsW8Vj9BwP78mMDG/N0ehmGoxMqxkawNtm7Lnih X-Received: by 2002:a05:6402:1a58:: with SMTP id bf24mr8270849edb.191.1613050470453; Thu, 11 Feb 2021 05:34:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1613050470; cv=none; d=google.com; s=arc-20160816; b=gLTeZyit8qNX5lSQu54QQtzAp7DMJs0hZUQEurDA1kNGSO+LniQBd1gNq0ccgBcq1D Qz8+x927cFPv3ZsnKSbZMYiU0DUFs593hxjpj2WCwzprxtqW2Qyh9KKtnSLgnxU+dG3m mF6M2+IUxhF9UCbuDRZX2xGI1zk+HtgQHW8FilRI+9VNczlm+pkjMzaXZ5nnbohnoWGm kM5WpqLK0f+d8hJnh5Q5n2MBxbqTZNG6gY+fxcq2ybDU7MJ8M/R3jQz0tHFljEy6a8iA 5LPUnulvsXyS8VlyePAuUOk2cpaomCuS10QR8QUOh6g0kXcKp/ktt5JgBSDHwxZJkfwY kOCw== 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:cc:to:from:date; bh=Xq/j+6bSsQXfsiFmAqfeFgZtMEQEP9FoOV/ecRFhZFk=; b=vMx1NYzcpSmArD7d0nNQaHeaQZdiShXsUMkxxgTQTcMVfV9D7/m4zOm4ifVNQP9wOa W0xM82aCrlP21z0SqF2wa33f+hU2kxzTEMqtuut9yM+HahARWYv20CossNPvkIwYfqz0 dnKJDDu2L4TW84PMKXhaWnI6ltI9S/auDu8f4hrFVzWFN1pjh7SM54p04gB/+f8/1qDg drjtTKnpzqJoWB1rWJv3PZZVS+caM4ChY41YlBngQfqs434fAPekeIIBRnGGxjsOgovs Ucp5Rct8UHj+8H9dj6jZ6G86L2Hu3gH8w9zR3YfrBYQfAnZ8wb68ciSRlUMNQ4LK+xo+ f0Og== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id d16si3716258ejr.303.2021.02.11.05.34.04; Thu, 11 Feb 2021 05:34:30 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231379AbhBKNaZ (ORCPT + 99 others); Thu, 11 Feb 2021 08:30:25 -0500 Received: from mail-pl1-f173.google.com ([209.85.214.173]:38148 "EHLO mail-pl1-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231802AbhBKNGu (ORCPT ); Thu, 11 Feb 2021 08:06:50 -0500 Received: by mail-pl1-f173.google.com with SMTP id x9so3282449plb.5 for ; Thu, 11 Feb 2021 05:06:34 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=Xq/j+6bSsQXfsiFmAqfeFgZtMEQEP9FoOV/ecRFhZFk=; b=Bn0/dI1itrOqPgr8UDUinOod3OXE4U5LBILORKHk8QmrGA6uNMHR6yPQFPf061bvLT sAYDK4OJTpwYLUv8OvIqHi2Iv0FmgAVmdLJpboiQjvdk6zcSII2vma7/XKx0Ug6rVzEa gFZ6vf22+hlt0RqW9l/9UKNr29YwNnYO/nS9jGx0tnGI93sKVJYwLZKRGCzV4zI35250 cJR/VbJsb+1Aa/6cHS0jdLd7+0VZp04+qIgxdMF4lfFXNz5iaccnng8mb09rWUHyoNSw C5aWRUZ6D3Ru7ZhpuQS3vvzPv446vvOb8rfvlFjesAC9+8YcJIHukP93lmh9jkuqFZcR Y6Tg== X-Gm-Message-State: AOAM530ejxPVguKAIu9DhqduJy4/IOLjS36thr092CCf9lBSsBUFgAsO aKsC6LAuSU+WmiRXOLb7hN0= X-Received: by 2002:a17:902:d4c9:b029:e2:ad28:56bb with SMTP id o9-20020a170902d4c9b02900e2ad2856bbmr7747993plg.37.1613048768806; Thu, 11 Feb 2021 05:06:08 -0800 (PST) Received: from karthik-strix-linux.karthek.com ([192.140.155.38]) by smtp.gmail.com with ESMTPSA id n12sm5190018pff.29.2021.02.11.05.06.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Feb 2021 05:06:08 -0800 (PST) Date: Thu, 11 Feb 2021 18:36:04 +0530 From: karthik alapati To: Greg Kroah-Hartman , Stephen Rothwell Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 2/2] staging: rtl8723bs: remove obsolete commented out code Message-ID: <485415dbafc32710f1a8e3f7c951868f7738efe9.1613048573.git.mail@karthek.com> 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 There is a bunch of messy, commented out code. Just delete it. Suggested-by: Dan Carpenter Signed-off-by: karthik alapati --- .../staging/rtl8723bs/hal/rtl8723b_phycfg.c | 40 +------------------ 1 file changed, 2 insertions(+), 38 deletions(-) diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c b/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c index 77132e4ee..22365926a 100644 --- a/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c +++ b/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c @@ -57,8 +57,6 @@ u32 PHY_QueryBBReg_8723B(struct adapter *Adapter, u32 RegAddr, u32 BitMask) return 0; #endif - /* RT_TRACE(COMP_RF, DBG_TRACE, ("--->PHY_QueryBBReg(): RegAddr(%#lx), BitMask(%#lx)\n", RegAddr, BitMask)); */ - OriginalValue = rtw_read32(Adapter, RegAddr); BitShift = phy_CalculateBitShift(BitMask); @@ -94,8 +92,6 @@ void PHY_SetBBReg_8723B( return; #endif - /* RT_TRACE(COMP_RF, DBG_TRACE, ("--->PHY_SetBBReg(): RegAddr(%#lx), BitMask(%#lx), Data(%#lx)\n", RegAddr, BitMask, Data)); */ - if (BitMask != bMaskDWord) { /* if not "double word" write */ OriginalValue = rtw_read32(Adapter, RegAddr); BitShift = phy_CalculateBitShift(BitMask); @@ -159,13 +155,9 @@ static u32 phy_RFSerialRead_8723B( if (RfPiEnable) { /* Read from BBreg8b8, 12 bits for 8190, 20bits for T65 RF */ retValue = PHY_QueryBBReg(Adapter, pPhyReg->rfLSSIReadBackPi|MaskforPhySet, bLSSIReadBackData); - - /* RT_DISP(FINIT, INIT_RF, ("Readback from RF-PI : 0x%x\n", retValue)); */ } else { /* Read from BBreg8a0, 12 bits for 8190, 20 bits for T65 RF */ retValue = PHY_QueryBBReg(Adapter, pPhyReg->rfLSSIReadBack|MaskforPhySet, bLSSIReadBackData); - - /* RT_DISP(FINIT, INIT_RF, ("Readback from RF-SI : 0x%x\n", retValue)); */ } return retValue; @@ -230,15 +222,11 @@ static void phy_RFSerialWrite_8723B( /* */ /* Put write addr in [5:0] and write data in [31:16] */ /* */ - /* DataAndAddr = (Data<<16) | (NewOffset&0x3f); */ DataAndAddr = ((NewOffset<<20) | (Data&0x000fffff)) & 0x0fffffff; /* T65 RF */ - /* */ /* Write Operation */ /* */ PHY_SetBBReg(Adapter, pPhyReg->rf3wireOffset, bMaskDWord, DataAndAddr); - /* RTPRINT(FPHY, PHY_RFW, ("RFW-%d Addr[0x%lx]= 0x%lx\n", eRFPath, pPhyReg->rf3wireOffset, DataAndAddr)); */ - } @@ -473,7 +461,6 @@ int PHY_RFConfig8723B(struct adapter *Adapter) rtStatus = PHY_RF6052_Config8723B(Adapter); phy_LCK_8723B(Adapter); - /* PHY_BB8723B_Config_1T(Adapter); */ return rtStatus; } @@ -580,8 +567,6 @@ u8 PHY_GetTxPowerIndex( s8 txPower = 0, powerDiffByRate = 0, limit = 0; bool bIn24G = false; - /* DBG_871X("===>%s\n", __func__); */ - txPower = (s8) PHY_GetTxPowerIndexBase(padapter, RFPath, Rate, BandWidth, Channel, &bIn24G); powerDiffByRate = PHY_GetTxPowerByRate(padapter, BAND_ON_2_4G, ODM_RF_PATH_A, RF_1TX, Rate); @@ -603,7 +588,6 @@ u8 PHY_GetTxPowerIndex( if (txPower > MAX_POWER_INDEX) txPower = MAX_POWER_INDEX; - /* DBG_871X("Final Tx Power(RF-%c, Channel: %d) = %d(0x%X)\n", ((RFPath == 0)?'A':'B'), Channel, txPower, txPower)); */ return (u8) txPower; } @@ -750,8 +734,6 @@ static void phy_PostSetBwMode8723B(struct adapter *Adapter) PHY_SetBBReg(Adapter, rFPGA1_RFMOD, bRFMOD, 0x0); -/* PHY_SetBBReg(Adapter, rFPGA0_AnalogParameter2, BIT10, 1); */ - PHY_SetBBReg(Adapter, rOFDM0_TxPseudoNoiseWgt, (BIT31|BIT30), 0x0); break; @@ -766,15 +748,9 @@ static void phy_PostSetBwMode8723B(struct adapter *Adapter) PHY_SetBBReg(Adapter, rOFDM1_LSTF, 0xC00, pHalData->nCur40MhzPrimeSC); -/* PHY_SetBBReg(Adapter, rFPGA0_AnalogParameter2, BIT10, 0); */ - PHY_SetBBReg(Adapter, 0x818, (BIT26|BIT27), (pHalData->nCur40MhzPrimeSC == HAL_PRIME_CHNL_OFFSET_LOWER) ? 2 : 1); - break; - default: - /*RT_TRACE(COMP_DBG, DBG_LOUD, ("phy_SetBWMode8723B(): unknown Bandwidth: %#X\n"\ - , pHalData->CurrentChannelBW));*/ break; } @@ -787,10 +763,8 @@ static void phy_SwChnl8723B(struct adapter *padapter) struct hal_com_data *pHalData = GET_HAL_DATA(padapter); u8 channelToSW = pHalData->CurrentChannel; - if (pHalData->rf_chip == RF_PSEUDO_11N) { - /* RT_TRACE(COMP_MLME, DBG_LOUD, ("phy_SwChnl8723B: return for PSEUDO\n")); */ + if (pHalData->rf_chip == RF_PSEUDO_11N) return; - } pHalData->RfRegChnlVal[0] = ((pHalData->RfRegChnlVal[0] & 0xfffff00) | channelToSW); PHY_SetRFReg(padapter, ODM_RF_PATH_A, RF_CHNLBW, 0x3FF, pHalData->RfRegChnlVal[0]); PHY_SetRFReg(padapter, ODM_RF_PATH_B, RF_CHNLBW, 0x3FF, pHalData->RfRegChnlVal[0]); @@ -802,7 +776,6 @@ static void phy_SwChnlAndSetBwMode8723B(struct adapter *Adapter) { struct hal_com_data *pHalData = GET_HAL_DATA(Adapter); - /* RT_TRACE(COMP_SCAN, DBG_LOUD, ("phy_SwChnlAndSetBwMode8723B(): bSwChnl %d, bSetChnlBW %d\n", pHalData->bSwChnl, pHalData->bSetChnlBW)); */ if (Adapter->bNotifyChannelChange) { DBG_871X("[%s] bSwChnl =%d, ch =%d, bSetChnlBW =%d, bw =%d\n", __func__, @@ -847,8 +820,6 @@ static void PHY_HandleSwChnlAndSetBW8723B( u8 tmpnCur80MhzPrimeSC = pHalData->nCur80MhzPrimeSC; u8 tmpCenterFrequencyIndex1 = pHalData->CurrentCenterFrequencyIndex1; - /* DBG_871X("=> PHY_HandleSwChnlAndSetBW8812: bSwitchChannel %d, bSetBandWidth %d\n", bSwitchChannel, bSetBandWidth); */ - /* check is swchnl or setbw */ if (!bSwitchChannel && !bSetBandWidth) { DBG_871X("PHY_HandleSwChnlAndSetBW8812: not switch channel and not set bandwidth\n"); @@ -857,7 +828,6 @@ static void PHY_HandleSwChnlAndSetBW8723B( /* skip change for channel or bandwidth is the same */ if (bSwitchChannel) { - /* if (pHalData->CurrentChannel != ChannelNum) */ { if (HAL_IsLegalChannel(Adapter, ChannelNum)) pHalData->bSwChnl = true; @@ -867,10 +837,8 @@ static void PHY_HandleSwChnlAndSetBW8723B( if (bSetBandWidth) pHalData->bSetChnlBW = true; - if (!pHalData->bSetChnlBW && !pHalData->bSwChnl) { - /* DBG_871X("<= PHY_HandleSwChnlAndSetBW8812: bSwChnl %d, bSetChnlBW %d\n", pHalData->bSwChnl, pHalData->bSetChnlBW); */ + if (!pHalData->bSetChnlBW && !pHalData->bSwChnl) return; - } if (pHalData->bSwChnl) { @@ -929,9 +897,5 @@ void PHY_SetSwChnlBWMode8723B( u8 Offset80 ) { - /* DBG_871X("%s() ===>\n", __func__); */ - PHY_HandleSwChnlAndSetBW8723B(Adapter, true, true, channel, Bandwidth, Offset40, Offset80, channel); - - /* DBG_871X("<==%s()\n", __func__); */ } -- 2.30.0