From nobody Sat Apr 4 01:47:50 2026 Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) (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 E125D14AD20 for ; Sat, 21 Mar 2026 10:40:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.67 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774089630; cv=none; b=G5laXqs9N+ajyrSvkNQp4xAXmKEl98EifTCu+0GRWfqTRHxXmc4PFTshed2shgbGazqcvprNBaXb6zRqOd4FLT7MT6xNY8uFYKqcXu3odcTqIe62RPo4LXgICAx52U4C3FHt6xO2vweXuiFWBV4RdiZZ7LPEpNuPPV1iioTw6Is= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774089630; c=relaxed/simple; bh=BYig1v1UB0ekdgI7eZWkr0JYIqw+F/dIegZQ0gbIXVA=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type; b=i1Qjoh6k/KM3PkDzwtepLiy7EZT11iSYfIT5Uaf6Kq7v7FklrytXKn5ykS8O+RgY8ZsORjNamhii4Ev1zluRmFgxAECW18v30YIUgrT2+FzzyKNfSZPyVO9PmerKD2ClZLU1S2tZ0/4lkF7A6zaEPI9719ZTUtW9Rgm6ZMKrsyU= 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=NLeAIJwC; arc=none smtp.client-ip=209.85.221.67 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="NLeAIJwC" Received: by mail-wr1-f67.google.com with SMTP id ffacd0b85a97d-439b94a19fdso1290215f8f.0 for ; Sat, 21 Mar 2026 03:40:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1774089627; x=1774694427; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=D1ugOMNYrLcyPD/ERWBI5HFPpNjUZlBaVZDvD60s26c=; b=NLeAIJwCNWSdzTBe3XaTLnC7UPH4NpLoXvB87ynbG0UtwjcRth9ILyU2GX4F0DoPXA egEnDHhZuwO1ZffIZIt56PqToy3YPPHkcHew7LhgX/hTudHlovMYrOEwYi0+46VPiTQm xR31Cfku/YPICnPjS7syqw69gVjZqOHaZUko4Q2dn5E6vIvCiDacRkORk6bSwTGPjS7K DY1POsIRYtDkOcgqRStE/9/EAQRglx37OyXxs3rwtU4zzpaUkahuMVNW1E1g6oACzUyV /Xq5jl8d4GmoPcBgtKtotjbXY3o80xGANnBf7Mi9cnPvxxqnBSLg8Vn2sT4nicWmlXLJ tvXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774089627; x=1774694427; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=D1ugOMNYrLcyPD/ERWBI5HFPpNjUZlBaVZDvD60s26c=; b=ZmcYMFU8sefhua8upbRbluhHAj9BVMW/Nga13TlwTpwxL1stVTH5MaA9vE4cWxDYRm dfE/o2B3JFeaH0lZz2y1McR/a5bYtK8rCvMeOt5USwmTllSvmro+zXbnNV6TiPv2Y9ZT a/dhjCwJ6zMFxBUP+Yir0e5xV1qBEglFBzPkXhxsaJLBjdxPmKYxTduPtWGB0cxpEUyX MF+wMO3LKYa/9+yarPukLNerwcf5F/dyczV5QhUir9LfsxUyF2/NH8xie9Imdujh9+TF Ym1qi9j1VyCzmbIpk3eyutCoZkgL+zgix52BT1ufUfpddzqD5w17Fx7x3jv0UUmTPr1H Uqew== X-Forwarded-Encrypted: i=1; AJvYcCUgdfecLN169qcN1Mum+xI6D7MKzNo7JA+0IUtNIizQk3y+kpHLogrMiX5J48xswB1UT4DiXPtiX7EdgMc=@vger.kernel.org X-Gm-Message-State: AOJu0YzSuJ4hVysprDGSyqBGi8BpfS/LnKohlGQRsmv7PELaKOd6jP86 q84EfMcAVB94njWjPiwsD43pL2aCnhz7bNTdz7xdo6Gddsn8ALxWQTRB X-Gm-Gg: ATEYQzykKXg2jRejyY6OssQfg8VfS82woJVqZloXEJKk3qpVSna5MXo8dOQBXChUqHM KlO/qeYENVx9M0Ck8UcByIwq4Y0lG1AfydoNjw1c6/M7ceh+I5BOA9IFH05Xl33M6HR8HQdEj4Y CJKuvdqtxh5YVQ3b0nWO+e6FK0NKWv7LBQeZkRMTxkbGaMhfuy+tS/rrHE4arppuY7VMHF8ikHc fYwGvsG0zvDC0344zR8Q/OV1zGIVzXDC87VLWhiLW5Ngt/YWQB87Gx0Utyp8w6DmaNIVwql8/zJ dsCmgP0N+29Y6m5cZPR7dLAYYabcsGFiQl4aZLqrtjGILnxdF4cX+S9xqUPrf14d0bkZmX06xd5 qPgJ+1IbBqWFpZiMbF6ijUphwBuPD7qBQfjrEwHWqm2vZ6g0gc1WLwCTf/m1U6jch4S5nr6hUDh MtXBXfme1vlSP+4/fJqwbIZtJG X-Received: by 2002:a05:6000:1841:b0:43b:54c9:7d25 with SMTP id ffacd0b85a97d-43b64270abdmr9668826f8f.38.1774089626930; Sat, 21 Mar 2026 03:40:26 -0700 (PDT) Received: from bera-arch ([46.154.44.198]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43b6470b243sm13047281f8f.26.2026.03.21.03.40.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Mar 2026 03:40:26 -0700 (PDT) From: =?UTF-8?q?Bera=20Y=C3=BCzl=C3=BC?= To: gregkh@linuxfoundation.org Cc: Yeking@Red54.com, andriy.shevchenko@linux.intel.com, ethantidmore06@gmail.com, hansg@kernel.org, linux-kernel@vger.kernel.org, linux-staging@lists.linux.dev, rayfraytech@gmail.com, straube.linux@gmail.com, =?UTF-8?q?Bera=20Y=C3=BCzl=C3=BC?= Subject: [PATCH v2] staging: rtl8723bs: remove reduntant functions Date: Sat, 21 Mar 2026 13:40:02 +0300 Message-ID: <20260321104001.46968-2-b9788213@gmail.com> X-Mailer: git-send-email 2.53.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable GetU1ByteIntegerFromStringInDecimal() is a copy of kstrtou8(). But its only called by PHY_SetTxPowerLimit() which is only called by odm_ConfigBB_TXPWR_LMT_8723B() which is only called by ODM_ReadAndConfig_MP_8723B_TXPWR_LMT(). But ODM_ReadAndConfig_MP_8723B_TXPWR_LMT() didn't called anywhere so removed: GetU1ByteIntegerFromStringInDecimal() PHY_SetTxPowerLimit() odm_ConfigBB_TXPWR_LMT_8723B() ODM_ReadAndConfig_MP_8723B_TXPWR_LMT() Signed-off-by: Bera Y=C3=BCzl=C3=BC --- V2: Removed others V1: Removed only GetU1ByteIntegerFromStringInDecimal() V1 link: https://lore.kernel.org/linux-staging/ab2fZaBu_5EJieMq@ashevche-de= sk.local/T/#u .../staging/rtl8723bs/hal/HalHWImg8723B_RF.c | 200 ------------------ drivers/staging/rtl8723bs/hal/hal_com.c | 19 -- .../staging/rtl8723bs/hal/hal_com_phycfg.c | 53 ----- .../rtl8723bs/hal/odm_RegConfig8723B.c | 21 -- .../rtl8723bs/hal/odm_RegConfig8723B.h | 9 - drivers/staging/rtl8723bs/include/hal_com.h | 2 - .../rtl8723bs/include/hal_com_phycfg.h | 3 - 7 files changed, 307 deletions(-) diff --git a/drivers/staging/rtl8723bs/hal/HalHWImg8723B_RF.c b/drivers/sta= ging/rtl8723bs/hal/HalHWImg8723B_RF.c index 0c7d0307b822..0fb1751970d9 100644 --- a/drivers/staging/rtl8723bs/hal/HalHWImg8723B_RF.c +++ b/drivers/staging/rtl8723bs/hal/HalHWImg8723B_RF.c @@ -353,203 +353,3 @@ void ODM_ReadAndConfig_MP_8723B_TxPowerTrack_SDIO(str= uct dm_odm_t *pDM_Odm) DELTA_SWINGIDX_SIZE ); } - -/*************************************************************************= ***** - * TXPWR_LMT.TXT - *************************************************************************= *****/ - -static u8 *Array_MP_8723B_TXPWR_LMT[] =3D { - "FCC", "20M", "CCK", "1T", "01", "32", - "ETSI", "20M", "CCK", "1T", "01", "32", - "MKK", "20M", "CCK", "1T", "01", "32", - "FCC", "20M", "CCK", "1T", "02", "32", - "ETSI", "20M", "CCK", "1T", "02", "32", - "MKK", "20M", "CCK", "1T", "02", "32", - "FCC", "20M", "CCK", "1T", "03", "32", - "ETSI", "20M", "CCK", "1T", "03", "32", - "MKK", "20M", "CCK", "1T", "03", "32", - "FCC", "20M", "CCK", "1T", "04", "32", - "ETSI", "20M", "CCK", "1T", "04", "32", - "MKK", "20M", "CCK", "1T", "04", "32", - "FCC", "20M", "CCK", "1T", "05", "32", - "ETSI", "20M", "CCK", "1T", "05", "32", - "MKK", "20M", "CCK", "1T", "05", "32", - "FCC", "20M", "CCK", "1T", "06", "32", - "ETSI", "20M", "CCK", "1T", "06", "32", - "MKK", "20M", "CCK", "1T", "06", "32", - "FCC", "20M", "CCK", "1T", "07", "32", - "ETSI", "20M", "CCK", "1T", "07", "32", - "MKK", "20M", "CCK", "1T", "07", "32", - "FCC", "20M", "CCK", "1T", "08", "32", - "ETSI", "20M", "CCK", "1T", "08", "32", - "MKK", "20M", "CCK", "1T", "08", "32", - "FCC", "20M", "CCK", "1T", "09", "32", - "ETSI", "20M", "CCK", "1T", "09", "32", - "MKK", "20M", "CCK", "1T", "09", "32", - "FCC", "20M", "CCK", "1T", "10", "32", - "ETSI", "20M", "CCK", "1T", "10", "32", - "MKK", "20M", "CCK", "1T", "10", "32", - "FCC", "20M", "CCK", "1T", "11", "32", - "ETSI", "20M", "CCK", "1T", "11", "32", - "MKK", "20M", "CCK", "1T", "11", "32", - "FCC", "20M", "CCK", "1T", "12", "63", - "ETSI", "20M", "CCK", "1T", "12", "32", - "MKK", "20M", "CCK", "1T", "12", "32", - "FCC", "20M", "CCK", "1T", "13", "63", - "ETSI", "20M", "CCK", "1T", "13", "32", - "MKK", "20M", "CCK", "1T", "13", "32", - "FCC", "20M", "CCK", "1T", "14", "63", - "ETSI", "20M", "CCK", "1T", "14", "63", - "MKK", "20M", "CCK", "1T", "14", "32", - "FCC", "20M", "OFDM", "1T", "01", "28", - "ETSI", "20M", "OFDM", "1T", "01", "32", - "MKK", "20M", "OFDM", "1T", "01", "32", - "FCC", "20M", "OFDM", "1T", "02", "28", - "ETSI", "20M", "OFDM", "1T", "02", "32", - "MKK", "20M", "OFDM", "1T", "02", "32", - "FCC", "20M", "OFDM", "1T", "03", "32", - "ETSI", "20M", "OFDM", "1T", "03", "32", - "MKK", "20M", "OFDM", "1T", "03", "32", - "FCC", "20M", "OFDM", "1T", "04", "32", - "ETSI", "20M", "OFDM", "1T", "04", "32", - "MKK", "20M", "OFDM", "1T", "04", "32", - "FCC", "20M", "OFDM", "1T", "05", "32", - "ETSI", "20M", "OFDM", "1T", "05", "32", - "MKK", "20M", "OFDM", "1T", "05", "32", - "FCC", "20M", "OFDM", "1T", "06", "32", - "ETSI", "20M", "OFDM", "1T", "06", "32", - "MKK", "20M", "OFDM", "1T", "06", "32", - "FCC", "20M", "OFDM", "1T", "07", "32", - "ETSI", "20M", "OFDM", "1T", "07", "32", - "MKK", "20M", "OFDM", "1T", "07", "32", - "FCC", "20M", "OFDM", "1T", "08", "32", - "ETSI", "20M", "OFDM", "1T", "08", "32", - "MKK", "20M", "OFDM", "1T", "08", "32", - "FCC", "20M", "OFDM", "1T", "09", "32", - "ETSI", "20M", "OFDM", "1T", "09", "32", - "MKK", "20M", "OFDM", "1T", "09", "32", - "FCC", "20M", "OFDM", "1T", "10", "28", - "ETSI", "20M", "OFDM", "1T", "10", "32", - "MKK", "20M", "OFDM", "1T", "10", "32", - "FCC", "20M", "OFDM", "1T", "11", "28", - "ETSI", "20M", "OFDM", "1T", "11", "32", - "MKK", "20M", "OFDM", "1T", "11", "32", - "FCC", "20M", "OFDM", "1T", "12", "63", - "ETSI", "20M", "OFDM", "1T", "12", "32", - "MKK", "20M", "OFDM", "1T", "12", "32", - "FCC", "20M", "OFDM", "1T", "13", "63", - "ETSI", "20M", "OFDM", "1T", "13", "32", - "MKK", "20M", "OFDM", "1T", "13", "32", - "FCC", "20M", "OFDM", "1T", "14", "63", - "ETSI", "20M", "OFDM", "1T", "14", "63", - "MKK", "20M", "OFDM", "1T", "14", "63", - "FCC", "20M", "HT", "1T", "01", "26", - "ETSI", "20M", "HT", "1T", "01", "32", - "MKK", "20M", "HT", "1T", "01", "32", - "FCC", "20M", "HT", "1T", "02", "26", - "ETSI", "20M", "HT", "1T", "02", "32", - "MKK", "20M", "HT", "1T", "02", "32", - "FCC", "20M", "HT", "1T", "03", "32", - "ETSI", "20M", "HT", "1T", "03", "32", - "MKK", "20M", "HT", "1T", "03", "32", - "FCC", "20M", "HT", "1T", "04", "32", - "ETSI", "20M", "HT", "1T", "04", "32", - "MKK", "20M", "HT", "1T", "04", "32", - "FCC", "20M", "HT", "1T", "05", "32", - "ETSI", "20M", "HT", "1T", "05", "32", - "MKK", "20M", "HT", "1T", "05", "32", - "FCC", "20M", "HT", "1T", "06", "32", - "ETSI", "20M", "HT", "1T", "06", "32", - "MKK", "20M", "HT", "1T", "06", "32", - "FCC", "20M", "HT", "1T", "07", "32", - "ETSI", "20M", "HT", "1T", "07", "32", - "MKK", "20M", "HT", "1T", "07", "32", - "FCC", "20M", "HT", "1T", "08", "32", - "ETSI", "20M", "HT", "1T", "08", "32", - "MKK", "20M", "HT", "1T", "08", "32", - "FCC", "20M", "HT", "1T", "09", "32", - "ETSI", "20M", "HT", "1T", "09", "32", - "MKK", "20M", "HT", "1T", "09", "32", - "FCC", "20M", "HT", "1T", "10", "26", - "ETSI", "20M", "HT", "1T", "10", "32", - "MKK", "20M", "HT", "1T", "10", "32", - "FCC", "20M", "HT", "1T", "11", "26", - "ETSI", "20M", "HT", "1T", "11", "32", - "MKK", "20M", "HT", "1T", "11", "32", - "FCC", "20M", "HT", "1T", "12", "63", - "ETSI", "20M", "HT", "1T", "12", "32", - "MKK", "20M", "HT", "1T", "12", "32", - "FCC", "20M", "HT", "1T", "13", "63", - "ETSI", "20M", "HT", "1T", "13", "32", - "MKK", "20M", "HT", "1T", "13", "32", - "FCC", "20M", "HT", "1T", "14", "63", - "ETSI", "20M", "HT", "1T", "14", "63", - "MKK", "20M", "HT", "1T", "14", "63", - "FCC", "40M", "HT", "1T", "01", "63", - "ETSI", "40M", "HT", "1T", "01", "63", - "MKK", "40M", "HT", "1T", "01", "63", - "FCC", "40M", "HT", "1T", "02", "63", - "ETSI", "40M", "HT", "1T", "02", "63", - "MKK", "40M", "HT", "1T", "02", "63", - "FCC", "40M", "HT", "1T", "03", "26", - "ETSI", "40M", "HT", "1T", "03", "32", - "MKK", "40M", "HT", "1T", "03", "32", - "FCC", "40M", "HT", "1T", "04", "26", - "ETSI", "40M", "HT", "1T", "04", "32", - "MKK", "40M", "HT", "1T", "04", "32", - "FCC", "40M", "HT", "1T", "05", "32", - "ETSI", "40M", "HT", "1T", "05", "32", - "MKK", "40M", "HT", "1T", "05", "32", - "FCC", "40M", "HT", "1T", "06", "32", - "ETSI", "40M", "HT", "1T", "06", "32", - "MKK", "40M", "HT", "1T", "06", "32", - "FCC", "40M", "HT", "1T", "07", "32", - "ETSI", "40M", "HT", "1T", "07", "32", - "MKK", "40M", "HT", "1T", "07", "32", - "FCC", "40M", "HT", "1T", "08", "26", - "ETSI", "40M", "HT", "1T", "08", "32", - "MKK", "40M", "HT", "1T", "08", "32", - "FCC", "40M", "HT", "1T", "09", "26", - "ETSI", "40M", "HT", "1T", "09", "32", - "MKK", "40M", "HT", "1T", "09", "32", - "FCC", "40M", "HT", "1T", "10", "26", - "ETSI", "40M", "HT", "1T", "10", "32", - "MKK", "40M", "HT", "1T", "10", "32", - "FCC", "40M", "HT", "1T", "11", "26", - "ETSI", "40M", "HT", "1T", "11", "32", - "MKK", "40M", "HT", "1T", "11", "32", - "FCC", "40M", "HT", "1T", "12", "63", - "ETSI", "40M", "HT", "1T", "12", "32", - "MKK", "40M", "HT", "1T", "12", "32", - "FCC", "40M", "HT", "1T", "13", "63", - "ETSI", "40M", "HT", "1T", "13", "32", - "MKK", "40M", "HT", "1T", "13", "32", - "FCC", "40M", "HT", "1T", "14", "63", - "ETSI", "40M", "HT", "1T", "14", "63", - "MKK", "40M", "HT", "1T", "14", "63" -}; - -void ODM_ReadAndConfig_MP_8723B_TXPWR_LMT(struct dm_odm_t *pDM_Odm) -{ - u32 i =3D 0; - u8 **Array =3D Array_MP_8723B_TXPWR_LMT; - - for (i =3D 0; i < ARRAY_SIZE(Array_MP_8723B_TXPWR_LMT); i +=3D 6) { - u8 *regulation =3D Array[i]; - u8 *bandwidth =3D Array[i+1]; - u8 *rate =3D Array[i+2]; - u8 *rfPath =3D Array[i+3]; - u8 *chnl =3D Array[i+4]; - u8 *val =3D Array[i+5]; - - odm_ConfigBB_TXPWR_LMT_8723B( - pDM_Odm, - regulation, - bandwidth, - rate, - rfPath, - chnl, - val - ); - } -} diff --git a/drivers/staging/rtl8723bs/hal/hal_com.c b/drivers/staging/rtl8= 723bs/hal/hal_com.c index 50370b14ce7c..4f4a430c9f87 100644 --- a/drivers/staging/rtl8723bs/hal/hal_com.c +++ b/drivers/staging/rtl8723bs/hal/hal_com.c @@ -751,25 +751,6 @@ void SetHalODMVar( } } =20 - -bool GetU1ByteIntegerFromStringInDecimal(char *Str, u8 *pInt) -{ - u16 i =3D 0; - *pInt =3D 0; - - while (Str[i] !=3D '\0') { - if (Str[i] >=3D '0' && Str[i] <=3D '9') { - *pInt *=3D 10; - *pInt +=3D (Str[i] - '0'); - } else - return false; - - ++i; - } - - return true; -} - void rtw_hal_check_rxfifo_full(struct adapter *adapter) { /* switch counter to RX fifo */ diff --git a/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c b/drivers/stagi= ng/rtl8723bs/hal/hal_com_phycfg.c index bdd595a99b98..4a3eb6d79f33 100644 --- a/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c +++ b/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c @@ -805,59 +805,6 @@ void PHY_InitTxPowerLimit(struct adapter *Adapter) } } =20 -void PHY_SetTxPowerLimit( - struct adapter *Adapter, - u8 *Regulation, - u8 *Bandwidth, - u8 *RateSection, - u8 *RfPath, - u8 *Channel, - u8 *PowerLimit -) -{ - struct hal_com_data *pHalData =3D GET_HAL_DATA(Adapter); - u8 regulation =3D 0, bandwidth =3D 0, rateSection =3D 0, channel; - s8 powerLimit =3D 0, prevPowerLimit, channelIndex; - - GetU1ByteIntegerFromStringInDecimal((s8 *)Channel, &channel); - GetU1ByteIntegerFromStringInDecimal((s8 *)PowerLimit, &powerLimit); - - powerLimit =3D powerLimit > MAX_POWER_INDEX ? MAX_POWER_INDEX : powerLimi= t; - - if (strcmp(Regulation, "FCC") =3D=3D 0) - regulation =3D 0; - else if (strcmp(Regulation, "MKK") =3D=3D 0) - regulation =3D 1; - else if (strcmp(Regulation, "ETSI") =3D=3D 0) - regulation =3D 2; - else if (strcmp(Regulation, "WW13") =3D=3D 0) - regulation =3D 3; - - if (strcmp(RateSection, "CCK") =3D=3D 0 && strcmp(RfPath, "1T") =3D=3D 0) - rateSection =3D 0; - else if (strcmp(RateSection, "OFDM") =3D=3D 0 && strcmp(RfPath, "1T") =3D= =3D 0) - rateSection =3D 1; - else if (strcmp(RateSection, "HT") =3D=3D 0 && strcmp(RfPath, "1T") =3D= =3D 0) - rateSection =3D 2; - else - return; - - if (strcmp(Bandwidth, "20M") =3D=3D 0) - bandwidth =3D 0; - else if (strcmp(Bandwidth, "40M") =3D=3D 0) - bandwidth =3D 1; - - channelIndex =3D phy_GetChannelIndexOfTxPowerLimit(channel); - - if (channelIndex =3D=3D -1) - return; - - prevPowerLimit =3D pHalData->TxPwrLimit_2_4G[regulation][bandwidth][rateS= ection][channelIndex][RF_PATH_A]; - - if (powerLimit < prevPowerLimit) - pHalData->TxPwrLimit_2_4G[regulation][bandwidth][rateSection][channelInd= ex][RF_PATH_A] =3D powerLimit; -} - void Hal_ChannelPlanToRegulation(struct adapter *Adapter, u16 ChannelPlan) { struct hal_com_data *pHalData =3D GET_HAL_DATA(Adapter); diff --git a/drivers/staging/rtl8723bs/hal/odm_RegConfig8723B.c b/drivers/s= taging/rtl8723bs/hal/odm_RegConfig8723B.c index b0ca46aec1a5..90296eb806cb 100644 --- a/drivers/staging/rtl8723bs/hal/odm_RegConfig8723B.c +++ b/drivers/staging/rtl8723bs/hal/odm_RegConfig8723B.c @@ -154,24 +154,3 @@ void odm_ConfigBB_PHY_8723B( /* Add 1us delay between BB/RF register setting. */ udelay(1); } - -void odm_ConfigBB_TXPWR_LMT_8723B( - struct dm_odm_t *pDM_Odm, - u8 *Regulation, - u8 *Bandwidth, - u8 *RateSection, - u8 *RfPath, - u8 *Channel, - u8 *PowerLimit -) -{ - PHY_SetTxPowerLimit( - pDM_Odm->Adapter, - Regulation, - Bandwidth, - RateSection, - RfPath, - Channel, - PowerLimit - ); -} diff --git a/drivers/staging/rtl8723bs/hal/odm_RegConfig8723B.h b/drivers/s= taging/rtl8723bs/hal/odm_RegConfig8723B.h index fba7053ee3e1..c9b56d4d85c3 100644 --- a/drivers/staging/rtl8723bs/hal/odm_RegConfig8723B.h +++ b/drivers/staging/rtl8723bs/hal/odm_RegConfig8723B.h @@ -33,13 +33,4 @@ void odm_ConfigBB_PHY_8723B(struct dm_odm_t *pDM_Odm, u32 Data ); =20 -void odm_ConfigBB_TXPWR_LMT_8723B(struct dm_odm_t *pDM_Odm, - u8 *Regulation, - u8 *Bandwidth, - u8 *RateSection, - u8 *RfPath, - u8 *Channel, - u8 *PowerLimit -); - #endif diff --git a/drivers/staging/rtl8723bs/include/hal_com.h b/drivers/staging/= rtl8723bs/include/hal_com.h index 483f0390addc..7c67fee148fa 100644 --- a/drivers/staging/rtl8723bs/include/hal_com.h +++ b/drivers/staging/rtl8723bs/include/hal_com.h @@ -141,8 +141,6 @@ void rtw_hal_check_rxfifo_full(struct adapter *adapter); u8 GetHalDefVar(struct adapter *adapter, enum hal_def_variable variable, void *value); =20 -bool GetU1ByteIntegerFromStringInDecimal(char *str, u8 *in); - #define HWSET_MAX_SIZE 512 =20 void rtw_bb_rf_gain_offset(struct adapter *padapter); diff --git a/drivers/staging/rtl8723bs/include/hal_com_phycfg.h b/drivers/s= taging/rtl8723bs/include/hal_com_phycfg.h index cb7c7ed74146..6aac5394f1ca 100644 --- a/drivers/staging/rtl8723bs/include/hal_com_phycfg.h +++ b/drivers/staging/rtl8723bs/include/hal_com_phycfg.h @@ -94,9 +94,6 @@ s8 phy_get_tx_pwr_lmt(struct adapter *adapter, u32 RegPwr= TblSel, enum channel_width Bandwidth, u8 RfPath, u8 DataRate, u8 Channel); =20 -void PHY_SetTxPowerLimit(struct adapter *Adapter, u8 *Regulation, u8 *Band= width, - u8 *RateSection, u8 *RfPath, u8 *Channel, u8 *PowerLimit); - void PHY_ConvertTxPowerLimitToPowerIndex(struct adapter *Adapter); =20 void PHY_InitTxPowerLimit(struct adapter *Adapter); --=20 2.53.0