From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A4F353D9DDE for ; Thu, 9 Apr 2026 13:51:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.174 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775742715; cv=none; b=WO/jSWrc5CbU+xcVFV4YVETUT2KBNDdBAKoOz6c1pGP4v9mCL+xXN5yoguMfxfIydO+9ux8/eNwaYRlU27P2Scv7UH0xkkc+G97vDQWwugA6exmcqE+r1bcR6qEHULKExskSPySt034OQ+OZU1muWjN1MW6aHEIevszmRdfQark= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775742715; c=relaxed/simple; bh=FRKDWcaI2dd+q/YHsz5EPwK/dwR9fegXhSXr8oRgp+4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ozVVsIBTzm7y9WqIMaqA4Y+nSkceGMbSmP+JZLAhEYd7pQXzsS6b5p7kuSWuFQqa6pMYPJJNaw2Fw6tH1MVddemJ/m7qvlZRZ2BccETtS/kP+13fYWA3SZTgebencPfeB1ORHYhkOrkMgAaL2VIvpW8MMktO6QIWUJYonJBWMiQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=P5pPFzYh; arc=none smtp.client-ip=209.85.214.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="P5pPFzYh" Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-2ad21f437eeso5077425ad.0 for ; Thu, 09 Apr 2026 06:51:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775742710; x=1776347510; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=lqVqgMnpwts9PCufMDBF0YteLxaKZEFLyzQXe30weDc=; b=P5pPFzYhEjKbUg8gOrhRzN+TrPq/ECy79a9qXuvg2vyKUbobjVhPnXBlKFOgXRbAhW kCPt0zGGICyTAqUQgJfkRhErZK2TKp4bh4i0X9EEyPoR4DYwnJmmoVWZlNiVTx/2K4lW 5RqtkZhuuhti5DT33+aA73IXrHVAds1+lQ9FSnrfnhau/brvXsV3t3NWvhoaiTgbB27k QDxXCeCEV2JFkJ5gLncIxLJMUoJFJZC3NXQ+ScXqA3zefOu6QZxwzbRRnzNegjECFOKM LdyeEoZ6MHEyND14aZGF0SHMB9mG1+HODBT36oAL4QswP0vtlcJucaaNP5cwYVrRzQ4U fscA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775742710; x=1776347510; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=lqVqgMnpwts9PCufMDBF0YteLxaKZEFLyzQXe30weDc=; b=Gu/CAYjOF1+cRHeUVU+A0Lii/pINFhqZ/WXZeiiwJTdKHotsikqhnRX9NJEMsyF5ed LVVsvSMIFSO3GORq/6Iqzebh6RIrP5PMWF5oxkFyXbqLmqh2bZ0ju9BuqVIXROVz2irW aW9Hc0kPsGdIJ2QzwxNWLPTGLhviq0bXYxZpiYfCfofNvDIKmiI8JghQ/8LB4PGkxsdU u46OxbzMojxwuzVI7449tTOWc5WRJEkEmS2i/ekOKU00LXJV9KHWLHA2flyMhOkLLt6h IznaEpdnIWuYj8POt5fSlpZ/IgYkCKQdqF9n9gMDLaGuARWIFv/66IxN8vJvqRSiHjnh ibbw== X-Forwarded-Encrypted: i=1; AJvYcCWqh5Ti5q7Wmvixao48VLpSZ02ALHfdVGfXR5XztHWlZr7LS9laiI0y2Hvnw+d0G7h9VXSXkL+NWFwPMqI=@vger.kernel.org X-Gm-Message-State: AOJu0YwaHz68+Opl6CiN05+h51LKQcktaihQ8JwKe1tvi7D+VFuD62Oc Zv2CAAesEjUxIR8ED0WSeozuBAJ+l7ctqupc/D3/MlHGLeJWibEx5JTU X-Gm-Gg: AeBDievmAar6i4JfxUxGP+J3s24285MKsXl98pkO0h4Ybqs8aZuGjJ8yUmGY9KAUhX0 1btlUJnr8/n3oj2Z0go+cplSec5WZSbtNkyE5ewILGzuQWa1frNxzgQiZ/9PjBH8FMCeeQ7MnRB Hn62jQ9O+dkmZ+Hjf2dgsgiZCla73jr2ZqyNRxEbyD5h3q/0xkeOwHgmallA+MPSV49hZD/h0vq t9ZYE9dBPKh4NIA88cFjxbfA1uN17/Gjop+0ecCIF/cc8MKuznqOEzcBxAvvW8s4JljpObdObsw vQVCrPM+Qk6V53YrXB4hE9sXl7WJSgoT10/1JFauAbPSUGAr56ltQRK2SMItbTyhyuNbsL3/OdB 8DLNmLIyJGj8qLUslLwggZkmeTOYItC2FeW0wAziJpwht6LzOZRJ0ZOy/9KkHPcnM4N3j0jOLLe iPxgbMUYKy8rWpK5sVmIL2qrqaSP2+bK5GK0p5uthELgr770Fo+u4= X-Received: by 2002:a17:902:b18f:b0:2b2:4f43:b49a with SMTP id d9443c01a7336-2b2c736e506mr23268085ad.22.1775742710472; Thu, 09 Apr 2026 06:51:50 -0700 (PDT) Received: from localhost.localdomain ([111.125.237.246]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b27478945asm315288855ad.28.2026.04.09.06.51.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Apr 2026 06:51:50 -0700 (PDT) From: Prithvi Tambewagh To: gregkh@linuxfoundation.org, abrahamadekunle50@gmail.com, b9788213@gmail.com, straube.linux@gmail.com, tmimiharoen@gmail.com, filippo.muschera@gmail.com, ethantidmore06@gmail.com, andriy.shevchenko@linux.intel.com, rayfraytech@gmail.com, david@cardinalsystem.net, weibu@redadmin.org, dharanitharan725@gmail.com, ignacio.pena87@gmail.com, dan.carpenter@linaro.org, karanja99erick@gmail.com, luka.gejak@linux.dev, khushalchitturi@gmail.com, suunj1331@gmail.com, s9430939@naver.com, nikolayof23@gmail.com, bryant.boatright@proton.me, ysinghcin@gmail.com Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, linux-kernel-mentees@lists.linux.dev, skhan@linuxfoundation.org, david.hunter.linux@gmail.com, khalid@kernel.org, Prithvi Tambewagh Subject: [PATCH v4 5/5] staging: rtl8723bs: remove duplicate rate checks in PHY_GetTxPowerIndexBase() Date: Thu, 9 Apr 2026 19:20:26 +0530 Message-Id: <20260409135026.137904-6-activprithvi@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260409135026.137904-1-activprithvi@gmail.com> References: <20260409135026.137904-1-activprithvi@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The code previously checked (Rate >= MGN_MCS0 && Rate <= MGN_MCS7) condition twice - once for the (BandWidth == CHANNEL_WIDTH_20) check and once for the (BandWidth == CHANNEL_WIDTH_40) check. Fix if statement formatting to move that if check as an outer if check to improve code formatting. Signed-off-by: Prithvi Tambewagh --- drivers/staging/rtl8723bs/hal/hal_com_phycfg.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c b/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c index 2746da0a9846..45dbe1782bae 100644 --- a/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c +++ b/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c @@ -473,11 +473,10 @@ u8 PHY_GetTxPowerIndexBase( if ((Rate >= MGN_6M && Rate <= MGN_54M) && !IS_CCK_RATE(Rate)) txPower += pHalData->OFDM_24G_Diff[RFPath][TX_1S]; - if (BandWidth == CHANNEL_WIDTH_20) { /* BW20-1S, BW20-2S */ - if (MGN_MCS0 <= Rate && Rate <= MGN_MCS7) + if (Rate >= MGN_MCS0 && Rate <= MGN_MCS7) { + if (BandWidth == CHANNEL_WIDTH_20) /* BW20-1S, BW20-2S */ txPower += pHalData->BW20_24G_Diff[RFPath][TX_1S]; - } else if (BandWidth == CHANNEL_WIDTH_40) { /* BW40-1S, BW40-2S */ - if (MGN_MCS0 <= Rate && Rate <= MGN_MCS7) + else if (BandWidth == CHANNEL_WIDTH_40) /* BW40-1S, BW40-2S */ txPower += pHalData->BW40_24G_Diff[RFPath][TX_1S]; } -- 2.34.1