From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lf1-f43.google.com (mail-lf1-f43.google.com [209.85.167.43]) (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 C294F4A13AB for ; Wed, 15 Jul 2026 12:50:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.43 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119872; cv=none; b=ZiyeLghctFtGjPkaoc8Kyg2M6QHyL82tcpludCBBZXlloDCohp+cFmDJMx5+xb0R7Ogd1jDt6wgiv/75cw2HZaDEo3lCzfECtDAyXBqpOIbHOfHHtz8ARvubMtuOSVx9M8BRQESElBJRqyCF37VRFKFShFtzpaV11sk4PwiIrSc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119872; c=relaxed/simple; bh=ZybPtwgV9g5pEAiIu8Xt4xd8WcHEPSvLIBdB5uTgeIY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZEUwu8iobt9UaioXpDNNu78E2bUom2MUTAje0x1xnJbB/O8t9UAP7d1foZw2AsD9AEgPj7o/j1m3WMjwfHlvPa24jmGVrDZER0Gzle9EPncFeW0vD2JbnkDRT7q8h+uJSTPfYAumudYsNbW8RC75CMXfYb8UJGsCzNomd5sQqIE= 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=neCsnGdJ; arc=none smtp.client-ip=209.85.167.43 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="neCsnGdJ" Received: by mail-lf1-f43.google.com with SMTP id 2adb3069b0e04-5b0117dda13so1898817e87.0 for ; Wed, 15 Jul 2026 05:50:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784119854; x=1784724654; 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:content-type; bh=JKfBmQTqieXbamD4LbBY6VXDsMe0l1JKVyBB18eX4Mg=; b=neCsnGdJ17PxuWVVs17LTXCIPM9S8wT2kt7xC/fSL/uwbE+qh9M/maajCxX4jIbS93 +Hv2VU389CxSUqlQGdr5lmWWzlKlRObV4gRQCrE/DjjtjR/9UQTbZbucbbwx2KWGBZxx hj83y3jMkOePnh4z/tU1CSVxicyY1T1hyvZM8y5kUBCbpSUVBBJPEoCYZOAjXRMm/Qsr rK+ldUQSXZtXYOkvSRgO626mNgBAxpqnZPwAD1m5q4otMpzw16uF7Z0sqcc/MTQ4Mqe9 v+f2VFPOrozRPPMBeH9S8vkOedMu5HD1Ifb7V06oXxCzUWiIsmxGTOIvTpedEl5ijfk/ oujw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784119854; x=1784724654; 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:content-type; bh=JKfBmQTqieXbamD4LbBY6VXDsMe0l1JKVyBB18eX4Mg=; b=cXufeuSzJhQ2impgqL63vc6R9U9Cqusc6pzv8euWLJ8EpfptLWmjkeak1hESPOdusl beNYwVDX4kwKt8eOqfhIqvREPd8B7MydlTNdAiC5LXF8/H7ZW5wy9isCaKa0VPsMrvJ4 ZUm8ospPeLOXPSSlWXeD2hsKVBQ6eazx9qDKw90DwdIQqJy+FukaGhCm8QDAy5YmH9IW Kb2J3EVjWAaabp0DMO0P0OSjshXs6uO9092/2ZGUU2tiqz52rEhbvVsCtziIy4Awmw2q fzzTheJiuSxrY56JUTg7QQ3mz8t8FPcqWomVORP0UqbdECkog4dGGcp2uYPrSJg/NK4a 35Eg== X-Forwarded-Encrypted: i=1; AHgh+RqAUFOjr7hR0h+c79r57DJXKV3rGdNY0wFbfa+yUL2MGNqXWK0RM4ngRem3f7ELZkMEG/jyWLgp4WmvE0I=@vger.kernel.org X-Gm-Message-State: AOJu0YyytqsuYDrKtrYJi0sVWNqfDqoc3wGifi15YSMvgpXACwmyUVc9 15Der6zmMr7E27ESLaZfcQmn76c/xCa94ycwLmfKHeROUH15LkPHcsAc X-Gm-Gg: AfdE7cnYZE2OA0n3/ZyZsjrD49XmRC35TH32vUqXH8CLxuG6JF4hZdoB89TurxI5tRk MKZi+LTPReSzofQO9+Ewpb6nMDt41wL4hL1tyjq+Id4DPC5XafujlWZ08LFqMZB1H7rHXSqEbJY 2oupR03Hq3KzXYygQ/LeAgioyyxCZgctPImmphmk/Z2m6xgeIN11bzbV50Yykk/UAmdFVt7YyMJ tRinvonydorD6QZ2dizmauQnYZK8W088sdsT7GIS6km773TBsnF2dWL5/VyBwRgQ7sFdKqHimbW OgCj9tqsHXvYjMV9HbYRL2DuEun9TKlODFFyHqyUpDLj/gRQQ774iLzhuuoN5lkDxEUzlrdBcdg yzcBhVIQeOHrDP/aKMAIaGRsdAtY8ALWivg8lOU3sLW+qkaAeX4faU7EM/z+fkcQWo+F5nWAJMN WdiBEvIEM3gW5LA9dCBhhtaakpIMJfMKnquv3eEekE3p6EMYgDgE5qZfZib9+exbTxq6/uk4gFK AV5PR16nc7ZHg== X-Received: by 2002:a05:6512:12cc:b0:5b0:17e7:67cb with SMTP id 2adb3069b0e04-5b02366a270mr4528182e87.17.1784119854037; Wed, 15 Jul 2026 05:50:54 -0700 (PDT) Received: from archlinux ([94.180.44.28]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b022fac999sm3404042e87.55.2026.07.15.05.50.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2026 05:50:53 -0700 (PDT) From: Arsenii Pashchenko To: Greg Kroah-Hartman Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, ulijg308@gmail.com Subject: [PATCH 48/61] staging: rtl8723bs: remove PHY_TxPowerByRateConfiguration wrapper Date: Wed, 15 Jul 2026 19:48:16 +0700 Message-ID: <20260715124829.90290-49-ulijg308@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260715124829.90290-1-ulijg308@gmail.com> References: <20260715124829.90290-1-ulijg308@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 Remove the single-use function PHY_TxPowerByRateConfiguration. Inline its code directly at the call site, along with the relevant block comment, to eliminate an unnecessary redirection layer and clean up the overall driver flow. Signed-off-by: Arsenii Pashchenko --- drivers/staging/rtl8723bs/hal/hal_com_phycfg.c | 13 ++----------- drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c | 7 ++++--- drivers/staging/rtl8723bs/include/hal_com_phycfg.h | 1 - drivers/staging/rtl8723bs/include/rtl8723b_hal.h | 4 ++++ 4 files changed, 10 insertions(+), 15 deletions(-) diff --git a/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c b/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c index 21b9d1c82..32b69ba3b 100644 --- a/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c +++ b/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c @@ -60,7 +60,7 @@ phy_SetTxPowerByRateBase(struct adapter *Adapter, u8 RfPath, } } -static void phy_StoreTxPowerByRateBase(struct adapter *padapter) +void phy_StoreTxPowerByRateBase(struct adapter *padapter) { u8 path, base; @@ -367,7 +367,7 @@ void PHY_StoreTxPowerByRate( } } -static void phy_ConvertTxPowerByRateInDbmToRelativeValues(struct adapter *padapter) +void phy_ConvertTxPowerByRateInDbmToRelativeValues(struct adapter *padapter) { u8 base = 0; u8 i = 0; @@ -408,15 +408,6 @@ static void phy_ConvertTxPowerByRateInDbmToRelativeValues(struct adapter *padapt } } -/* - * This function must be called if the value in the PHY_REG_PG.txt(or header) - * is exact dBm values - */ -void PHY_TxPowerByRateConfiguration(struct adapter *padapter) -{ - phy_StoreTxPowerByRateBase(padapter); - phy_ConvertTxPowerByRateInDbmToRelativeValues(padapter); -} void PHY_SetTxPowerIndexByRateSection( struct adapter *padapter, u8 RFPath, u8 Channel, u8 RateSection diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c b/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c index d6369eb7b..75d01e730 100644 --- a/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c +++ b/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c @@ -346,9 +346,10 @@ static int phy_BB8723b_Config_ParaFile(struct adapter *Adapter) pHalData->EEPROMRegulatory != 2)) { ODM_ConfigBBWithHeaderFile(&pHalData->odmpriv, CONFIG_BB_PHY_REG_PG); - if (pHalData->odmpriv.PhyRegPgValueType == PHY_REG_PG_EXACT_VALUE) - PHY_TxPowerByRateConfiguration(Adapter); - + if (pHalData->odmpriv.PhyRegPgValueType == PHY_REG_PG_EXACT_VALUE) { + phy_StoreTxPowerByRateBase(Adapter); + phy_ConvertTxPowerByRateInDbmToRelativeValues(Adapter); + } if (Adapter->registrypriv.reg_enable_tx_power_limit == 1 || (Adapter->registrypriv.reg_enable_tx_power_limit == 2 && pHalData->EEPROMRegulatory == 1)) diff --git a/drivers/staging/rtl8723bs/include/hal_com_phycfg.h b/drivers/staging/rtl8723bs/include/hal_com_phycfg.h index cb7c7ed74..2dde01c2a 100644 --- a/drivers/staging/rtl8723bs/include/hal_com_phycfg.h +++ b/drivers/staging/rtl8723bs/include/hal_com_phycfg.h @@ -85,7 +85,6 @@ void PHY_InitTxPowerByRate(struct adapter *padapter); void PHY_StoreTxPowerByRate(struct adapter *padapter, u32 RfPath, u32 RegAddr, u32 BitMask, u32 Data); -void PHY_TxPowerByRateConfiguration(struct adapter *padapter); u8 PHY_GetTxPowerIndexBase(struct adapter *padapter, u8 RFPath, u8 Rate, enum channel_width BandWidth, u8 Channel); diff --git a/drivers/staging/rtl8723bs/include/rtl8723b_hal.h b/drivers/staging/rtl8723bs/include/rtl8723b_hal.h index b6006110a..fe6401c4f 100644 --- a/drivers/staging/rtl8723bs/include/rtl8723b_hal.h +++ b/drivers/staging/rtl8723bs/include/rtl8723b_hal.h @@ -239,4 +239,8 @@ s32 c2h_handler_8723b(struct adapter *padapter, u8 *pC2hEvent); void Hal_ReadRFGainOffset(struct adapter *padapter, u8 *hwinfo, bool AutoLoadFail); + +void phy_StoreTxPowerByRateBase(struct adapter *padapter); +void phy_ConvertTxPowerByRateInDbmToRelativeValues(struct adapter *padapter); + #endif -- 2.55.0