From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lf1-f51.google.com (mail-lf1-f51.google.com [209.85.167.51]) (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 D53A048B39E for ; Wed, 15 Jul 2026 12:50:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.51 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119855; cv=none; b=uL1EEzGqX5dsEJLpnWvMTL2pFOD4cYRL2zPGxgzgkruZ+JCK+mVrWp8Ge2lM45EozLldioeyZe0mveWemPyTV+9NpM/rB3yc92uayMF34dGxdNlkao/hXPTsJj2lG64H/npLV32ozKQ3fTTf7YyeCdwdBBpyq1erGbmnRCfgcWE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119855; c=relaxed/simple; bh=4DrCfHnIpAyGRaLpeOr3u+19Ov3yL4KLG8DwfvSN2VQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jA9De6zp3sW2HcExzO94BWu20f1GBC8+unlIg01UtJzzXmg//hZxJ7EdWhTiMTR5GXB+aWpMuwzAh/pVdl0tfUfCYRpnS2D15IrVARQAdgFxqo2v0Cp+yMGtV7EjFOjKfMF69DeoVzqU9wjWsYdY79jSHTPGvb+7i3ffYppanQs= 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=Kd26jBcX; arc=none smtp.client-ip=209.85.167.51 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="Kd26jBcX" Received: by mail-lf1-f51.google.com with SMTP id 2adb3069b0e04-5b14d1f9315so3760451e87.2 for ; Wed, 15 Jul 2026 05:50:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784119847; x=1784724647; 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=m/w2vN7/LdKDkjSqI+o8a+JfZVKzIaUaCo4avd9EKLI=; b=Kd26jBcXQ/rAwWaYu2s9O4/1J7MmZ/1DH5naAgfVrZHks63C2ADjDqe9R8mq190Y3A hSh/3FGeCIFwI9bKXO/fB4GMlDU7F5mztJS/N0of6azFIQ0lIIhMjZ//xqu9rkepG0Ms 98wrPSslAoFnJNgtNbZNvQw3B6Buhd+ZFRJ+3krOUs1qDG7m2YA/2/W1r5rWxVEK+tlw 4vRSxzJ0FVLUVErpukAwm7+cayvPypIKngYLd26O6LHjSR3AIipr30UyoEcynKwhALjD U+pbbjYH0qMJgJ3dLOsFRBEc1RA+jrwBwWTkx/Gy6Oy+URAkeM4ibZU5j+pj1K3noMXa rLtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784119847; x=1784724647; 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=m/w2vN7/LdKDkjSqI+o8a+JfZVKzIaUaCo4avd9EKLI=; b=C3fvdXD0Az3pZMGMIsIuBMYBvoeQZA4hGRhMO0DLbVfkxHgNqIHWxwnrC5gT8sWRYD 0cRYPH5FsJ1gdLzzWnmLmXxQtn0iANU3ZTszzvp4nq8nOoh7nHxm+exFcaeULhkZVTD7 ZCBVCzMWF4mc6jT+J2/80UMytlhmf8vBwKjShpGpmsOqRSnh9jXuIpcZWyX+jI7gTLkK L6Z4h/yElOVDReoEFMASRAJW9oIVL80trIsOvJmx20t9ofwlN1f7d0QozS6MCNwKuZ5s VDal/S1So3kwoXkpca5Eev34MYUnb6KgM9VYDHx/WlTFjvYRKeQpigqlSZ4leB/RxL2e 5S+Q== X-Forwarded-Encrypted: i=1; AHgh+RpENIpaybmmWq/skzqsZbkUpSvLhKn8Zgwje1pUlEUbjAHNSnNHjNbjJ3ljhRAcalMtxDzA16K27j7K68k=@vger.kernel.org X-Gm-Message-State: AOJu0Yxv4mwKKYEB1CqdLhNMAOUPgheyxTEZKL8rcB3atyI2ROMjVqU4 jHhIapavUMwQPtzHqSmYx3x4odw8jIdSphj3D5ZPbwlPfaZ4dga1ivZ54EoQUGF7Klw= X-Gm-Gg: AfdE7cnyzzJdhXj1e/E2IMFe8RLq4pA2kFgFbbD5WzmIKVI1WUwESSZEQBIDM56e2GT 3RpjNeC5vvuDuiaresY4Vx7XPVwZghp54qj3rvHFJOYnbTHPCygDbh2oJmQID6AIhBzCjRViumU MofyLgN+akLf0gJd5eh24yFJLKZjFgfNyAnHrnHIuUPqXTmWaSecMYnnmHyvlkGR9y+xzNzhcoG wY1oa4gaWYK8r/+59v4k7GwTRLe1ntUakXVb47HcZ4tm+Qsc/C05URDaxUPhROvvB5wwjL5HVlF cRHKKMWh/QCxm+ccbyfhxWw9e3AGH0WSZbA8rMQFnCMTCQISJJPI9VBM6RUuF3zfj/TpHDwOerg MhPQu0Awy9nOGN5/CdcrTNDfQTHzTCkcDh6QSaoz5S0mPEgIyWqNHpSRnj9ZrjHnsTuT9d2nYwu 7MS8q3Glrmf3+ZWqCWcofczhtKwh01wmvlRoCBNaJJAi0HehZJESna71hbQvN2RC1UsGtuZl69o hx+Z4txFL8PWg== X-Received: by 2002:a05:6512:61c2:10b0:5ae:bb19:1864 with SMTP id 2adb3069b0e04-5b15827bc4amr1312427e87.21.1784119847191; Wed, 15 Jul 2026 05:50:47 -0700 (PDT) Received: from archlinux ([94.180.44.28]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b022fac999sm3404042e87.55.2026.07.15.05.50.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2026 05:50:46 -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 40/61] staging: rtl8723bs: remove EXhalbtc8723b2ant_InitHwConfig Date: Wed, 15 Jul 2026 19:48:08 +0700 Message-ID: <20260715124829.90290-41-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 useless external wrapper function EXhalbtc8723b2ant_InitHwConfig. Call the internal function halbtc8723b2ant_InitHwConfig directly with a hardcoded true argument to match the original behavior and clean up the code. Signed-off-by: Arsenii Pashchenko --- drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c | 11 ++++------- drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.h | 3 ++- drivers/staging/rtl8723bs/hal/hal_btcoex.c | 2 +- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c b/drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c index f1d8e01bb..efb0ffd54 100644 --- a/drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c +++ b/drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c @@ -2289,7 +2289,7 @@ static void halbtc8723b2ant_WifiOffHwCfg(struct btc_coexist *pBtCoexist) pBtCoexist->fBtcWrite1ByteBitMask(pBtCoexist, 0x67, 0x20, 0x1); /* BT select s0/s1 is controlled by WiFi */ } -static void halbtc8723b2ant_InitHwConfig(struct btc_coexist *pBtCoexist, bool bBackUp) +void halbtc8723b2ant_InitHwConfig(struct btc_coexist *pBtCoexist) { u8 u1Tmp = 0; @@ -2373,10 +2373,7 @@ void EXhalbtc8723b2ant_PowerOnSetting(struct btc_coexist *pBtCoexist) } } -void EXhalbtc8723b2ant_InitHwConfig(struct btc_coexist *pBtCoexist, bool bWifiOnly) -{ - halbtc8723b2ant_InitHwConfig(pBtCoexist, true); -} + @@ -2389,7 +2386,7 @@ void EXhalbtc8723b2ant_IpsNotify(struct btc_coexist *pBtCoexist, u8 type) halbtc8723b2ant_CoexAllOff(pBtCoexist); } else if (type == BTC_IPS_LEAVE) { pCoexSta->bUnderIps = false; - halbtc8723b2ant_InitHwConfig(pBtCoexist, false); + halbtc8723b2ant_InitHwConfig(pBtCoexist); halbtc8723b2ant_InitCoexDm(pBtCoexist); halbtc8723b2ant_QueryBtInfo(pBtCoexist); } @@ -2596,7 +2593,7 @@ void EXhalbtc8723b2ant_PnpNotify(struct btc_coexist *pBtCoexist, u8 pnpState) { if (pnpState == BTC_WIFI_PNP_SLEEP) { } else if (pnpState == BTC_WIFI_PNP_WAKE_UP) { - halbtc8723b2ant_InitHwConfig(pBtCoexist, false); + halbtc8723b2ant_InitHwConfig(pBtCoexist); halbtc8723b2ant_InitCoexDm(pBtCoexist); halbtc8723b2ant_QueryBtInfo(pBtCoexist); } diff --git a/drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.h b/drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.h index b0e24c69d..4043e4e4d 100644 --- a/drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.h +++ b/drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.h @@ -130,7 +130,6 @@ struct coex_sta_8723b_2ant { /* The following is interface which will notify coex module. */ /* */ void EXhalbtc8723b2ant_PowerOnSetting(struct btc_coexist *pBtCoexist); -void EXhalbtc8723b2ant_InitHwConfig(struct btc_coexist *pBtCoexist, bool bWifiOnly); void EXhalbtc8723b2ant_IpsNotify(struct btc_coexist *pBtCoexist, u8 type); void EXhalbtc8723b2ant_LpsNotify(struct btc_coexist *pBtCoexist, u8 type); void EXhalbtc8723b2ant_ScanNotify(struct btc_coexist *pBtCoexist, u8 type); @@ -143,3 +142,5 @@ void EXhalbtc8723b2ant_BtInfoNotify( void EXhalbtc8723b2ant_HaltNotify(struct btc_coexist *pBtCoexist); void EXhalbtc8723b2ant_PnpNotify(struct btc_coexist *pBtCoexist, u8 pnpState); void EXhalbtc8723b2ant_Periodical(struct btc_coexist *pBtCoexist); + +void halbtc8723b2ant_InitHwConfig(struct btc_coexist *pBtCoexist); diff --git a/drivers/staging/rtl8723bs/hal/hal_btcoex.c b/drivers/staging/rtl8723bs/hal/hal_btcoex.c index a975e3393..c2d355ef1 100644 --- a/drivers/staging/rtl8723bs/hal/hal_btcoex.c +++ b/drivers/staging/rtl8723bs/hal/hal_btcoex.c @@ -833,7 +833,7 @@ void EXhalbtcoutsrc_InitHwConfig(struct btc_coexist *pBtCoexist, u8 bWifiOnly) pBtCoexist->statistics.cntInitHwConfig++; if (pBtCoexist->boardInfo.btdmAntNum == 2) - EXhalbtc8723b2ant_InitHwConfig(pBtCoexist, bWifiOnly); + halbtc8723b2ant_InitHwConfig(pBtCoexist); else if (pBtCoexist->boardInfo.btdmAntNum == 1) EXhalbtc8723b1ant_InitHwConfig(pBtCoexist, bWifiOnly); } -- 2.55.0