From nobody Sat Jul 25 17:33:43 2026 Received: from mail-lj1-f178.google.com (mail-lj1-f178.google.com [209.85.208.178]) (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 8915F3368B7 for ; Wed, 15 Jul 2026 12:49:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119762; cv=none; b=fWra6jTJSGVXgy9A4obKRJ/fGO/gs8oNQmFbvc0hH3fzcmm0h2t3S0J84tKzOX/6FaHc3b3ull5BOQ0JrfztYaoBpJtJCparBKcJSfSBUxkpaTdUIr4KZln/xEN9Lu4jA+liehe1x/CE2WM41N217sCjuLIXNfCsq/lHCb1vYyA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119762; c=relaxed/simple; bh=33Zd67ehO5q/W2BvD/Nk7gcgGWYx65taCDXDpvuvQYI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CrURmY07tUKjBK3yf4QOWQ5KP7qsq4NLZCybTynKvmJz7HM/4orYxM9V5u1OI77ufP0jXggEp24ejkuKOQFotl4xcp1Co6Lg6IL47gYaBg7//W6CXxaFUnEfHnntY/ShbIdNUOj7QqxJy62+maLNa422SEWY0Y6Rs/WtftzIqYM= 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=KQ6c8hJ3; arc=none smtp.client-ip=209.85.208.178 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="KQ6c8hJ3" Received: by mail-lj1-f178.google.com with SMTP id 38308e7fff4ca-39c86945164so44909621fa.1 for ; Wed, 15 Jul 2026 05:49:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784119760; x=1784724560; 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=19DglOy9oVvwhSIg2qx/B5ubXzP/pIL5UVJQSdZ01P8=; b=KQ6c8hJ3i5stR/hpq8z2kIE9mFPZJHH+CSuuw5hqD0uvq0ALNx4HoxUTvKWJmyib9W uqOX1r9YxJgPquqZYYFGZvXpIdsQ8Of8nQtztN72KU5JNrx3lsQ+M9vxbS8evMhAfM2O 23VBhtxinTY+pWoufmBvxcKN5fiDCtKqTNrCuPWYCLhxHRKTK6Nv5Xbkl67IWVSNk11Y lopYIe8JSgMSkpTXUynJbdmTfE2DAsjWcbyvABCUe5WKxBvvHcIGFCieW+aMfV1ANHlh 0sVwf0NaDhyIr6KvdSTbjKk8uxEeYl4Eaf2hbPLVPnqRWPSV4XfVfQ3wPLZ3cKkdPpMT g6mw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784119760; x=1784724560; 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=19DglOy9oVvwhSIg2qx/B5ubXzP/pIL5UVJQSdZ01P8=; b=ItJ26nHIzGVMm7WJHg+J+vCa3GjxrSrPK9gxPSy6e5nCwHJ4QyE7lBkEw9QVYO0oAt ZDDrf1JViGn7tz69Aed+9rm9Kkfq3VWAOjaFV5Ee1KlAhO+CU0BhAHMAFlRIbU5gvgeI 3ddoovcmNHLXWzG5QFo4D6iW6fPGg7VLwgfE4vz3rehOECQVn6ZRodYYovSo6dh1xjgL YHAJ+okbZ1AorjmkIkRiDW1lGqTUrw4CUp7f3KhUct33rJWa1qp511z6dcU3XeYBAKan NkXi2pSPEGlKTCO7mRlOg0SRt0bJcRuYR9NSYq6qqMm9/VtqskBQY3i2+8Xo5rp+XSAa RXNw== X-Forwarded-Encrypted: i=1; AHgh+RqTpbL2ffP/n6xwSwayKTrz6gRRPn2qCmPpbLGM5lV6Xh3HBZjmn7zgAvbn4Rnwz/vEBXtJiVgb58I2lgU=@vger.kernel.org X-Gm-Message-State: AOJu0YxoO+NVkblr4lXKJ6zjfmchAHCKDiiLYWVewTMjMJby9vRoWKNU IgEhHDtRfo9jYhrmOo5VEDMQddWg3PiRqO8ORuvWiuQFnjhIXlMTMolJ X-Gm-Gg: AfdE7ckgTjz3eteL7kD7ByKwJ0gXfwgl9Oq7TeNGPqPNk+NOpv9ZwFcyD9h5T0dtY5/ XQLI7zGhNDOnXyaspeQhbG45aT43NH2890IrszZHoPckix5XIs95MOxZQ2vqlsNIcr9yjXzDyys 3LMf5QQp8p+u+p2I5I46mClYzJz6DfLp3Be8keNywJ77Jpzo1oy9tCZDqXSXWi+GgnLrUb+yQ/8 8+V1pmXPPtkQZXRMBaPujjpXeXdvpBAreGyyBtORHEpCENEZQvWs3BO6eZOAzrVq++aNVWzw0JD FpvxRFmXoOyFdeqYhB2w/9KcFSxrLz2Umpqd7HRs2PkdT2W8U/SFo0vQzgeo9FwB4F/+sVJmVcb KLEH5nKzN0WtUDx4KJAZ+PwfGZ5SZWtZIvPTKlm/Z0y+F4GZ5ximhV1U0LLU/QPKEwrzQonpfsr vX7Pvgxvv/bcfEB+sEbQgTER/uJ053VMxjyOF0iYhx/5X7fveOesRVh0pEhdVvx148eyOV7gpzF 8WYgQDPIieJTjrzjIM45Wof X-Received: by 2002:a05:6512:3d0d:b0:5b0:1516:8799 with SMTP id 2adb3069b0e04-5b15d7766d5mr683495e87.17.1784119759380; Wed, 15 Jul 2026 05:49:19 -0700 (PDT) Received: from archlinux ([94.180.44.28]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b022fac999sm3404042e87.55.2026.07.15.05.49.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2026 05:49:19 -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 01/61] staging: rtl8723bs: remove redundant rtw_ap_set_group_key wrapper Date: Wed, 15 Jul 2026 19:47:29 +0700 Message-ID: <20260715124829.90290-2-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: quoted-printable Content-Type: text/plain; charset="utf-8" Eliminate the redundant rtw_ap_set_group_key() wrapper function by calling rtw_ap_set_key() directly with the set_tx parameter set to 1. This reduces boilerplate code and cleans up the driver interface. Signed-off-by: Arsenii Pashchenko --- drivers/staging/rtl8723bs/core/rtw_ap.c | 7 +------ drivers/staging/rtl8723bs/include/rtw_ap.h | 2 +- drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 8 ++++++-- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_ap.c b/drivers/staging/rtl8= 723bs/core/rtw_ap.c index 065850a9e..a6640cd7a 100644 --- a/drivers/staging/rtl8723bs/core/rtw_ap.c +++ b/drivers/staging/rtl8723bs/core/rtw_ap.c @@ -1195,7 +1195,7 @@ u8 rtw_ap_set_pairwise_key(struct adapter *padapter, = struct sta_info *psta) return res; } =20 -static int rtw_ap_set_key(struct adapter *padapter, +int rtw_ap_set_key(struct adapter *padapter, u8 *key, u8 alg, int keyid, @@ -1258,11 +1258,6 @@ static int rtw_ap_set_key(struct adapter *padapter, return res; } =20 -int rtw_ap_set_group_key(struct adapter *padapter, u8 *key, u8 alg, int ke= yid) -{ - return rtw_ap_set_key(padapter, key, alg, keyid, 1); -} - int rtw_ap_set_wep_key(struct adapter *padapter, u8 *key, u8 keylen, diff --git a/drivers/staging/rtl8723bs/include/rtw_ap.h b/drivers/staging/r= tl8723bs/include/rtw_ap.h index 83e835eb6..cdd9f291f 100644 --- a/drivers/staging/rtl8723bs/include/rtw_ap.h +++ b/drivers/staging/rtl8723bs/include/rtw_ap.h @@ -22,7 +22,7 @@ int rtw_acl_add_sta(struct adapter *padapter, u8 *addr); void rtw_acl_remove_sta(struct adapter *padapter, u8 *addr); =20 u8 rtw_ap_set_pairwise_key(struct adapter *padapter, struct sta_info *psta= ); -int rtw_ap_set_group_key(struct adapter *padapter, u8 *key, u8 alg, int ke= yid); +int rtw_ap_set_key(struct adapter *padapter, u8 *key, u8 alg, int keyid, u= 8 set_tx); int rtw_ap_set_wep_key(struct adapter *padapter, u8 *key, u8 keylen, int k= eyid, u8 set_tx); =20 void associated_clients_update(struct adapter *padapter, u8 updated); diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c b/drivers/st= aging/rtl8723bs/os_dep/ioctl_cfg80211.c index 1484336d7..ce76a8586 100644 --- a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +++ b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c @@ -604,7 +604,9 @@ static int rtw_cfg80211_ap_set_encryption(struct net_de= vice *dev, struct ieee_pa =20 psecuritypriv->dot11PrivacyAlgrthm =3D psecuritypriv->dot118021XGrpPriv= acy;/* */ =20 - rtw_ap_set_group_key(padapter, param->u.crypt.key, psecuritypriv->dot11= 8021XGrpPrivacy, param->u.crypt.idx); + rtw_ap_set_key(padapter, param->u.crypt.key, + psecuritypriv->dot118021XGrpPrivacy, + param->u.crypt.idx, 1); =20 pbcmc_sta =3D rtw_get_bcmc_stainfo(padapter); if (pbcmc_sta) { @@ -678,7 +680,9 @@ static int rtw_cfg80211_ap_set_encryption(struct net_de= vice *dev, struct ieee_pa =20 psecuritypriv->dot11PrivacyAlgrthm =3D psecuritypriv->dot118021XGrpPri= vacy;/* */ =20 - rtw_ap_set_group_key(padapter, param->u.crypt.key, psecuritypriv->dot1= 18021XGrpPrivacy, param->u.crypt.idx); + rtw_ap_set_key(padapter, param->u.crypt.key, + psecuritypriv->dot118021XGrpPrivacy, + param->u.crypt.idx, 1); =20 pbcmc_sta =3D rtw_get_bcmc_stainfo(padapter); if (pbcmc_sta) { --=20 2.55.0 From nobody Sat Jul 25 17:33:43 2026 Received: from mail-lf1-f54.google.com (mail-lf1-f54.google.com [209.85.167.54]) (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 A2F781624D5 for ; Wed, 15 Jul 2026 12:49:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119779; cv=none; b=gwwKBwVJwGf28o1j/3MPin2hU4yvK2TVku6iHvXFjtNR2ZcSfvuRe9Hb+Y1Eaa70wbmJAdOjLv9fxuoVrzbPjz51MN61Nk4zfdGvd0vfTmmgcKWvNcYJK3BKq8LidOT+44UTgBt80ZF695x0OLIJo33TesE8ltAGRAep41c+cmk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119779; c=relaxed/simple; bh=/LJKCIO04dSaGL7p4czn4Eo/pq61LGxuabz70pZKyow=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Bavi03hWkIi+PdnLJdkriIe1221BLF7HN+nIyHodFY2odoQ8h5nZGjFR6CjnD+uWfgo+rzzrMUheShG7+WCWXUHM3St9BMHMLT0vCUJxeU7n5gBx9fkRTrooJ7W5+WGePslJ4MjIYfzuruFw+xZb7ktZuBBAzqZNyrTu5c0RLxA= 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=AjlIDa9S; arc=none smtp.client-ip=209.85.167.54 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="AjlIDa9S" Received: by mail-lf1-f54.google.com with SMTP id 2adb3069b0e04-5aebd52488cso5789827e87.2 for ; Wed, 15 Jul 2026 05:49:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784119776; x=1784724576; 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=YUQCIbej7stm8aLt6hPSaaqQwT1L5yVkeI52z1hhfUw=; b=AjlIDa9S7lRP0T0/ZDtdub/WxvHadcuWVNCk6Hcnef6oFcMtYwcVaXPPduUwGst0T9 5jM3QX40LXiet3o/1jyVG/R+rFe4P77Vu1bFORtggY3P4KUgWlie8Ah0nCbnD8hrKR6o 8EIQH89xgdunyxsrk2pqsjV6YeOnnAn4UM15dpHNXt7HicxvuoU25Z1LYHiRRGoR/lVC 6LgJMiyiwdyIhjjS5CGTiLI4Cob5wW17DC4Og7eUSzbu4w8g31k39r+0Hm8YFI5AFcsd 1YiPRCa69hJcjwBzDGnkc0S2O07D/Oez0/oP16Ycw3bwuAi4tqcK6mPeLkoImRvQpFB2 XZkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784119776; x=1784724576; 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=YUQCIbej7stm8aLt6hPSaaqQwT1L5yVkeI52z1hhfUw=; b=hwanSQA5LSxnC8HQi5h3jlCVwEt6axmrrx3HRl0khfl6sK1hHzDVMha+qxEZ1gF1Ns OOOh9Xb/it6al44V5vhfkW1357qY9ty7cNc/CRDq/CKmUoBJ2J7ZCl69chV5Qz5t525B UOHvi09S6VmOihETrEv0rboGeajbLnSB4m0J4/hxG3iieYckJbyKtVgKwt9ARDbXV/y6 1RH7ZsRw361dmALxRVoXMfnazRG/Nx4PywLbCEhxdkDgW/GjCFvYn388tUkqjV/X4E5+ cFQylOLtrTtjArGftcGr6sGUsTUzd2Wgb39yoE7DlKSG6U2oqMZjFnjkKVVDvjmhu0jf TvjQ== X-Forwarded-Encrypted: i=1; AHgh+Rp9qw3vJ4awr4NXzEQt29SIGtQjHr7ZZoPH/NIgwk84s39oKyaYHp/AqRDwAQyZBdt5lYCel4y0OHkiQME=@vger.kernel.org X-Gm-Message-State: AOJu0YxyLyR6rxyo9bD40Lkoxha8jiSDGg2EqCE1Co7AxWxySrLV0yBc FbtHzK8Om9EEO4kiSJcWJSRA99O0CAl6Vzp7zlsEhzkGZe7Ewsz8V0Uu0Tx32s6fnQJwVQ== X-Gm-Gg: AfdE7cl0w/RZs8kkBEJQCpQq2T0jX87t0RzjOmRW+Wvw7ALsaj4J0B3nIfHkkn1sUJr 106mkPUr/N3d2KY++2TqWmujXRraiIP4g5IeYDlnKek0SofDi3JKuX5blvEaVdXwSIqmjO/Kzje ftfGkAqOLWjNf8vFHRcth/NUIuCwJBF2w1fI8s+cv0EmCsDSQiB24WFhwcgJYkP1A8mAbO8lw84 9ofvA4fKjQ4mPXvGZ4R2l4xwGGwszyIbmkbrDMeNo/k1xLOXrF2YUf1rR2x+gOz/vEK2OjjacEa xFRkJBnmZyPHt53GM3Yoiepm7tLMlkGFI5dK75UTkZiSm9eqkYDSAlo/SFaHEifin9Y8AR8j3C0 twy6oQOHEGiIbEzkJ1fdnW13D1Ctgy/OdyZQ+1rlczVmBsJ5fOtZ92jMVbkyrODxd1f6gcrj7xi WfSjCr+54zBOkak9Udb57QVahF6SFj7ByS8279W1LMZR4f66YgFVBrZ4UI1ItLYNNzXJEIJSui3 884qOLFzwX/rg== X-Received: by 2002:a05:6512:3410:b0:5b0:177f:beab with SMTP id 2adb3069b0e04-5b15d7b2cc0mr694248e87.44.1784119775452; Wed, 15 Jul 2026 05:49:35 -0700 (PDT) Received: from archlinux ([94.180.44.28]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b022fac999sm3404042e87.55.2026.07.15.05.49.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2026 05:49:35 -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 02/61] staging: rtl8723bs: replace is_same_ess with rtw_ssid_differ Date: Wed, 15 Jul 2026 19:47:30 +0700 Message-ID: <20260715124829.90290-3-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: quoted-printable Content-Type: text/plain; charset="utf-8" The helper function is_same_ess() is only used in an inverted context to check if SSIDs are different. Flip the logic by introducing a new static inline helper rtw_ssid_differ() that returns true when SSIDs do not match. This eliminates the need for the logical negation operator '!' at call sites, improves code readability, and optimizes the check to short-circuit early if the SSID lengths are not equal. While at it, switch the return type to bool, use the proper 'rtw_' prefix. Signed-off-by: Arsenii Pashchenko --- drivers/staging/rtl8723bs/core/rtw_mlme.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rt= l8723bs/core/rtw_mlme.c index 1196ec011..b1a268728 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -340,10 +340,12 @@ bool rtw_is_same_ibss(struct adapter *adapter, struct= wlan_network *pnetwork) return true; } =20 -inline int is_same_ess(struct wlan_bssid_ex *a, struct wlan_bssid_ex *b) +static inline bool rtw_ssid_differ(struct wlan_bssid_ex *a, struct wlan_bs= sid_ex *b) { - return (a->ssid.ssid_length =3D=3D b->ssid.ssid_length) - && !memcmp(a->ssid.ssid, b->ssid.ssid, a->ssid.ssid_length); + if (a->ssid.ssid_length !=3D b->ssid.ssid_length) + return true; + + return memcmp(a->ssid.ssid, b->ssid.ssid, a->ssid.ssid_length) !=3D 0; } =20 int is_same_network(struct wlan_bssid_ex *src, struct wlan_bssid_ex *dst, = u8 feature) @@ -1673,7 +1675,7 @@ static int rtw_check_roaming_candidate(struct mlme_pr= iv *mlme int updated =3D false; struct adapter *adapter =3D container_of(mlme, struct adapter, mlmepriv); =20 - if (!is_same_ess(&competitor->network, &mlme->cur_network.network)) + if (rtw_ssid_differ(&competitor->network, &mlme->cur_network.network)) goto exit; =20 if (!rtw_is_desired_network(adapter, competitor)) @@ -1774,7 +1776,7 @@ static int rtw_check_join_candidate(struct mlme_priv = *mlme if (rtw_to_roam(adapter) > 0) { if (jiffies_to_msecs(jiffies - competitor->last_scanned) >=3D mlme->roam_scanr_exp_ms || - !is_same_ess(&competitor->network, &mlme->cur_network.network)) + rtw_ssid_differ(&competitor->network, &mlme->cur_network.network)) goto exit; } =20 --=20 2.55.0 From nobody Sat Jul 25 17:33:43 2026 Received: from mail-lf1-f49.google.com (mail-lf1-f49.google.com [209.85.167.49]) (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 AD6A41624D5 for ; Wed, 15 Jul 2026 12:50:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119821; cv=none; b=rdQclqTnIhYzyDLYhRnyLF3ZgFojj5wwkMvFtgLkg0xn1VFTZRnCQrhNnJpeLg+SZhM41g8p51InThpO/yAfp0PLBtP9VGfXIlmSA3v4w1O65aZEDZn7cfWQS7XADVpiJNPWRCU/eTLTdlRVHCj/un90R5PrJnsYeyXiLQcxsAI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119821; c=relaxed/simple; bh=c82bzzoJN5+wD7QRbDZBQm7K5arVc0DPy2QsJOOc2r4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cpRiVX0DufqOtuUxScYQdzbnm6qYl3PGHnCbd6WElRbGmhk4vTd5BioymTnGKUDcqiP0fuFLwXUxLU8BcilAGxk4sIgY1kVCGUqavhwTgPOqiMcJGn8VGlP7K3QFVlFkfsOykf7eRs/SnRL0ikYndjXNb6Ie6SvPjSs3lZyN2bE= 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=nwrrGL4V; arc=none smtp.client-ip=209.85.167.49 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="nwrrGL4V" Received: by mail-lf1-f49.google.com with SMTP id 2adb3069b0e04-5aeb59d54b1so1775403e87.1 for ; Wed, 15 Jul 2026 05:50:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784119818; x=1784724618; 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=Fmjy7fGI2Ix2XPkU4EhhKdKH2Y1aaPOILOdheCazGBs=; b=nwrrGL4V71wqTDi+Fpbde07YOtwegkE9k7sp7COTKpGFHThiUT1fkeVcRmoj6iMQ3G y+doxpL0sAYWr6l45K4p/HfjPLjuVrMfiy4j+m+I/c65sfHIc566vf53Gz/XZtL1/rXt Hy6Q0ASyG2Dy1zJ65kORcP+mxY95so0+9YoHqi2y6Rjm5BSZvDJnjrcBBr9/EZ4R9T8t iaAwXWExb4s+4O+/1T8BDpSu0lgLz3d8z5EMePjf2RG3Qst69WSaB/8BvJh602c5zXEx 3TVCsPTJyG7bZm9FjTDNev65tzctrYl1qILXWqzZ+SvfFJ6NM5HJJGeDgpNyIi5tz4Oy plPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784119818; x=1784724618; 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=Fmjy7fGI2Ix2XPkU4EhhKdKH2Y1aaPOILOdheCazGBs=; b=VXNeqM1iNCgIsiDaelHZfKrj8aQU2h3ALQVaiXeg079Ge8Nit7gpK9Ww9IcsYYONiw Msj9pYFcA8TU1mJv0xoPW9YaGiwEk2OGYHiQ17lHFr0zkPeoR05AV5cqaaluRvd7tq7J sgn+P+tIygR6zZTOEEInVtCfR8kCm+om44OZn4ceGrr0I10QoFIdxu4tNcSXUh4AT/lr 8D7oXkKHjNM+oE3VPJnr85CIAlqUaO8/IEWgJoUOsGR2SLaV69jDi5lJp+1L6IMXkl9V qk7Xf9VTXfK82Fugoj6L0ONXjy9v1BrykRMdAhBwlbXjz85fDUW1R5KCY7BBZANj0N/A p59w== X-Forwarded-Encrypted: i=1; AHgh+RpCXVp+cpjERul07boBB0mTteGDY8e7EO08Rki4spK+xllpQWT/fY96JK8W3lhUa5Xr7HiV+4D5L7dnKCM=@vger.kernel.org X-Gm-Message-State: AOJu0Ywd55cQgp5dyNklyF7sytslFunsEzYA3uapMfunz5jQ+ghr1dQ/ /Id+ygIUnZtw9JG7nOOdWlM4o9gMgGFZ/PGUVFEEiG/bs52jkg9Y9MiUEc+CrxiisL/e+w== X-Gm-Gg: AfdE7ck186OjeLccCraw3HldQF3DKW1SsR90kAc+f+OyAw5FDgd7Krwj43KRJ+FQWBZ fOiXT/yep1bzA1DNLsiqHuMU5qB1QyM0V3N7WikKt+N15KiNICDw9pdlC4tvhpqMGYhVKlRxdIu wC0HobCdnyrBluKib25B7y91OwzDbez4W5zREotcRm0bcj4bHFPo+Aye1ip7YlryhxsbjIhPBOM KtmkGPeFSX5izjNmfHBDmTToFgK/Nb8/97WCmQeG2VrzU4RDQCgbYnFNQi/OSIU1W+YM2UA+EWl nhaWPOZcvokRqlGtbnp75Iu3nYvpnqkp6dVKSxMkMW7LlN5pYdbMV0HmBun81thbwppEXjSY100 hxl5e39xlTV/dwKBPukWUnIStVYu0MoQu95C4gVaXqY/cP+Cc77QijPVd0qHwSBwTkvc/wcxkDM fEW6ofcPLieuIy10a9GT6aNWjPfD86sWmm+jPjlOxJD0Oepa4NPwPx9x91wwbKRjyggO8iWXsfx bTMEgi9Rel1aw== X-Received: by 2002:ac2:4a81:0:b0:5ae:bd53:70f6 with SMTP id 2adb3069b0e04-5b023566824mr2914444e87.4.1784119817466; Wed, 15 Jul 2026 05:50:17 -0700 (PDT) Received: from archlinux ([94.180.44.28]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b022fac999sm3404042e87.55.2026.07.15.05.50.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2026 05:50:17 -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 03/61] staging: rtl8723bs: remove redundant rtw_to_roam wrapper Date: Wed, 15 Jul 2026 19:47:31 +0700 Message-ID: <20260715124829.90290-4-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: quoted-printable Content-Type: text/plain; charset="utf-8" Eliminate the redundant rtw_to_roam() helper function by accessing the mlmepriv.to_roam field directly at all call sites. This removes unnecessary boilerplate code and simplifies driver interface readability. Signed-off-by: Arsenii Pashchenko --- .../staging/rtl8723bs/core/rtw_ioctl_set.c | 4 ++-- drivers/staging/rtl8723bs/core/rtw_mlme.c | 24 ++++++++----------- drivers/staging/rtl8723bs/include/rtw_mlme.h | 1 - .../staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 2 +- 4 files changed, 13 insertions(+), 18 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c b/drivers/stagi= ng/rtl8723bs/core/rtw_ioctl_set.c index 12bf7780b..9872467b8 100644 --- a/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c +++ b/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c @@ -59,7 +59,7 @@ u8 rtw_do_join(struct adapter *padapter) /* when set_ssid/set_bssid for rtw_do_join(), but scanning queue is empt= y */ /* we try to issue sitesurvey firstly */ =20 - if (!pmlmepriv->link_detect_info.busy_traffic || rtw_to_roam(padapter) >= 0) { + if (!pmlmepriv->link_detect_info.busy_traffic || padapter->mlmepriv.to_r= oam > 0) { /* submit site_survey_cmd */ ret =3D rtw_sitesurvey_cmd(padapter, &pmlmepriv->assoc_ssid, 1, NULL, 0= ); if (ret !=3D _SUCCESS) @@ -110,7 +110,7 @@ u8 rtw_do_join(struct adapter *padapter) /* when set_ssid/set_bssid for rtw_do_join(), but there are no desired= bss in scanning queue */ /* we try to issue sitesurvey firstly */ if (!pmlmepriv->link_detect_info.busy_traffic || - rtw_to_roam(padapter) > 0) { + padapter->mlmepriv.to_roam > 0) { ret =3D rtw_sitesurvey_cmd(padapter, &pmlmepriv->assoc_ssid, 1, NULL,= 0); if (ret !=3D _SUCCESS) pmlmepriv->to_join =3D false; diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rt= l8723bs/core/rtw_mlme.c index b1a268728..6c042de11 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -744,7 +744,7 @@ void rtw_surveydone_event_callback(struct adapter *adap= ter, u8 *pbuf) _clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING); rtw_indicate_connect(adapter); } else { - if (rtw_to_roam(adapter) !=3D 0) { + if (adapter->mlmepriv.to_roam !=3D 0) { if (rtw_dec_to_roam(adapter) =3D=3D 0 || rtw_sitesurvey_cmd(adapter, &pmlmepriv->assoc_ssid, 1, NULL, 0) !=3D _SUCCESS) { @@ -893,10 +893,10 @@ void rtw_indicate_disconnect(struct adapter *padapter) =20 _clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING | WIFI_UNDER_WPS); =20 - if (rtw_to_roam(padapter) > 0) + if (padapter->mlmepriv.to_roam > 0) _clr_fwstate_(pmlmepriv, _FW_LINKED); =20 - if (check_fwstate(&padapter->mlmepriv, _FW_LINKED) || rtw_to_roam(padapte= r) <=3D 0) { + if (check_fwstate(&padapter->mlmepriv, _FW_LINKED) || padapter->mlmepriv.= to_roam <=3D 0) { /* Do it first for tx broadcast pkt after disconnection issue! */ netif_carrier_off(padapter->pnetdev); =20 @@ -1420,9 +1420,9 @@ void rtw_stadel_event_callback(struct adapter *adapte= r, u8 *pbuf) } =20 if (roam) { - if (rtw_to_roam(adapter) > 0) + if (adapter->mlmepriv.to_roam > 0) rtw_dec_to_roam(adapter); /* this stadel_event is caused by roaming, d= ecrease to_roam */ - else if (rtw_to_roam(adapter) =3D=3D 0) + else if (adapter->mlmepriv.to_roam =3D=3D 0) rtw_set_to_roam(adapter, adapter->registrypriv.max_roaming_times); } else { rtw_set_to_roam(adapter, 0); @@ -1516,10 +1516,10 @@ void _rtw_join_timeout_handler(struct timer_list *t) =20 spin_lock_bh(&pmlmepriv->lock); =20 - if (rtw_to_roam(adapter) > 0) { /* join timeout caused by roaming */ + if (adapter->mlmepriv.to_roam > 0) { /* join timeout caused by roaming */ while (1) { rtw_dec_to_roam(adapter); - if (rtw_to_roam(adapter) !=3D 0) { /* try another */ + if (adapter->mlmepriv.to_roam !=3D 0) { /* try another */ int do_join_r; =20 do_join_r =3D rtw_do_join(adapter); @@ -1773,7 +1773,7 @@ static int rtw_check_join_candidate(struct mlme_priv = *mlme if (!rtw_is_desired_network(adapter, competitor)) goto exit; =20 - if (rtw_to_roam(adapter) > 0) { + if (adapter->mlmepriv.to_roam > 0) { if (jiffies_to_msecs(jiffies - competitor->last_scanned) >=3D mlme->roam_scanr_exp_ms || rtw_ssid_differ(&competitor->network, &mlme->cur_network.network)) @@ -2540,10 +2540,6 @@ inline u8 rtw_dec_to_roam(struct adapter *adapter) return adapter->mlmepriv.to_roam; } =20 -inline u8 rtw_to_roam(struct adapter *adapter) -{ - return adapter->mlmepriv.to_roam; -} =20 void rtw_roaming(struct adapter *padapter, struct wlan_network *tgt_networ= k) { @@ -2559,14 +2555,14 @@ void _rtw_roaming(struct adapter *padapter, struct = wlan_network *tgt_network) struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; struct wlan_network *cur_network =3D &pmlmepriv->cur_network; =20 - if (rtw_to_roam(padapter) > 0) { + if (padapter->mlmepriv.to_roam > 0) { memcpy(&pmlmepriv->assoc_ssid, &cur_network->network.ssid, sizeof(struct= ndis_802_11_ssid)); =20 pmlmepriv->assoc_by_bssid =3D false; =20 while (rtw_do_join(padapter) !=3D _SUCCESS) { rtw_dec_to_roam(padapter); - if (rtw_to_roam(padapter) <=3D 0) { + if (padapter->mlmepriv.to_roam <=3D 0) { rtw_indicate_disconnect(padapter); break; } diff --git a/drivers/staging/rtl8723bs/include/rtw_mlme.h b/drivers/staging= /rtl8723bs/include/rtw_mlme.h index 8cc96164e..b5276c429 100644 --- a/drivers/staging/rtl8723bs/include/rtw_mlme.h +++ b/drivers/staging/rtl8723bs/include/rtw_mlme.h @@ -389,7 +389,6 @@ void _rtw_roaming(struct adapter *adapter, struct wlan_= network *tgt_network); void rtw_roaming(struct adapter *adapter, struct wlan_network *tgt_network= ); void rtw_set_to_roam(struct adapter *adapter, u8 to_roam); u8 rtw_dec_to_roam(struct adapter *adapter); -u8 rtw_to_roam(struct adapter *adapter); int rtw_select_roaming_candidate(struct mlme_priv *pmlmepriv); =20 void rtw_sta_media_status_rpt(struct adapter *adapter, struct sta_info *ps= ta, u32 mstatus); diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c b/drivers/st= aging/rtl8723bs/os_dep/ioctl_cfg80211.c index ce76a8586..397440af8 100644 --- a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +++ b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c @@ -436,7 +436,7 @@ void rtw_cfg80211_indicate_connect(struct adapter *pada= pter) FUNC_ADPT_FMT " BSS not found !!\n", FUNC_ADPT_ARG(padapter)); =20 - if (rtw_to_roam(padapter) > 0) { + if (padapter->mlmepriv.to_roam > 0) { struct wiphy *wiphy =3D pwdev->wiphy; struct ieee80211_channel *notify_channel; u32 freq; --=20 2.55.0 From nobody Sat Jul 25 17:33:43 2026 Received: from mail-lf1-f42.google.com (mail-lf1-f42.google.com [209.85.167.42]) (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 540BC41DE06 for ; Wed, 15 Jul 2026 12:50:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119821; cv=none; b=mXVsMqvR92LC8vN+s9xyz4wUVT83IIp3Q8yQVHGYS7KIGbJrNePhZ2JPsIWhKlYNkgSSjd5dvRhcibl0XdT71sgMDgxKywjBkrVVEFPBET84VgiRvKqq059dA4q7hPlfFoTI7iJ+fVbZsOBU5HjTZnFe6Ie/GHZKarZjV6upcBE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119821; c=relaxed/simple; bh=BM5yn8aa6nsA0MchY4B51U8iZ7cExTIA1lfWS+CBrDE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hYKLV5bZQyg6NAOcLf9CfcAfo4/Sp/tyFTV4o8CyWBrN1GmzwiJl6hPOWsLGtMM6+vvsRL7lhYIrvTl9Iwv3p1An4ExwnRlBt1YDnIRC/bVZUzcD5vJhdgpVNS/LCDuK4wfSkMdupOqkKJz1e8dlWBIfAPJ7nZjlececj45LtGg= 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=YMRl/7Q4; arc=none smtp.client-ip=209.85.167.42 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="YMRl/7Q4" Received: by mail-lf1-f42.google.com with SMTP id 2adb3069b0e04-5b01146b205so3898740e87.2 for ; Wed, 15 Jul 2026 05:50:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784119818; x=1784724618; 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=P6gSPxNU6kjOmC+K/JcDDEl1A8+wRRo1W8eJFJVQ8aU=; b=YMRl/7Q4c58i+OzyonlCRljUVCI4AMOPpYi7QR8dRdx4yF7DzxaqHBByvKXdTj9LB8 Oc6/1FBUyzNKBhF49NEb4cLM4T8WD+g3FDYNmhsZnIsLY/WCTRP5B18f5Fcp9ZP0kyN2 i9socs4Umbur1KN0sSrMdS7V/fNbnkL5ARFc/c98dVidM0Cl+M/4O5BpHPRFSvUBGyI1 NLUoZnYI7q6pWSHgAlbNi/IK3YCF0jKd/QZiuodp28EzCqA0jmp4ea7jXSSxyIy1KJnW yjJyBAb4CICnHi1gUFJ7OiRHQH5dsUFCX9NqwimXCpGGca48x4VVFdStOVO7U9t3zdrj 3u/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784119818; x=1784724618; 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=P6gSPxNU6kjOmC+K/JcDDEl1A8+wRRo1W8eJFJVQ8aU=; b=VbnIdudo4Nr7Wjz7MNRMlWo+zGEKHjE9UA3s/SnDoBFhmmrFjU29UPq1cihq/8WpMK VO6q4/pAHe2MqaO+RbfuwNXMU8VcPZ3APnP+cTXfn3PZUmfoKVTZK8W5BqXXVB/vc4zQ xQ58sJe2vxwWURwjqW7cu5s0rPYJ29O1NW0DMXyi2NScAnWN9fsrYjAnm/VBATFymwmV XUp93BOG0em/DhAgJMrBf9DaeJW+I2wPLMJZAV5FG1/jNFMF/RkPW2UcPGHKC0/MRB5C CLdLHjo5XssHwwnA5vRJ0SHhi9WaBlQsZasRNw5ngiyFV0ULjoWJeiyRKnZehBeIrVZ1 nO9g== X-Forwarded-Encrypted: i=1; AHgh+RoyFpRmqOZZuct0bNgsNSvvPck3SugQNnhCRop20wFpOvvZrMjtHXoiN67TsSfWULA7avpwEA0Te3ff0sk=@vger.kernel.org X-Gm-Message-State: AOJu0YxZn1zZZYhOuEjzpV3sRAjFHan1IQ/cSElHOS28rBZcw63MOa6d hpLYr2rrTKr+UdnDqPXS1N6WxmBQx2YuhFOI8PAbWBg7706ER2YIcTae X-Gm-Gg: AfdE7cl9hjpovwnHun/0px6TiuY6n5e3ZEEghVa/qxL0Bx7nIixuuQbi+Gs6gfaZE4F iilWO3cqF/7aQ1SIV3sWvNl/jUaozpBvzXwhkoFSupmSfRj041Fv2ARQzqIkrB0s4Da0Az6Wp+P WwKzV7qVoeuerioY2/GN4YY2VBggom9TTWUDkwWcsg/5UpxoXHJ7JU5AM6cZMbgxfH6KQl8e72K 7urKeymglSlfJ/UO1TAzK/IPKjXtjP8Jy4OLPCzF/z1gErY4C6hveOnn/V+BWod9VUwlA8C5KCV CSkY8BxzTk72FLPlmgoII6/Rz5T6S0IMYhmX655glRXp5MWJ3E3EEOXtriU9bIK3JvzhR98h0Rb R7dSxYG0SgFXihhUTeDuMDGDnuXwy+QSJSfB34uS1cec8PFB63M8tGdUoL9IYr20egzG7CakbQ9 TkobitUUdd91ivBgjDk6BAb2DQo0f/zTbeeOZRPY5FV6j+4aBRt+sOmHqNlyh1mY1RkS6RgqzQQ xye9xzplItba6CCIrRA0OCL X-Received: by 2002:a05:6512:2c8c:b0:5ae:b0ec:b024 with SMTP id 2adb3069b0e04-5b15d7b5373mr638834e87.53.1784119818261; Wed, 15 Jul 2026 05:50:18 -0700 (PDT) Received: from archlinux ([94.180.44.28]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b022fac999sm3404042e87.55.2026.07.15.05.50.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2026 05:50:17 -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 04/61] staging: rtl8723bs: remove redundant rtw_dec_to_roam helper Date: Wed, 15 Jul 2026 19:47:32 +0700 Message-ID: <20260715124829.90290-5-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: quoted-printable Content-Type: text/plain; charset="utf-8" Eliminate the redundant rtw_dec_to_roam() inline helper function by replacing it with the open-coded prefix decrement operator '--' at all call sites. Since the original helper merely decrements the mlmepriv.to_roam field and returns its updated value, using '--adapter->mlmepriv.to_roam' acts as a direct, native language equivalent. This reduces boilerplate and improves code scannability. Signed-off-by: Arsenii Pashchenko --- drivers/staging/rtl8723bs/core/rtw_mlme.c | 15 +++++---------- drivers/staging/rtl8723bs/include/rtw_mlme.h | 1 - 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rt= l8723bs/core/rtw_mlme.c index 6c042de11..b038233af 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -745,7 +745,7 @@ void rtw_surveydone_event_callback(struct adapter *adap= ter, u8 *pbuf) rtw_indicate_connect(adapter); } else { if (adapter->mlmepriv.to_roam !=3D 0) { - if (rtw_dec_to_roam(adapter) =3D=3D 0 || + if (--adapter->mlmepriv.to_roam =3D=3D 0 || rtw_sitesurvey_cmd(adapter, &pmlmepriv->assoc_ssid, 1, NULL, 0) !=3D _SUCCESS) { rtw_set_to_roam(adapter, 0); @@ -1421,7 +1421,8 @@ void rtw_stadel_event_callback(struct adapter *adapte= r, u8 *pbuf) =20 if (roam) { if (adapter->mlmepriv.to_roam > 0) - rtw_dec_to_roam(adapter); /* this stadel_event is caused by roaming, d= ecrease to_roam */ + /* this stadel_event is caused by roaming, decrease to_roam */ + --adapter->mlmepriv.to_roam; else if (adapter->mlmepriv.to_roam =3D=3D 0) rtw_set_to_roam(adapter, adapter->registrypriv.max_roaming_times); } else { @@ -1518,7 +1519,7 @@ void _rtw_join_timeout_handler(struct timer_list *t) =20 if (adapter->mlmepriv.to_roam > 0) { /* join timeout caused by roaming */ while (1) { - rtw_dec_to_roam(adapter); + --adapter->mlmepriv.to_roam; if (adapter->mlmepriv.to_roam !=3D 0) { /* try another */ int do_join_r; =20 @@ -2534,12 +2535,6 @@ inline void rtw_set_to_roam(struct adapter *adapter,= u8 to_roam) adapter->mlmepriv.to_roam =3D to_roam; } =20 -inline u8 rtw_dec_to_roam(struct adapter *adapter) -{ - adapter->mlmepriv.to_roam--; - return adapter->mlmepriv.to_roam; -} - =20 void rtw_roaming(struct adapter *padapter, struct wlan_network *tgt_networ= k) { @@ -2561,7 +2556,7 @@ void _rtw_roaming(struct adapter *padapter, struct wl= an_network *tgt_network) pmlmepriv->assoc_by_bssid =3D false; =20 while (rtw_do_join(padapter) !=3D _SUCCESS) { - rtw_dec_to_roam(padapter); + --padapter->mlmepriv.to_roam; if (padapter->mlmepriv.to_roam <=3D 0) { rtw_indicate_disconnect(padapter); break; diff --git a/drivers/staging/rtl8723bs/include/rtw_mlme.h b/drivers/staging= /rtl8723bs/include/rtw_mlme.h index b5276c429..233bf98e2 100644 --- a/drivers/staging/rtl8723bs/include/rtw_mlme.h +++ b/drivers/staging/rtl8723bs/include/rtw_mlme.h @@ -388,7 +388,6 @@ int is_same_network(struct wlan_bssid_ex *src, struct w= lan_bssid_ex *dst, u8 fea void _rtw_roaming(struct adapter *adapter, struct wlan_network *tgt_networ= k); void rtw_roaming(struct adapter *adapter, struct wlan_network *tgt_network= ); void rtw_set_to_roam(struct adapter *adapter, u8 to_roam); -u8 rtw_dec_to_roam(struct adapter *adapter); int rtw_select_roaming_candidate(struct mlme_priv *pmlmepriv); =20 void rtw_sta_media_status_rpt(struct adapter *adapter, struct sta_info *ps= ta, u32 mstatus); --=20 2.55.0 From nobody Sat Jul 25 17:33:43 2026 Received: from mail-lf1-f42.google.com (mail-lf1-f42.google.com [209.85.167.42]) (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 522EC41DE09 for ; Wed, 15 Jul 2026 12:50:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119822; cv=none; b=nPNlLW+oWuuXYr1eH9XoesTQbiku7djWyW8c+oD2m9pXS1UbSDYrAaI4HHqBTr34tpz+hmdiCpkn9bUjCkSKrA4Wt5iJ/Tg7ePxB+PGqUVoDxpcRnKQHxktaRJj2AqdmEXKdXsvPsGmn2BhgaZwwsQffvQevOVoeQhNR7RcJBNU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119822; c=relaxed/simple; bh=2enGK+2yFu7ccYT1RFgOq9BblDV/xR+9lzKnkxuffKg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kBA0a6b10sbpKrNoEKkU3EBTy+B2KjPzSTMoow/3qBHLWuVrpY84bmziNJQL5LVZuotDZd4eyTWpggVgscnW+tq34MUIi2AMxTMkPRfBJXAdR7Ua+R9t7582GMM3cyvKjedAQRODyv97oISz67seeyIOG2NodF4wMmTfsGeAg4M= 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=a4pA6kW1; arc=none smtp.client-ip=209.85.167.42 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="a4pA6kW1" Received: by mail-lf1-f42.google.com with SMTP id 2adb3069b0e04-5b021916bd3so4483790e87.3 for ; Wed, 15 Jul 2026 05:50:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784119819; x=1784724619; 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=ppLEqAItlHRjf3OSSFlRs6JoUnbvvpjgmMQuOUp2Ddk=; b=a4pA6kW1HUro13uohmbU8uYnpT3Tvc1w8IXIey2njZWR8o02Pj1Zielf1X4NeorKlZ hWNhKWhOVHU4kDQYsZd7D6Icdwvtl10l3QppmHRVj5PY1Y4+L/rQPtXf9lJZXxlAL3bC P8Hdexz7Ksz5+tnuvfd0dwviWIDqMOI/mbydq3O285eKIPGEiCq2QmD66vyzt8bYJYHG 3rDFSQ0w3Otdmqmp/wKeC6nQEs9zGPJvOzq4bgkHd6p5dB/hv1z1lKs10AzstaX9lYAD l9dWnSNyymwvHH59lcuGD0OFkbTd3JREAFxtPlpqsMpfjhCZcavhbZF9q3UI4is8lbMw +uXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784119819; x=1784724619; 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=ppLEqAItlHRjf3OSSFlRs6JoUnbvvpjgmMQuOUp2Ddk=; b=i5q2nTJiAguqXA6hCpWktSpoNiNiMmCw7+Cln69SNyRcZvMl+oMUoJgW9A411en3K3 WQTshmxDEZoF1IvwklYfvEZw3qug6nFDhuJmswjKN6yhmUB5uwHikmeaK5VmFxIf4onS eoJ1Drv1UI0Pbv5Q7zjpCFSebXPPNAuYUleOVytufOoityRJTNaZXcGbKkV6ySpdxylh m986VaCGHSsiBXefB+CwjWmh1eXiVtdc9HrMNELlQsWtz0R0TWcKEXZ9g3EdtzjtgsSD vPFsX3K4bh7BfRfUcwpjwFtqXaTHswkDBtFo2P22lZYvYVGbXRYw+rcYdrBPdC/LRVwf ZqcA== X-Forwarded-Encrypted: i=1; AHgh+RrNxJGdrHJR1k3ZpjHZ2/110K+bS5yQhDodSI6y96qOiQktRqXbkjuDjZkJ8mOtaU9bWZKtboAa6+tpUnI=@vger.kernel.org X-Gm-Message-State: AOJu0YzNVczBtMdCqtN8GKWNA6no33zR7AgTTG3L2sj81bECZf+OQlro TEz9WfTNvTU1Sls22AQThjhnMKxUfzLdMZmoFtPA+7Sjf2Ktd1E3afvEY6BmadA/N6g13w== X-Gm-Gg: AfdE7ckUaG6/xsi33wYYIcadM0DNkbcRA1PVPrHxZqSahVlsJ2l3lk1mEs+6QdWa+ZK MKa5/aO3pe1NdFCHeocSMe+T42poZMYBbXno/OAzVHZ9obTvRoK0It4vTsajDEKI70S7t0CkyeL Bby/o5RnfslNCjs3qOi7U4qh5xguaxMSY4XJOsf4oKyEPnBG/VQ8gNDila3m4xH+Bjkh43Ar8LX Kmav1y+wf+U3sPbIwjxXp2+viaRa0X/ECmc1JyvfWiUStGCS4UAFXB2NWXk8oqTcgHj8kOIGcoD M6Jc/YrSrpvXA+czxlxfz1fTteOnWEH1isEkWZS0tnfAgahXEIN/BfE21IeO/0dNfrXEWpaI94B OtQGh3XntmrhO52L2QtrK5dLabZRvwndzo4H1KvKBdCQu4J/MlbGwj+nYyIDWFnezrJUHEXaEiF Txvf8AhPZ59qUqoI4oe1G8ScQ/oHDNftSdnjArJTRufwnJ/fbeO0hbeSfFl6vaX8Qxw6B/2IhSj N2siOKv6/CqXQ== X-Received: by 2002:a05:6512:66c6:10b0:5b0:bc3:dbf3 with SMTP id 2adb3069b0e04-5b15d79dabbmr463709e87.30.1784119819065; Wed, 15 Jul 2026 05:50:19 -0700 (PDT) Received: from archlinux ([94.180.44.28]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b022fac999sm3404042e87.55.2026.07.15.05.50.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2026 05:50:18 -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 05/61] staging: rtl8723bs: remove unused OnAtim stub function Date: Wed, 15 Jul 2026 19:47:33 +0700 Message-ID: <20260715124829.90290-6-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: quoted-printable Content-Type: text/plain; charset="utf-8" The OnAtim() function is an empty stub that merely returns _SUCCESS without performing any actual work. Since ATIM frame processing is not required for this driver, remove the redundant function definition, its prototype, and replace its reference in mlme_sta_tbl[] with NULL. The internal _mgt_dispatcher() already safely checks if ptable->func is not NULL before dereferencing, making this change completely safe. Signed-off-by: Arsenii Pashchenko --- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 7 +------ drivers/staging/rtl8723bs/include/rtw_mlme_ext.h | 1 - 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/stagin= g/rtl8723bs/core/rtw_mlme_ext.c index a86d6f97c..774fa9e32 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c @@ -23,7 +23,7 @@ static struct mlme_handler mlme_sta_tbl[] =3D { {0, "DoReserved", &DoReserved}, {0, "DoReserved", &DoReserved}, {WIFI_BEACON, "OnBeacon", &OnBeacon}, - {WIFI_ATIM, "OnATIM", &OnAtim}, + {WIFI_ATIM, "OnATIM", NULL}, {WIFI_DISASSOC, "OnDisassoc", &OnDisassoc}, {WIFI_AUTH, "OnAuth", &OnAuthClient}, {WIFI_DEAUTH, "OnDeAuth", &OnDeAuth}, @@ -1531,11 +1531,6 @@ unsigned int OnDisassoc(struct adapter *padapter, un= ion recv_frame *precv_frame) return _SUCCESS; } =20 -unsigned int OnAtim(struct adapter *padapter, union recv_frame *precv_fram= e) -{ - return _SUCCESS; -} - unsigned int on_action_spct(struct adapter *padapter, union recv_frame *pr= ecv_frame) { struct sta_info *psta =3D NULL; diff --git a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h b/drivers/sta= ging/rtl8723bs/include/rtw_mlme_ext.h index cb23c6939..332411ead 100644 --- a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h +++ b/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h @@ -564,7 +564,6 @@ unsigned int OnProbeReq(struct adapter *padapter, union= recv_frame *precv_frame) unsigned int OnProbeRsp(struct adapter *padapter, union recv_frame *precv_= frame); unsigned int DoReserved(struct adapter *padapter, union recv_frame *precv_= frame); unsigned int OnBeacon(struct adapter *padapter, union recv_frame *precv_fr= ame); -unsigned int OnAtim(struct adapter *padapter, union recv_frame *precv_fram= e); unsigned int OnDisassoc(struct adapter *padapter, union recv_frame *precv_= frame); unsigned int OnAuth(struct adapter *padapter, union recv_frame *precv_fram= e); unsigned int OnAuthClient(struct adapter *padapter, union recv_frame *prec= v_frame); --=20 2.55.0 From nobody Sat Jul 25 17:33:43 2026 Received: from mail-lf1-f54.google.com (mail-lf1-f54.google.com [209.85.167.54]) (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 F090044683F for ; Wed, 15 Jul 2026 12:50:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119824; cv=none; b=Bq8QKKinDpeBtjg7aUNDjNHI/HnlgkQfzwJ4J7lZUwL+sb79qeW8Lv/6BLbufB9nYOLUuJN5E8g9a2lzD3+hrL+Yv2NJFNUiaAp7VzKUR6YcO5TMm9AQW4MYnBTB9dzNvHyU0Ir4kEQy36PMOy6+weLvoQ79Imzz/NA+jceV1/g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119824; c=relaxed/simple; bh=HienQwcFUNgUwnMwcPw9INFjVyfYyO9GXcFaWoZq2AI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TZgVZW9sJV4BPeWRIxQ8+ldM0dPFp4XGrpWKDBttkTS8AlzSv/znZqah07UFUpIgy+rSCszO2Y7ixja0YsAlus07Nd/5AF66YpIxEa1Ccv4dTejm4p9Wn4i9nArOXotiCJ0oPmgjU2vkCpFdkXT9wXwUiW2c5gomy2JB+POkcHk= 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=FnT4ApNp; arc=none smtp.client-ip=209.85.167.54 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="FnT4ApNp" Received: by mail-lf1-f54.google.com with SMTP id 2adb3069b0e04-5b013aa02b2so869974e87.0 for ; Wed, 15 Jul 2026 05:50:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784119820; x=1784724620; 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=jGTb5yjtMc1NxXForp3A2BdTMsjuiB1oUDjMTGf3sEA=; b=FnT4ApNp92Lm+7nGWbQ8S0EHrc69VMhtaZd6WbdMrMyiShatNXUF2fmxFx1S79C9BZ 0mN8CHCLNgZxGLPjNxF41TZFSWH4s8P1WkkiPXQHrjvFNL+mexsRipmrUBk0DOYaxwAf 6G5AGlt/RYoIX86rwHdziVNOhqoLakCBqYe646brIZLIvc0iNV5AckhZK/uK/HEfnp+H PRGLIsCGIBv+AEA2swvM75lqzKPBIr/GnAX1AaKUFL2FsD8QqIuAAjlnot2SVyhAPhr9 nqi3MBmaRbSxVB2XqEVyCwyLdVKVnKBBGlZY2HyaYUUCi0jiKaBUO2y433xZYMeXhhNx KViw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784119820; x=1784724620; 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=jGTb5yjtMc1NxXForp3A2BdTMsjuiB1oUDjMTGf3sEA=; b=sTIrCgUDodGYO9FMa90ixyM6LE7EQBgJM1FLi3hrdFCTrNJcHluZxuBBcmLwzhWKPi 2An2feNIj2NXL7AiuPxHnSfoWCIv8Q5Hp/oAhmphOVGk8LlOE1fTVnE2RY9PgIx71oyK Srd8SjaMsd3HRuvX+3m0ytFO2V/LvhH7DkoKNXrS368sE973V4A1kgPx7ZFzXtDtim0w G4QL54FaB8mxHEgqRfm823addNhiOl1XvxwwrMRr+EZC6Jb5Tc/4gKOOGY8kxQt/R3O1 Zzm+4UdhyH+dd7vvkycU1D2tMEt9pfLDOQs/BzEZ+5qY0RyFtui9M9PQRwWVFkV9RATu 3o2A== X-Forwarded-Encrypted: i=1; AHgh+RprYVaQsC6QMUpwcf2We9F9xmo57AT8uiK4xCVRqmvRVUeEXpb36ykWJC1CVUTdzqntOFzCJCVPzIILp6I=@vger.kernel.org X-Gm-Message-State: AOJu0YxC/WQi0LKcIG2CdYHk70P4A6yCLQV+BF0JwdgQfOBk8pMnc/fm ieFpVUKrN3IejKHZ9wQnBga+ilObPubG0ccWTF1hTb+MqqoegyqdA1bF X-Gm-Gg: AfdE7cnKlzLmD9V4nLILADvzbVS/2LD8YJNY3wXdh5uQ3k8MJRX2LTjIm5+DfogcJIN tNb+lFRKFEuXwob5NjLJBPJhzFbOCv+NP7k+LpPEP+woqfwt1BnRl/TmFj3AXgS7mV+89eqepIo 9tcr/8fF7LsMWJuDZqdO3ZklG0sCzVWkN81JEMW9QwSNQJhl9d8rrElGFzFnuZrG1H5cmRiI6cO PnSt/H4lzjFAwxVojRUSKCb9IZCc/RDmcHDbi74/ektpRgZ/QodAbd8cF7zSc3JY7omZCK9KoJv H6rRnQj7kQ0v313b7gm5NjgUA6RLiRQU7tNDVHOR6PAXRZsIG3I6aw6GDHTfuYZd+bjdTCH8Nti coUJ1ASx6JgoUhsZJqc2Zg0oqXS7tQn5BRc0AbLgkqWmfXoXEfUby2nJgMbkM1zck8BPhvXJaPs JAhaIid4E3rjg26uc+VPHXRW2WeMjPBf/X8OSwhoNr4UGiLjxGWAlYL0BLSBnYZhApzLfvANDIW 2bqueOQiYFrYw== X-Received: by 2002:a05:6512:668c:10b0:5ae:c542:3416 with SMTP id 2adb3069b0e04-5b023c871d6mr2396695e87.0.1784119819840; Wed, 15 Jul 2026 05:50:19 -0700 (PDT) Received: from archlinux ([94.180.44.28]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b022fac999sm3404042e87.55.2026.07.15.05.50.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2026 05:50:19 -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 06/61] staging: rtl8723bs: remove DoReserved stub and clean up OnAction_tbl Date: Wed, 15 Jul 2026 19:47:34 +0700 Message-ID: <20260715124829.90290-7-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: quoted-printable Content-Type: text/plain; charset="utf-8" The DoReserved() function is an empty stub that merely returns _SUCCESS without performing any actual work. Remove the redundant function definition and its prototype. Concurrently, clean up the OnAction_tbl array by physically removing the now-unused elements that referenced DoReserved or contained NULL. Since OnAction() iterates through this table sequentially using ARRAY_SIZE(), removing these entries safely shrinks the array size and eliminates dead code. Signed-off-by: Arsenii Pashchenko --- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 16 ++-------------- drivers/staging/rtl8723bs/include/rtw_mlme_ext.h | 2 +- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/stagin= g/rtl8723bs/core/rtw_mlme_ext.c index 774fa9e32..48043dae7 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c @@ -20,8 +20,8 @@ static struct mlme_handler mlme_sta_tbl[] =3D { {WIFI_PROBERSP, "OnProbeRsp", &OnProbeRsp}, =20 /* below 2 are reserved */ - {0, "DoReserved", &DoReserved}, - {0, "DoReserved", &DoReserved}, + {0, "DoReserved", NULL}, + {0, "DoReserved", NULL}, {WIFI_BEACON, "OnBeacon", &OnBeacon}, {WIFI_ATIM, "OnATIM", NULL}, {WIFI_DISASSOC, "OnDisassoc", &OnDisassoc}, @@ -33,18 +33,10 @@ static struct mlme_handler mlme_sta_tbl[] =3D { =20 static struct action_handler OnAction_tbl[] =3D { {RTW_WLAN_CATEGORY_SPECTRUM_MGMT, "ACTION_SPECTRUM_MGMT", on_action_spct= }, - {RTW_WLAN_CATEGORY_QOS, "ACTION_QOS", &DoReserved}, - {RTW_WLAN_CATEGORY_DLS, "ACTION_DLS", &DoReserved}, {RTW_WLAN_CATEGORY_BACK, "ACTION_BACK", &OnAction_back}, {RTW_WLAN_CATEGORY_PUBLIC, "ACTION_PUBLIC", on_action_public}, - {RTW_WLAN_CATEGORY_RADIO_MEASUREMENT, "ACTION_RADIO_MEASUREMENT", &DoRese= rved}, - {RTW_WLAN_CATEGORY_FT, "ACTION_FT", &DoReserved}, {RTW_WLAN_CATEGORY_HT, "ACTION_HT", &OnAction_ht}, {RTW_WLAN_CATEGORY_SA_QUERY, "ACTION_SA_QUERY", &OnAction_sa_query}, - {RTW_WLAN_CATEGORY_UNPROTECTED_WNM, "ACTION_UNPROTECTED_WNM", &DoReserved= }, - {RTW_WLAN_CATEGORY_SELF_PROTECTED, "ACTION_SELF_PROTECTED", &DoReserved}, - {RTW_WLAN_CATEGORY_WMM, "ACTION_WMM", &DoReserved}, - {RTW_WLAN_CATEGORY_P2P, "ACTION_P2P", &DoReserved}, }; =20 static u8 null_addr[ETH_ALEN] =3D {0, 0, 0, 0, 0, 0}; @@ -1836,10 +1828,6 @@ unsigned int OnAction(struct adapter *padapter, unio= n recv_frame *precv_frame) return _SUCCESS; } =20 -unsigned int DoReserved(struct adapter *padapter, union recv_frame *precv_= frame) -{ - return _SUCCESS; -} =20 static struct xmit_frame *_alloc_mgtxmitframe(struct xmit_priv *pxmitpriv,= bool once) { diff --git a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h b/drivers/sta= ging/rtl8723bs/include/rtw_mlme_ext.h index 332411ead..9d42b7494 100644 --- a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h +++ b/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h @@ -562,7 +562,7 @@ unsigned int OnAssocReq(struct adapter *padapter, union= recv_frame *precv_frame) unsigned int OnAssocRsp(struct adapter *padapter, union recv_frame *precv_= frame); unsigned int OnProbeReq(struct adapter *padapter, union recv_frame *precv_= frame); unsigned int OnProbeRsp(struct adapter *padapter, union recv_frame *precv_= frame); -unsigned int DoReserved(struct adapter *padapter, union recv_frame *precv_= frame); + unsigned int OnBeacon(struct adapter *padapter, union recv_frame *precv_fr= ame); unsigned int OnDisassoc(struct adapter *padapter, union recv_frame *precv_= frame); unsigned int OnAuth(struct adapter *padapter, union recv_frame *precv_fram= e); --=20 2.55.0 From nobody Sat Jul 25 17:33:43 2026 Received: from mail-lf1-f53.google.com (mail-lf1-f53.google.com [209.85.167.53]) (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 C45FC472768 for ; Wed, 15 Jul 2026 12:50:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119824; cv=none; b=jv3biyf/+uVhkQPi+5srGTwFdVYaNJXyy19+TRswwx+SbfdVHts+qV0EbhXWl2TzDFnVVRUmn54l3t/UYQPpezm0nYgvdlFnFwqxuQIuKwhj1Leti1y8ImkxDGdJ3BEZyrJcY1kPSoOE3FaTmHF6U1N758RxRWmi+npFaM+SJrs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119824; c=relaxed/simple; bh=+etsDGOHprPmH6KL0zM57WhifkfFHzvhi7WgBXB7oPI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gnsfrZwM/weejHItyqEW7ZgujnMlXGzq2irQR+O218hdV1ydx5kCMuO+MvPOs9dyLpNjTGPLB2AsehZoY+w65Pm3IXtQ5Kk8OBBh++QhrKgvu1bcG/FHHIDJjTtSiGLKxPlD4MZqdfgaj9CI6fH+ymlXYrnKE5cPROlTzQSLogw= 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=NzL0WVtc; arc=none smtp.client-ip=209.85.167.53 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="NzL0WVtc" Received: by mail-lf1-f53.google.com with SMTP id 2adb3069b0e04-5b15c6fb864so764590e87.1 for ; Wed, 15 Jul 2026 05:50:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784119821; x=1784724621; 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=NbyHxJjaCgQdr3hTdsrrcihXelZohw0VURs18q5Mk7g=; b=NzL0WVtci15DMyswcHG0PFhCloEFkmv7lHNFx17yoquK9LPxSnNGavjlrXDiWVarhU 7bnMspsVa1ZO0YVDPebfNx1N/VvSs8HGBb3sCNgH01zrgvhjtvspJnzB0dEPy21a/qeU U2NRUDYTX/4xt++ylmpkCakkrmX/tUiBerTx2G7+eri0HBMTCZtuD0BZdwZRXOWS2gOT F/tB1vv6FXJDUzZR6TLaUKg2Z6sw2MpfrZ53vR2ZhDEI42MrXjbeGo01p5PuUsKIUDN1 2Nlk4g/ioGMc98UWJSqR7GBhq16/ezEuAM36+AZxGgD/95mcivlvWnpWIf5hudjmhZ+2 hFfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784119821; x=1784724621; 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=NbyHxJjaCgQdr3hTdsrrcihXelZohw0VURs18q5Mk7g=; b=TdzeqJ2bmZPx7tY0qSGvtth0w1OD4sFmbFcwa7bTsj023gdlwtpuD5OAP6Flalin9m 34DNlIA3lCrAGy0YtyaKZystdCKnVDhEpkGiChEggHLZBj1Ks2MjkUEJlHfIE8aQPyrb suw1W9q/IAqJbWwYkXpA80xqccMGxCXyXwWfkWzuaxOqmRNGapU8gGoEm1WhVsIyOkAs +KEpuJYNZLMhr5rx/YUkk/mzkYUFxcGnnT8njIwIeGxgmXGgY08bWNAvkWPG4ga0+uKC MuxLcA1/gUSnllNUW6+t9MErA9g6ntR8Q8csImWweIVNQaIAhZpQxnWTKR/7eTGkxZ1v Ntyw== X-Forwarded-Encrypted: i=1; AHgh+RorCgda6yV0UjpmLk4jAzYfb+ficWZtz3uqPmTCIQMLq8JJUblCe8b+9CUclXhLxc68DQqaFs8QK2OlfYo=@vger.kernel.org X-Gm-Message-State: AOJu0Yyr/5/YlSSoI6jxZaEo+LkZhhAGi5KPeI9R+L8qSgSql6Knn+GS iWmINitNO+jP3A9wKYh+I3BLK1oh6sATIRjOLMRcJfzg8PwMoa8LHaaq X-Gm-Gg: AfdE7cksIWtoz7ecOORApK8RCXNflH80q2E+3qMOqcX+2/PbnL59xXuaPzDQJ1qc7ev zQpi8ZG/xqOE0Ws2+PosfAQuNi3A4ISykU8MRXRccLh4VfMEuYIJQsWNE04ZZeSqqXc1pYikrSU +PCjFNhTGEFmyfM06+cQskYBpv2+H3SQjvOAXVHhk9g5G7k3fdnZsqT8IzP/yT/NN3UETYGyeDh eAtEtqn7fyKxX5k5ylA8v+/0XytYx4Y5698JaPxrgklYqm62w8OHCUrBtJsrHzNf1mj4MaQbMC7 AGxH8V1upisZs68jT2amceRNU97ucGvhrdXCdy6yeBlWuNAkXuDZ6z1cYbpziX6VHjMT9ZBMB7+ e6LrIy22eW1HznXFKf649obaCA6v+pHNWihaMAqaWpmcWrtMBxYnOzPiXV35q9oTPBsfQZSaM5Y mFEyrKX8NB2aETf/CAOV7hfy2SB6SDG4uw+R2R8sFnlop47UpDMzqgy22uS42VN7Nlyc5f/vQWu eTIquOSBPkG9w== X-Received: by 2002:a05:6512:65d8:20b0:5b0:f9d:f7a0 with SMTP id 2adb3069b0e04-5b15d76c31cmr441525e87.8.1784119820630; Wed, 15 Jul 2026 05:50:20 -0700 (PDT) Received: from archlinux ([94.180.44.28]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b022fac999sm3404042e87.55.2026.07.15.05.50.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2026 05:50:20 -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 07/61] staging: rtl8723bs: remove redundant issue_deauth wrapper Date: Wed, 15 Jul 2026 19:47:35 +0700 Message-ID: <20260715124829.90290-8-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: quoted-printable Content-Type: text/plain; charset="utf-8" Remove the redundant issue_deauth() wrapper function. Make the underlying internal function global and rename it from _issue_deauth() to issue_deauth() by removing the leading underscore. Update all call sites across the driver to use the updated issue_deauth() function directly, passing the explicit trailing 'false' argument where the wrapper was previously used. This eliminates unnecessary boilerplate and simplifies code traceability. Signed-off-by: Arsenii Pashchenko --- drivers/staging/rtl8723bs/core/rtw_ap.c | 4 ++-- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 11 +++------- drivers/staging/rtl8723bs/core/rtw_recv.c | 20 +++++++++++++++---- .../staging/rtl8723bs/include/rtw_mlme_ext.h | 2 +- 4 files changed, 22 insertions(+), 15 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_ap.c b/drivers/staging/rtl8= 723bs/core/rtw_ap.c index a6640cd7a..274d99e6a 100644 --- a/drivers/staging/rtl8723bs/core/rtw_ap.c +++ b/drivers/staging/rtl8723bs/core/rtw_ap.c @@ -1775,7 +1775,7 @@ u8 ap_free_sta(struct adapter *padapter, /* tear down TX AMPDU */ send_delba(padapter, 1, psta->hwaddr);/* // originator */ =20 - issue_deauth(padapter, psta->hwaddr, reason); + issue_deauth(padapter, psta->hwaddr, reason, false); } =20 psta->htpriv.agg_enable_bitmap =3D 0x0;/* reset */ @@ -1824,7 +1824,7 @@ void rtw_sta_flush(struct adapter *padapter) } spin_unlock_bh(&pstapriv->asoc_list_lock); =20 - issue_deauth(padapter, bc_addr, WLAN_REASON_DEAUTH_LEAVING); + issue_deauth(padapter, bc_addr, WLAN_REASON_DEAUTH_LEAVING, false); =20 associated_clients_update(padapter, true); } diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/stagin= g/rtl8723bs/core/rtw_mlme_ext.c index 48043dae7..84283bb22 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c @@ -1296,7 +1296,7 @@ unsigned int OnAssocReq(struct adapter *padapter, uni= on recv_frame *precv_frame) =20 asoc_class2_error: =20 - issue_deauth(padapter, GetAddr2Ptr(pframe), status); + issue_deauth(padapter, GetAddr2Ptr(pframe), status, false); =20 return _FAIL; =20 @@ -3152,7 +3152,7 @@ int issue_qos_nulldata(struct adapter *padapter, unsi= gned char *da, u16 tid, int return ret; } =20 -static int _issue_deauth(struct adapter *padapter, unsigned char *da, +int issue_deauth(struct adapter *padapter, unsigned char *da, unsigned short reason, bool wait_ack) { struct xmit_frame *pmgntframe; @@ -3210,11 +3210,6 @@ static int _issue_deauth(struct adapter *padapter, u= nsigned char *da, return ret; } =20 -int issue_deauth(struct adapter *padapter, unsigned char *da, unsigned sho= rt reason) -{ - return _issue_deauth(padapter, da, reason, false); -} - int issue_deauth_ex(struct adapter *padapter, u8 *da, unsigned short reaso= n, int try_cnt, int wait_ms) { @@ -3222,7 +3217,7 @@ int issue_deauth_ex(struct adapter *padapter, u8 *da,= unsigned short reason, int int i =3D 0; =20 do { - ret =3D _issue_deauth(padapter, da, reason, wait_ms > 0); + ret =3D issue_deauth(padapter, da, reason, wait_ms > 0); =20 i++; =20 diff --git a/drivers/staging/rtl8723bs/core/rtw_recv.c b/drivers/staging/rt= l8723bs/core/rtw_recv.c index 86c5e2c4e..78bd04982 100644 --- a/drivers/staging/rtl8723bs/core/rtw_recv.c +++ b/drivers/staging/rtl8723bs/core/rtw_recv.c @@ -798,7 +798,10 @@ static signed int ap2sta_data_frame(struct adapter *ad= apter, union recv_frame *p is_zero_ether_addr(mybssid) || (memcmp(pattrib->bssid, mybssid, ETH_ALEN))) { if (!bmcast) - issue_deauth(adapter, pattrib->bssid, WLAN_REASON_CLASS3_FRAME_FROM_NO= NASSOC_STA); + issue_deauth(adapter, + pattrib->bssid, + WLAN_REASON_CLASS3_FRAME_FROM_NONASSOC_STA, + false); =20 ret =3D _FAIL; goto exit; @@ -852,7 +855,10 @@ static signed int ap2sta_data_frame(struct adapter *ad= apter, union recv_frame *p if (jiffies_to_msecs(jiffies - send_issue_deauth_time) > 10000 || send= _issue_deauth_time =3D=3D 0) { send_issue_deauth_time =3D jiffies; =20 - issue_deauth(adapter, pattrib->bssid, WLAN_REASON_CLASS3_FRAME_FROM_N= ONASSOC_STA); + issue_deauth(adapter, + pattrib->bssid, + WLAN_REASON_CLASS3_FRAME_FROM_NONASSOC_STA, + false); } } } @@ -883,7 +889,10 @@ static signed int sta2ap_data_frame(struct adapter *ad= apter, union recv_frame *p =20 *psta =3D rtw_get_stainfo(pstapriv, pattrib->src); if (!*psta) { - issue_deauth(adapter, pattrib->src, WLAN_REASON_CLASS3_FRAME_FROM_NONAS= SOC_STA); + issue_deauth(adapter, + pattrib->src, + WLAN_REASON_CLASS3_FRAME_FROM_NONASSOC_STA, + false); =20 ret =3D RTW_RX_HANDLED; goto exit; @@ -907,7 +916,10 @@ static signed int sta2ap_data_frame(struct adapter *ad= apter, union recv_frame *p ret =3D RTW_RX_HANDLED; goto exit; } - issue_deauth(adapter, pattrib->src, WLAN_REASON_CLASS3_FRAME_FROM_NONASS= OC_STA); + issue_deauth(adapter, + pattrib->src, + WLAN_REASON_CLASS3_FRAME_FROM_NONASSOC_STA, + false); ret =3D RTW_RX_HANDLED; goto exit; } diff --git a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h b/drivers/sta= ging/rtl8723bs/include/rtw_mlme_ext.h index 9d42b7494..578708cb3 100644 --- a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h +++ b/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h @@ -546,7 +546,7 @@ s32 issue_probereq_ex(struct adapter *padapter, struct = ndis_802_11_ssid *pssid, int issue_nulldata(struct adapter *padapter, unsigned char *da, unsigned i= nt power_mode, int try_cnt, int wait_ms); s32 issue_nulldata_in_interrupt(struct adapter *padapter, u8 *da); int issue_qos_nulldata(struct adapter *padapter, unsigned char *da, u16 ti= d, int try_cnt, int wait_ms); -int issue_deauth(struct adapter *padapter, unsigned char *da, unsigned sho= rt reason); +int issue_deauth(struct adapter *padapter, unsigned char *da, unsigned sho= rt reason, bool wait_ack); int issue_deauth_ex(struct adapter *padapter, u8 *da, unsigned short reaso= n, int try_cnt, int wait_ms); void issue_action_BA(struct adapter *padapter, unsigned char *raddr, unsig= ned char action, unsigned short status); void issue_action_SA_Query(struct adapter *padapter, unsigned char *raddr,= unsigned char action, unsigned short tid); --=20 2.55.0 From nobody Sat Jul 25 17:33:43 2026 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 83AEA478E5B for ; Wed, 15 Jul 2026 12:50:23 +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=1784119825; cv=none; b=mSuE5NGp5bsnt12hmb6N4YYmkdRM45PmTZxAv5xyhtYnxrjviQm5O+/K9XRGdEsM1Aw0haqL3w/c+t7y4mtqSmd3tTFxl0+c1aJ/WP+FuXaIc0eLjfWmiUHZ9j9d0UZrtlpMiOTVCq3Bnu1p7b6jihRg+hDbimEWiFZ6GOK0evk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119825; c=relaxed/simple; bh=tOisHDi0phiyzU0vMYb0qTFoiPyLIHuqVUpPm+GYpOA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WWHjNRWAghATxOv8o+IZDDzPR4Ne+FYYJiNP6uzuLyy1efXfRVksuszgC8XzcE9Xt+ezNotwcOUm009r7N4VFrKkGDKqTjW1GtQ5PmfgA7FhLi7ixfW79X7QTghMsTQCE4gN8gvhfEQ8T+l+SlLjCurZ1zs7I+2RnPIxjK8SUTI= 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=Cqw7CVHR; 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="Cqw7CVHR" Received: by mail-lf1-f43.google.com with SMTP id 2adb3069b0e04-5b0231a3e86so4632962e87.0 for ; Wed, 15 Jul 2026 05:50:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784119821; x=1784724621; 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=gsOYVxFhznZQrT6Z49Uf6QbYafsZoVDekj2J13kqbiM=; b=Cqw7CVHRWtuUXtPkdNLoHvZ/WPmiWoilhu4VPITVvcu289S0b/5U8vYGx3lC+Ru5k8 wcmAwCzzV1HM01V+/JhZnC1k/EHS9xhAI6+q7YoLxzxxlc5DUbhcrrYTqL520UFRrw/Y CM8H6sz/UK2piqhxO6FpMcACWP75XMh7dw5vgmbBQ+/YlZfnjX1dVTGuSh9dzlXR8UTP T3cIlzWadggScd9H7x19BBNOMtA6L2zFW7r5Ou+bEYuh0QfHgBvgTJOR5vgI/3CpO+p6 +CPW6WnsEEJ8nZ/6XsqxyYLKbM6TdZSChyt4ZXws0eKDHTyAVtpIBHgTTNZJvCxj7pd+ N7OA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784119821; x=1784724621; 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=gsOYVxFhznZQrT6Z49Uf6QbYafsZoVDekj2J13kqbiM=; b=iRSr3xZIFkmfxQWMakTp8gFUfCOJ4BeDAYLRz7Rgaggob7Ii68/uIO3AKQ/yma0JeY YnaehHt/tMvIM1GSL0biHGVCNLdV7nX3bb6j92oe8yNYb6kAhcFR2Q4ALPc97QAjz3+g /PmgwfHm2hDxtcAlMQr4KiRatAH/2yR/rpN/psMyFzdMtgX3m+9hY/DiyO1yojTn+e+o 4xMHF/Sy3BIGT2d9BXB++0p388flAt3IsDwuCjQdbYCwAhTY7zIIHYIr6nmBDd8Iki+p 2nmI6t1eHaZiAE61joRn9UjosW5B+tzUai7Z9JBTmtmmoDrzAowSehsZvXlXTDPfr1y6 zTCw== X-Forwarded-Encrypted: i=1; AHgh+RoB1QdB4LnbAMKSoqd2ieYL4grxcv21YUwMWPxc8gl1c//boqQJ7zyT1ROzVTukq2bxRJFjfCbngC4S2hA=@vger.kernel.org X-Gm-Message-State: AOJu0YzUmLs7tn/AhN8ppx3QhWTuozjkzzV58F526k91LkO1lSaRZtNo 2v5DcLaVOwAn7YqFw/yLGTZLnkHuDJ8X5dN863aTquxfyUxIbP0fDF4/bU5EWD1HIEw= X-Gm-Gg: AfdE7ckPRzJHg5RjRl7o+WG9T7XAspcrsZ/Z+6c/A5ora/N1drp6G3ZvxSoOesdXgfH GF75k6kpryV06bdGM4fbutzaOsKa5TYZ9HGLtqdT8Ku7I/TL8Ry8ldCtSQU68/XColH0MDCcoGm dY7/CzckGP8r7adQ+tgyfdIT4AwiVqG1ijHVePyVDSPcvd0EZDe+lh8qot/2qZEhYFod+2zMV6t qje8IvUIuRXfTnuNLZnqILT86Z0eQmebrlz2/VciOHfq+sXkJLP5U+Xh/AWroWWZYb2kCIFTESO UfC6gMNMRl/6/R6kCCu0+A1GCPAmPWIPRULHBdAiO06WmTi7LgwLEw6v57jR6+pi5ATRJs9dsDj +jVtHPN2EepiKg71yYV58rzAScBZyQE/5yqwbUQwLxd5x6C+wDFdv1WwNoOYkWvuFJEB2SshC8e 8xagV3dJGG0ryRNI5uc4XDRA3mYK+z3rRdTdSBp3+slSOSr/CuVKg9v9103U2FdcRMxATvl/lXJ D7/tf2QMOPbFw== X-Received: by 2002:a05:6512:61d3:20b0:5aa:5ef9:a33 with SMTP id 2adb3069b0e04-5b15d77e547mr473071e87.25.1784119821409; Wed, 15 Jul 2026 05:50:21 -0700 (PDT) Received: from archlinux ([94.180.44.28]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b022fac999sm3404042e87.55.2026.07.15.05.50.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2026 05:50:21 -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 08/61] staging: rtl8723bs: remove unused NULL_hdl function Date: Wed, 15 Jul 2026 19:47:36 +0700 Message-ID: <20260715124829.90290-9-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: quoted-printable Content-Type: text/plain; charset="utf-8" The NULL_hdl() function is completely unused across the entire driver and serves as dead code. Remove the redundant function definition and its prototype to clean up the codebase and reduce the driver footprint Signed-off-by: Arsenii Pashchenko --- drivers/staging/rtl8723bs/core/rtw_cmd.c | 12 ++++++------ drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 5 +---- drivers/staging/rtl8723bs/include/rtw_mlme_ext.h | 2 -- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_cmd.c b/drivers/staging/rtl= 8723bs/core/rtw_cmd.c index b932670f5..0c8fb2754 100644 --- a/drivers/staging/rtl8723bs/core/rtw_cmd.c +++ b/drivers/staging/rtl8723bs/core/rtw_cmd.c @@ -86,12 +86,12 @@ static struct _cmd_callback rtw_cmd_callback[] =3D { }; =20 static struct cmd_hdl wlancmds[] =3D { - GEN_DRV_CMD_HANDLER(0, NULL) /*0*/ - GEN_DRV_CMD_HANDLER(0, NULL) - GEN_DRV_CMD_HANDLER(0, NULL) - GEN_DRV_CMD_HANDLER(0, NULL) - GEN_DRV_CMD_HANDLER(0, NULL) - GEN_DRV_CMD_HANDLER(0, NULL) + {0, NULL}, /*0*/ + {0, NULL}, + {0, NULL}, + {0, NULL}, + {0, NULL}, + {0, NULL}, GEN_MLME_EXT_HANDLER(0, NULL) GEN_MLME_EXT_HANDLER(0, NULL) GEN_MLME_EXT_HANDLER(0, NULL) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/stagin= g/rtl8723bs/core/rtw_mlme_ext.c index 84283bb22..e1503b054 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c @@ -5005,10 +5005,7 @@ void sa_query_timer_hdl(struct timer_list *t) spin_unlock_bh(&pmlmepriv->lock); } =20 -u8 NULL_hdl(struct adapter *padapter, u8 *pbuf) -{ - return H2C_SUCCESS; -} + =20 u8 setopmode_hdl(struct adapter *padapter, u8 *pbuf) { diff --git a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h b/drivers/sta= ging/rtl8723bs/include/rtw_mlme_ext.h index 578708cb3..0f606357d 100644 --- a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h +++ b/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h @@ -628,7 +628,6 @@ u8 read_rfreg_hdl(struct adapter *padapter, u8 *pbuf); u8 write_rfreg_hdl(struct adapter *padapter, u8 *pbuf); =20 =20 -u8 NULL_hdl(struct adapter *padapter, u8 *pbuf); u8 join_cmd_hdl(struct adapter *padapter, u8 *pbuf); u8 disconnect_hdl(struct adapter *padapter, u8 *pbuf); u8 createbss_hdl(struct adapter *padapter, u8 *pbuf); @@ -652,7 +651,6 @@ u8 tdls_hdl(struct adapter *padapter, unsigned char *pb= uf); u8 run_in_thread_hdl(struct adapter *padapter, u8 *pbuf); =20 =20 -#define GEN_DRV_CMD_HANDLER(size, cmd) {size, &cmd ## _hdl}, #define GEN_MLME_EXT_HANDLER(size, cmd) {size, cmd}, =20 struct C2HEvent_Header { --=20 2.55.0 From nobody Sat Jul 25 17:33:43 2026 Received: from mail-lf1-f47.google.com (mail-lf1-f47.google.com [209.85.167.47]) (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 4489047B401 for ; Wed, 15 Jul 2026 12:50:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119825; cv=none; b=V1Yxnq5FoxRnvacCEXc95D/fSdt++pVKNPkGyBmxr2p1x1mm22hyVQj3DBp6CSOYvszNnIWsOxYFyLNkM+p5I4yjLvpL2hTz4Q46PEIgOZCAkoL957fg0245pjkQQ2y+qbhO60g9i9camtTAfaTIueNMvrEg1pqPtUVsQf58b5M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119825; c=relaxed/simple; bh=p5BJJIFOuCH2FQBegzzB8r2HroXxOgZWU9yO98C8Bjg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fWP1+g3we2bJg7hydpwewBiiuIVMwlSRhcM2q5NR+FKFft3wV7Y2LatGnPevhXvKKTiyTNGgBD+oxGZkR+GIEZjX8LapwtUSYc96CValwfJCGrmJZNTjXnJEKGtGhVQYw9Jla6Enxz6/9EIAEcPbW5z9X/huxGMWCsVKKQOBtKc= 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=a33Cpdel; arc=none smtp.client-ip=209.85.167.47 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="a33Cpdel" Received: by mail-lf1-f47.google.com with SMTP id 2adb3069b0e04-5b013084dc2so1756221e87.0 for ; Wed, 15 Jul 2026 05:50:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784119822; x=1784724622; 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=bz/T7W3ofqiKO6uuCg8rzvGuRQTBtkTYjUum+zV4WC4=; b=a33CpdelbyBgSDcBMeUFR6NCrWKS9QXY2Pg/jOpPOqAUV4Iy2tSttmVmKU4rHc6Jtz HNrdd6VFhnJfeJe/MQSKkhAmx+ZJxkuepVxaILk6VdS1RuIK1vG36zy43UDuSB5feTUX QxDRSIygi8bYosILJEU9d2CK3bVxM7/YtYpsot1u2FbiYAiUjlba2sQUCn3g7Pd8D+Qv Hk7LCeC2G2CKD8IvTpWSh+gnlfQrJWDwsn/RETkozvl+SexVwnb6IeURORaavmRQ4NGn N/Gwk72zYJYkHtOtMZknieoNfskXSFbBEay024wkUCWAURjKo4p1Rxv7U5sbXwAqXEJx HFGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784119822; x=1784724622; 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=bz/T7W3ofqiKO6uuCg8rzvGuRQTBtkTYjUum+zV4WC4=; b=QFqF+c5ScMrbNG6YmXiSC1oPsT76qgNEVFNxku9GwudsUi8YEQvB4vm+Bx65nUWU9h 6HRrOPzhKm2ahSBpQjJKagaKRXeQ1n/bKh9P41Ohv1L2MnaBbMCc3wWmIP52hBrInV42 pHuoKH0affKLlaAMktfenuKjO32pYhfUds1TyoHdk9ab2F2Bns11IXRa5ad6Py9dt2LC IO/LxDEEvDIQfrKek9Z9P0iUSSA7QCGo4pZW8uiF7nUj1MKBrQUGmKN9K2O1rpr+GM81 2X2F1uzFdu/VDZwZ8uprnXvbDZrV+qK3UvwOXScDGO2rHCO+VqTFfmx0ZprQdW/r72os tDpg== X-Forwarded-Encrypted: i=1; AHgh+Rp7nzkmrAnwHpoDQl7oNzbMhuMa8kU/jPLbgpWm+R0jutPAEG8JFQqBIF8ihh8lP9ifLL99e5U3YPn/RVY=@vger.kernel.org X-Gm-Message-State: AOJu0Yz/BjWt9rZ0WhIX9+i3bnYve8kJyp6ImSEMD/skTHXx2NdLCQ/L UJDp9xBS8C9kw2azt40m1Vjg8yO6hr6EJEHe33AKAPMUiG+S6YvfUvugl9HDRrBJ/HM= X-Gm-Gg: AfdE7cmDeKtxWrXHcmbHnfIoJjaL3I9QzGCk1hyC0C67RBk+/Ck22evtOoyO2oFGICb k7MnMSbNAtDuF8MNV0SCb9x0733s9gkgq837fiMTfYbEhXNE0qzlussZpIyJqhKh21gFmnMDsIy cyFpV96E/fr0obf9alhKuHGRptMdV9vqZUKjKyOYbmobI6xxGsLUA1ICamGTFlmOqmzH8iU45WI dfX5pNgWgm8rPDyYlxubj2UPCRKUK2rYu4e3KJQ+o0BAa2JCF0WOuM+kptvnDc+/maCxYfYICO0 vBk3bRNe6b5cJPxPIo0+qDvju+RVFtgqE75yIffjGQHD8O36eCldhCDf6O9u46bfmkeFh5j+ZlD VUceOS9giGkCAqtDx7L7BsaxQTHgQ4W+Q9lL2rBiy/xtmlXCbeaeCeL7+n9bu2dqLd0SJKKC/mm lHrPo2oIivPE24pJEkkw2Ww1PbQ1lhGYndBPz0EvBzFMFE/edyrQkmxQdd1Rdz/G8G5VtRlwh3H f1ripKRPyFkIg== X-Received: by 2002:ac2:4f09:0:b0:5ae:b764:3b9a with SMTP id 2adb3069b0e04-5b0236b253fmr5070457e87.46.1784119822174; Wed, 15 Jul 2026 05:50:22 -0700 (PDT) Received: from archlinux ([94.180.44.28]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b022fac999sm3404042e87.55.2026.07.15.05.50.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2026 05:50:21 -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 09/61] staging: rtl8723bs: remove unused set_csa_hdl function Date: Wed, 15 Jul 2026 19:47:37 +0700 Message-ID: <20260715124829.90290-10-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: quoted-printable Content-Type: text/plain; charset="utf-8" The function set_csa_hdl() always returns H2C_REJECTED and is not actively used. Replace its handler reference with NULL and remove the dead code and its declaration. Signed-off-by: Arsenii Pashchenko --- drivers/staging/rtl8723bs/core/rtw_cmd.c | 2 +- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 4 ---- drivers/staging/rtl8723bs/include/rtw_mlme_ext.h | 1 - 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_cmd.c b/drivers/staging/rtl= 8723bs/core/rtw_cmd.c index 0c8fb2754..9f1efbd25 100644 --- a/drivers/staging/rtl8723bs/core/rtw_cmd.c +++ b/drivers/staging/rtl8723bs/core/rtw_cmd.c @@ -149,7 +149,7 @@ static struct cmd_hdl wlancmds[] =3D { GEN_MLME_EXT_HANDLER(0, h2c_msg_hdl) /*58*/ GEN_MLME_EXT_HANDLER(sizeof(struct SetChannelPlan_param), set_chplan_hdl)= /*59*/ =20 - GEN_MLME_EXT_HANDLER(sizeof(struct SetChannelSwitch_param), set_csa_hdl) = /*60*/ + GEN_MLME_EXT_HANDLER(sizeof(struct SetChannelSwitch_param), NULL) /*60*/ GEN_MLME_EXT_HANDLER(sizeof(struct TDLSoption_param), tdls_hdl) /*61*/ GEN_MLME_EXT_HANDLER(0, chk_bmc_sleepq_hdl) /*62*/ GEN_MLME_EXT_HANDLER(sizeof(struct RunInThread_param), run_in_thread_hdl)= /*63*/ diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/stagin= g/rtl8723bs/core/rtw_mlme_ext.c index e1503b054..aca6111ff 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c @@ -5787,10 +5787,6 @@ u8 set_chplan_hdl(struct adapter *padapter, unsigned= char *pbuf) return H2C_SUCCESS; } =20 -u8 set_csa_hdl(struct adapter *padapter, unsigned char *pbuf) -{ - return H2C_REJECTED; -} =20 /* TDLS_ESTABLISHED : write RCR DATA BIT */ /* TDLS_CS_OFF : go back to the channel linked with AP, terminating chan= nel switch procedure */ diff --git a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h b/drivers/sta= ging/rtl8723bs/include/rtw_mlme_ext.h index 0f606357d..a0124eee5 100644 --- a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h +++ b/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h @@ -646,7 +646,6 @@ u8 chk_bmc_sleepq_hdl(struct adapter *padapter, unsigne= d char *pbuf); u8 tx_beacon_hdl(struct adapter *padapter, unsigned char *pbuf); u8 set_ch_hdl(struct adapter *padapter, u8 *pbuf); u8 set_chplan_hdl(struct adapter *padapter, unsigned char *pbuf); -u8 set_csa_hdl(struct adapter *padapter, unsigned char *pbuf); /* Kurt: Ha= ndling DFS channel switch announcement ie. */ u8 tdls_hdl(struct adapter *padapter, unsigned char *pbuf); u8 run_in_thread_hdl(struct adapter *padapter, u8 *pbuf); =20 --=20 2.55.0 From nobody Sat Jul 25 17:33:43 2026 Received: from mail-lj1-f170.google.com (mail-lj1-f170.google.com [209.85.208.170]) (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 2C71847CC8E for ; Wed, 15 Jul 2026 12:50:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119826; cv=none; b=kTubm9lSzNVJI+fKHrx6O/Ll7j6g1i+/2bfg5UiIQBIPJzfL+orOfMeAgU1XpFqsilBpmh5moQvocwLQagg1BHOyw8Pq21KlmK9dUHS5shhg3kRKNh5wt49jEw0v04XNamqRSeMvAx0RHQNDZiPNT8nHmD1zxRp7iTyhnJxQ65I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119826; c=relaxed/simple; bh=0ieRpVGnJH1hbut5BOon2lxp6nUsK/7oDWxKiwPwvzw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UOrsKcBDNa6S4T8VZ7w4LW7eyy89xIS7RECiuSVyMSGwaaAjE6M2syf/csS8cXYHOxOsGPl2VcCoxIZ/aLJYRF4u6SDsdAovfwP0yPbKnSzUsS0J4Uh0Yeun7ftu2QelCKUNj2+9RCbgXaW9CaHDBCDeWYi2PLSSmn5UvQrJ7H8= 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=pJABSeSG; arc=none smtp.client-ip=209.85.208.170 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="pJABSeSG" Received: by mail-lj1-f170.google.com with SMTP id 38308e7fff4ca-39dbe684115so1510471fa.1 for ; Wed, 15 Jul 2026 05:50:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784119823; x=1784724623; 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=qYkSuTtvbkyclIwWlOakYM6IekniQ0aLPxxWi4mmUSY=; b=pJABSeSGXcUtnwhUiEegMU/WPbnB1zyKClgoeUYtC2RBA56gcTY+XWvV3PwjB2plRC pT+R5l5jouKctJhspGSWR3KDHeg59JFhFsr2TOI+2KhbUCSuN32132TTUAk0wiWTAvdt hgjN8fgzhA7U+6fVRa6iHBwR+Gml0h6svNe9waO73V9ZTIRnV2rI2i9RjhOCttbqhS1m uv/UTtR9/BA97W6MG21Je0ofRuKTGA7cmWoNVf7hsyXARiLnT2NwZYhbD6B1Kl9nmgf4 mHQX3M96ptG6Axs9Of3EE9Cbwk1mfSIFs3KVq/SkcuHBodV8PrVDHKIxjylmbMeqkuOT qBsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784119823; x=1784724623; 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=qYkSuTtvbkyclIwWlOakYM6IekniQ0aLPxxWi4mmUSY=; b=LtVtF79gL0lyf8uYRJlxz2Xpz1LXf/tscT8e8jN/Xh+Zy20NYEXM17ZPmmzHVuA7ZX OIdNyDbt4bmqdrHPlnOn/bWSK0jB03O4iGXxhhDZ0DnpzZ5nJlfBJMq1lgUBKo5WNAw9 tY4czQuF2BZIsrgikbzY51pn0/ezFrh5H7KoAsoE0+/kxs7W96n6Il57YsK45ULiJ4oY 7Kn1hH/Q6pBXP2wRvYdib3d5bWXdXJrO8qMW4esKHY13VQcG17zfQmR0WcoQ3z0gQlYL 7juuOxYYezFlz+wcPJfkBe9CcNmhRYo6iViAf2UJHpQCswGq2yPOVl0yJi1dnQ3KJfAl ymTQ== X-Forwarded-Encrypted: i=1; AHgh+RrXJFCBEfPBtjcC6fcx5VD0QcgG7+84W023rBUW6yrg74774tGU+1fHYQjeKJ+6lWmPbpRTSHDONi9Zv/Q=@vger.kernel.org X-Gm-Message-State: AOJu0Yymmf+MBcZMHRc75524Ev3N7epKtXwawQJCsmMW3v+jkKm6PA2j DBGEIrCemjm0fHrXk73X4rxH3Z1zW3IwfiUych22KLeFdYEHao5tHbqF X-Gm-Gg: AfdE7ckOhXmt/sUrmpR+FH2g8EOkwzNK6qbGJolPTyvKb0QHSBcv24O/pgLMdJcA5yU R7ZLscy8nPAtpLKY+AvMbO3URn6B5TWmnlzSak8JDcWzrND531g4xia8I8akpk0oj87P4KG3OgM oZomeeaV1laFAbLHX1mYEMTe0Iwi28leahMWYwhOxb2pzxSh/Iqb5gfTvaSfjN5zq6WGBiY6KEZ 85ypyTilJ6+ptIpCZ549Bg3LhzlyrMdanYjJc+hmpYXpSmk7R7j1qW1ZoUR8hUM2UejmQ+5Sskk vjSJCUzl5fFk2Jim7/813wNTtu4KLrqsk9wf0XT0bnWORKBY4aOBJlCHnpvXr1QyAb7AoIcScC8 JtKuTRbZccJDxzrpAjqsMBqoIxhVb9i9xhRnfHgj9XtSXYxICsV7GKEhxL/GQaBzFjQ7zkTAISJ ydWLUrtL0nJnMbeE+h1jifswq3+vaQR+MTMd0PL81yoZ67aEjlGf2gIVqSRALUiGtVLXXInnCTX oiautIlHatlPQ== X-Received: by 2002:a05:6512:1324:b0:5b0:149a:9870 with SMTP id 2adb3069b0e04-5b02ba1e7b5mr3519941e87.18.1784119822958; Wed, 15 Jul 2026 05:50:22 -0700 (PDT) Received: from archlinux ([94.180.44.28]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b022fac999sm3404042e87.55.2026.07.15.05.50.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2026 05:50:22 -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 10/61] staging: rtl8723bs: remove unused tdls_hdl function Date: Wed, 15 Jul 2026 19:47:38 +0700 Message-ID: <20260715124829.90290-11-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: quoted-printable Content-Type: text/plain; charset="utf-8" The function tdls_hdl() always returns H2C_REJECTED and is not actively used. Replace its handler reference with NULL and remove the dead code and its declaration. Signed-off-by: Arsenii Pashchenko --- drivers/staging/rtl8723bs/core/rtw_cmd.c | 2 +- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 5 +---- drivers/staging/rtl8723bs/include/rtw_mlme_ext.h | 1 - 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_cmd.c b/drivers/staging/rtl= 8723bs/core/rtw_cmd.c index 9f1efbd25..d2c6d48a8 100644 --- a/drivers/staging/rtl8723bs/core/rtw_cmd.c +++ b/drivers/staging/rtl8723bs/core/rtw_cmd.c @@ -150,7 +150,7 @@ static struct cmd_hdl wlancmds[] =3D { GEN_MLME_EXT_HANDLER(sizeof(struct SetChannelPlan_param), set_chplan_hdl)= /*59*/ =20 GEN_MLME_EXT_HANDLER(sizeof(struct SetChannelSwitch_param), NULL) /*60*/ - GEN_MLME_EXT_HANDLER(sizeof(struct TDLSoption_param), tdls_hdl) /*61*/ + GEN_MLME_EXT_HANDLER(sizeof(struct TDLSoption_param), NULL) /*61*/ GEN_MLME_EXT_HANDLER(0, chk_bmc_sleepq_hdl) /*62*/ GEN_MLME_EXT_HANDLER(sizeof(struct RunInThread_param), run_in_thread_hdl)= /*63*/ }; diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/stagin= g/rtl8723bs/core/rtw_mlme_ext.c index aca6111ff..7f101adcc 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c @@ -5799,10 +5799,7 @@ u8 set_chplan_hdl(struct adapter *padapter, unsigned= char *pbuf) /* TDLS_P_BASE_CH : periodically go back to base channel */ /* TDLS_RS_RCR : restore RCR */ /* TDLS_TEAR_STA : free tdls sta */ -u8 tdls_hdl(struct adapter *padapter, unsigned char *pbuf) -{ - return H2C_REJECTED; -} + =20 u8 run_in_thread_hdl(struct adapter *padapter, u8 *pbuf) { diff --git a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h b/drivers/sta= ging/rtl8723bs/include/rtw_mlme_ext.h index a0124eee5..09f4d66cc 100644 --- a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h +++ b/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h @@ -646,7 +646,6 @@ u8 chk_bmc_sleepq_hdl(struct adapter *padapter, unsigne= d char *pbuf); u8 tx_beacon_hdl(struct adapter *padapter, unsigned char *pbuf); u8 set_ch_hdl(struct adapter *padapter, u8 *pbuf); u8 set_chplan_hdl(struct adapter *padapter, unsigned char *pbuf); -u8 tdls_hdl(struct adapter *padapter, unsigned char *pbuf); u8 run_in_thread_hdl(struct adapter *padapter, u8 *pbuf); =20 =20 --=20 2.55.0 From nobody Sat Jul 25 17:33:43 2026 Received: from mail-lf1-f49.google.com (mail-lf1-f49.google.com [209.85.167.49]) (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 D224B448CF7 for ; Wed, 15 Jul 2026 12:50:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119827; cv=none; b=Meo2UgvJ3CL7l8ox4xQNlQvR51OT7gv/QOqF2Ixo6+T0KwOt33Wa2S/DWbtJgDY2Yls4PY4UWxVwx5EYD9A047h9etTPHq2M82TnONxPFBA7H7E7pm7/pgfeuDyFnA49WcJWWfV1WIDeavrBLpEhIt4R5NB4DsYvUwHGqDV2oZQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119827; c=relaxed/simple; bh=k0/H6otJQUDF2ERjuTicWjtdotROQboPv9m77nv38rA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AxPzchBTFNzRxRnxcjfugiHNU37ECAbre46L0aYv0h/POA4vfJ/+Uw7J+r2e3RkX83aysR4D2Mp0TXlms+RpjPc9E0ikb0Vz/IM70L0iexfmeAPNfitcjEllm21sTki6x0BegkeW6Pnw2DPGuQ+McYpFwly4Xa8StKf/65fAbUQ= 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=jvDZ5JH+; arc=none smtp.client-ip=209.85.167.49 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="jvDZ5JH+" Received: by mail-lf1-f49.google.com with SMTP id 2adb3069b0e04-5aea0fff535so2260059e87.3 for ; Wed, 15 Jul 2026 05:50:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784119824; x=1784724624; 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=1Tr2rTsiJ7MExYH/1GXMBrNyd5k3uSTVOlRj9QPU1As=; b=jvDZ5JH+Q7e8vqOt4OiU20Kl7+yj2p8rRgtkvcAF59HEQ+cGj6UsJcdaGRQRBFYbkE hrXaq89ylFE1AsLCzv/p5O7unXxsWkFneLoxm09SHIG1TZk9uJUOz7gfosB8Fk2W9XaA Wxt6yEWF92z4X7E5MCcmOHUFUfAEdXPZSR+IFlYEpgt5KoJf77ha0pwoodiGdp9Rg96q Apgdvw6O4MsIWMSyDOqyXNatA0mMKPGBtOjqRkUqU0qgCVEHhGuMW0cdMRBnjHJG9Iqu xO9j2i99cHDdsf7l2vLToGwyg4CbXQyDClPEFjl/daTJUOiPPAzzORmVoOvvrRoouOeh Yk+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784119824; x=1784724624; 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=1Tr2rTsiJ7MExYH/1GXMBrNyd5k3uSTVOlRj9QPU1As=; b=UqpIt7rxJ3wPE2xP42lL55Cb2aRM7oqCTJdsq5i4QPaQiqL7NVeYXMHYZZn6UTrvPG RIgl4sMNZv2vgXyEwy+HWV7frUXuy3J8i0O11dUzOxtjwtEM3kBqt4p+sqtbKIU+CiYz RNFzfaRoUdIdhwWjUyYkLaVyvpaXjGwCo8Mb8lfmmcRRxEy8x7Lt7Qrg6y0bcDKCXSV0 r5UMOxAaEEC/C5U4ak68YIBsEGE0AoPBkhRG0fJmX3lckciJnlfISkM/DcehNIeu2kWn 8JMObb0wHQ31jgpeWJgiANgLbf1Qv0KcJSFncJgQN9Lq6jiLgvnxrX73R7t0hP9R1uWj Uh6g== X-Forwarded-Encrypted: i=1; AHgh+Robxk3pTQHJTAHfJE2t4ij7p/mj46HBr3Azsb/nB/JZ2HBFvTASsZr1HpF7JrVp2WSDqLICsalQgvw/1MI=@vger.kernel.org X-Gm-Message-State: AOJu0Yygxc/piRHm55h+MCdZ7V3fIbewCWxuFhestKg4Y0zUxF84iOFO 4eFKM5LAhUxtjcxN9meSDB2Vm2VOJua4ceGVp7f3nptpWPkz1+q9/Y54 X-Gm-Gg: AfdE7cmv5A/9sgqQaMYL3GuV0cWuSM/Kl9rNVZQB2A+I99qA66cOk8WaUNkEoeahb1v 11ifUB276e5Um+jqcmwGlgTnFihUSnqiYLhg1S/Nu2xlUOgBNAu2ie+68PW6J3qm8j872R+obRi LAI4GHn8KUv1KANSmRe81I7sSXWAYvuCzHBRcPXATwqmhqMbiLayjUk18n6GI77EFy7bMw7AFN6 esdnLpW1rw80nGezoTzae1r+dK0i29ExazTt1Rri6RusUvBEqw0WhK0gQCKASvtt1o+CJA3jPVn 8AR3PUSmXUT2d4bexEbR/rEN69ToBgqN4EJqrQKu95bvxbqrTzRriE2xRoRqnwphGu/TpcdulFL iHcYbS3EarkQ8PCTY2e0mrUFq46AgnxD8AQRkTQJ0JMCV7oQ1uTPmXI9mhhECYvreOHYnK0dfln IrZY5c7Eku6XGu5yBjOl6VnOTD9NgRu6LdSis62IA0eXTE7I4OZAoQ72568D1iMskTOp+y3r4N9 XGVKy1SCEx4wg== X-Received: by 2002:ac2:5328:0:b0:5ae:ae6f:1c4b with SMTP id 2adb3069b0e04-5b0236677a3mr2998836e87.25.1784119823781; Wed, 15 Jul 2026 05:50:23 -0700 (PDT) Received: from archlinux ([94.180.44.28]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b022fac999sm3404042e87.55.2026.07.15.05.50.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2026 05:50:23 -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 11/61] staging: rtl8723bs: inline rtw_ps_deny_get() and remove dead code Date: Wed, 15 Jul 2026 19:47:39 +0700 Message-ID: <20260715124829.90290-12-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: quoted-printable Content-Type: text/plain; charset="utf-8" The function rtw_ps_deny_get() is a simple wrapper that returns the ps_deny value. Replace its sole usage with direct access to the structure member under the pwrctrl lock. Then, remove the now unused function, its warning comment, and its declaration. Signed-off-by: Arsenii Pashchenko --- drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 12 +----------- drivers/staging/rtl8723bs/include/rtw_pwrctrl.h | 1 - 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c b/drivers/staging= /rtl8723bs/core/rtw_pwrctrl.c index b9f8cf101..1d6fe3734 100644 --- a/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c +++ b/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c @@ -139,7 +139,7 @@ void rtw_ps_processor(struct adapter *padapter) u32 ps_deny =3D 0; =20 mutex_lock(&adapter_to_pwrctl(padapter)->lock); - ps_deny =3D rtw_ps_deny_get(padapter); + ps_deny =3D adapter_to_pwrctl(padapter)->ps_deny; mutex_unlock(&adapter_to_pwrctl(padapter)->lock); if (ps_deny !=3D 0) goto exit; @@ -1133,13 +1133,3 @@ void rtw_ps_deny_cancel(struct adapter *padapter, en= um ps_deny_reason reason) pwrpriv->ps_deny &=3D ~BIT(reason); mutex_unlock(&pwrpriv->lock); } - -/* - * ATTENTION: - *Before calling this function pwrctrl lock should be occupied already, - *otherwise it may return incorrect value. - */ -u32 rtw_ps_deny_get(struct adapter *padapter) -{ - return adapter_to_pwrctl(padapter)->ps_deny; -} diff --git a/drivers/staging/rtl8723bs/include/rtw_pwrctrl.h b/drivers/stag= ing/rtl8723bs/include/rtw_pwrctrl.h index 6977892a5..9b6c42e4f 100644 --- a/drivers/staging/rtl8723bs/include/rtw_pwrctrl.h +++ b/drivers/staging/rtl8723bs/include/rtw_pwrctrl.h @@ -249,6 +249,5 @@ int rtw_pm_set_lps(struct adapter *padapter, u8 mode); =20 void rtw_ps_deny(struct adapter *padapter, enum ps_deny_reason reason); void rtw_ps_deny_cancel(struct adapter *padapter, enum ps_deny_reason reas= on); -u32 rtw_ps_deny_get(struct adapter *padapter); =20 #endif /* __RTL871X_PWRCTRL_H_ */ --=20 2.55.0 From nobody Sat Jul 25 17:33:43 2026 Received: from mail-lf1-f42.google.com (mail-lf1-f42.google.com [209.85.167.42]) (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 AA65B4611CF for ; Wed, 15 Jul 2026 12:50:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119828; cv=none; b=Y2lrxEkbWdbfCG2xpD7bjusWpSXByOJHPioladvWx4BbViwxQ/KZSBfUaO01BCJrngZFoIfBFQq3woDg87T559k2V1GatqY/L69aYa7ZzsdW5oPtVE1KSr0KYChY8mtIlujMLg3/CA5x8wxBgRw50+FD6HOGp11jCCMUkWqhvhU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119828; c=relaxed/simple; bh=NOu+QKY6jsX2LnO+iETScrif+QOXGjEILuQoLxRWFUs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Nvu2RPLER+o6BOnkTJxzI4+3Ir+HDMAzkxK3wESBCg/k67hx3UWvTVT2NEvW3+WooFOjdjpBEKIuyYrnfhVOagb1RjHSaWTpdn67Ynz+Id77x7okTAS7HlpGjsw0OA0sCvEx6W575cVkEykpnuEIQqo3SvtAVTyYG0rSAHu7ZrE= 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=VmtnJHoq; arc=none smtp.client-ip=209.85.167.42 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="VmtnJHoq" Received: by mail-lf1-f42.google.com with SMTP id 2adb3069b0e04-5b00d1e7082so4097667e87.1 for ; Wed, 15 Jul 2026 05:50:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784119825; x=1784724625; 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=ZEnR8SqaeKZjrKQV+NuifoqLhEKS4MdSPiq8mhVLsXU=; b=VmtnJHoqpmvd4f6reCEGDFzuwrr+1BF+yyieiVAqONwgo5NAnRQOpX72gty8F08wLq pvR2l1OAzvAQugJ6gbu29JpO5+Tad3KrH7//sJVic7zrNYS85Ag1v7ZDN6KBLUgZ6UiB R0yHukfD7FKxvQXSVfguKeYAZXEPq3eHLpQ9BHE4Vx7LBBNurtIDPzW0hCa6Lx/lIp7O z6p30jqeKD8UIAjvLTswrDS0Y8xfERr6ZMAzDkGcwWK6NkdnVRShGJEk6AGISZWoVoFV qpN6ukyIDF7sIp/JSQqyVGDc9Z3L433Rb9ukIjv9Tps9kIMVXaRuliEJ8+U4feuFgynX r0kg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784119825; x=1784724625; 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=ZEnR8SqaeKZjrKQV+NuifoqLhEKS4MdSPiq8mhVLsXU=; b=L+KMsn4ePog9QF1H+UFbR51grspOKp2bdWCCDD0A+DCj9vd/bdSXlfOjhAujEYqrYt 5pSQJPIFgy0qMnhhf4n9UyZ6l2PySYsn8SezZeZU4phvBwWSdDKncmmCCV3lCpYtqqsW YObySMGV8K1Pe5HG++CHVMg7gIpqFYlwJEQSABgjqfvml2PdwEetxGNhX97nRcy0ORt7 EpqMIO1FeLEuQU/8jDcVQ3f+RUvn3F2N9G5Nba8h3P3ZcjEwMKLYlBHCmRBQn+U17yDp E3sAuEILBmcGsByaXGPIxX6AsSxsYILzGwhdGQFEYRRNwqFqGFl9wVuDikyJjC5QtpGX WqyA== X-Forwarded-Encrypted: i=1; AHgh+Ro4Frob5klCrBtviFLDogWLu/mR9ZMtEIdnFEQq5C65+cwChn9VleCV7lBCA4qwd/GBbrw2JCaB1WvS5gM=@vger.kernel.org X-Gm-Message-State: AOJu0Yx+LMo8VQoYp6+yLokEFAzANmB2sTRS3mV2e2rTjDOlHmNfPoFb GyTnDRJleye2u1q/2OFdcLZB9omBYF9x8qGvLhqy+5nha1WuSSMrKQRDk5lToSXJbZQ= X-Gm-Gg: AfdE7cl99YmXC0jBih/iwkl+BQBuZnbXu+SzGa1zIebqZVZ24aqNmMHthh42Zw9igBZ 3HjEEmeHnllBFhB29YYjwBZFc6Ns8EoynvWEvmFEGH1ZCVDXDjvLDBrgl6FExrWMCdiVYYoaVOi Y84aPjEfSUXrltRjHkyB+UyTc2E7cBP615psNkJ4drfL8DEqfKKKRkc5+iwh5l6F+7Z6xVD3wBU uHpPQZK9C3Lykxmso8bRozb+eCtU8ga5pXEOG659LGorA6Gwqb7ysiSP3u/4CPWeICTx/TM88Wn UnLyuqFm87NfnBJU4Gt+4CLEXpxz9/dMqREkeandl0i4Usu/W7BVHxUolSLV2DACI6zbsAETySm d+vVQ7jc+f1RoLi8jr7k4juOo+sHfSbgTvCnvdIiC9cBssWYm6PVwoAqD0kwHivXmNUXI6LGnmK RpJwCuilxR+y9fnLqYIzGYw8ne3FJAwOMSTGGqwzJ4/GUxum/G7VfNtCsJNqJHERq7nAX3++fOg Bb8GbkwNUjk4Q== X-Received: by 2002:a05:6512:3414:b0:5ae:bf95:38e7 with SMTP id 2adb3069b0e04-5b159b6abddmr1397925e87.10.1784119824588; Wed, 15 Jul 2026 05:50:24 -0700 (PDT) Received: from archlinux ([94.180.44.28]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b022fac999sm3404042e87.55.2026.07.15.05.50.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2026 05:50:24 -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 12/61] staging: rtl8723bs: replace custom CMAC with kernel Crypto API helper Date: Wed, 15 Jul 2026 19:47:40 +0700 Message-ID: <20260715124829.90290-13-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: quoted-printable Content-Type: text/plain; charset="utf-8" Introduce rtw_bip_cmac() as a wrapper around the kernel Crypto API "cmac(aes)" to handle 802.11w BIP MIC calculation. Convert both callers to use this new helper function. This allows complete removal of the custom, duplicated implementations of omac1_aes_128() and omac1_aes_128_vector(), along with the now unused gf_mulx() helper, significantly cleaning up the driver code. Signed-off-by: Arsenii Pashchenko --- drivers/staging/rtl8723bs/core/rtw_security.c | 114 +++--------------- drivers/staging/rtl8723bs/core/rtw_xmit.c | 3 +- .../staging/rtl8723bs/include/rtw_security.h | 2 +- 3 files changed, 18 insertions(+), 101 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_security.c b/drivers/stagin= g/rtl8723bs/core/rtw_security.c index 0cfd7734c..a4a4f0e6d 100644 --- a/drivers/staging/rtl8723bs/core/rtw_security.c +++ b/drivers/staging/rtl8723bs/core/rtw_security.c @@ -9,6 +9,7 @@ #include #include #include +#include =20 static const char * const _security_type_str[] =3D { "N/A", @@ -1315,7 +1316,8 @@ u32 rtw_BIP_verify(struct adapter *padapter, u8 *prec= vframe) /* conscruct AAD, copy address 1 to address 3 */ memcpy(BIP_AAD + 2, &pwlanhdr->addrs, sizeof(pwlanhdr->addrs)); =20 - if (omac1_aes_128(padapter->securitypriv.dot11wBIPKey[padapter->security= priv.dot11wBIPKeyid].skey + if (rtw_bip_cmac( + padapter->securitypriv.dot11wBIPKey[padapter->securitypriv.dot11wBIPKeyi= d].skey , BIP_AAD, ori_len, mic)) goto BIP_exit; =20 @@ -1335,109 +1337,23 @@ u32 rtw_BIP_verify(struct adapter *padapter, u8 *p= recvframe) return res; } =20 -static void gf_mulx(u8 *pad) -{ - int i, carry; - - carry =3D pad[0] & 0x80; - for (i =3D 0; i < AES_BLOCK_SIZE - 1; i++) - pad[i] =3D (pad[i] << 1) | (pad[i + 1] >> 7); =20 - pad[AES_BLOCK_SIZE - 1] <<=3D 1; - if (carry) - pad[AES_BLOCK_SIZE - 1] ^=3D 0x87; -} - -/** - * omac1_aes_128_vector - One-Key CBC MAC (OMAC1) hash with AES-128 - * @key: 128-bit key for the hash operation - * @num_elem: Number of elements in the data vector - * @addr: Pointers to the data areas - * @len: Lengths of the data blocks - * @mac: Buffer for MAC (128 bits, i.e., 16 bytes) - * Returns: 0 on success, -1 on failure - * - * This is a mode for using block cipher (AES in this case) for authentica= tion. - * OMAC1 was standardized with the name CMAC by NIST in a Special Publicat= ion - * (SP) 800-38B. - */ -static int omac1_aes_128_vector(u8 *key, size_t num_elem, - u8 *addr[], size_t *len, u8 *mac) +int rtw_bip_cmac(u8 *key, u8 *data, size_t data_len, u8 *mac) { - struct aes_enckey aes; - u8 cbc[AES_BLOCK_SIZE], pad[AES_BLOCK_SIZE]; - u8 *pos, *end; - size_t i, e, left, total_len; - int ret; - - ret =3D aes_prepareenckey(&aes, key, 16); - if (ret) - return -1; - memset(cbc, 0, AES_BLOCK_SIZE); - - total_len =3D 0; - for (e =3D 0; e < num_elem; e++) - total_len +=3D len[e]; - left =3D total_len; - - e =3D 0; - pos =3D addr[0]; - end =3D pos + len[0]; - - while (left >=3D AES_BLOCK_SIZE) { - for (i =3D 0; i < AES_BLOCK_SIZE; i++) { - cbc[i] ^=3D *pos++; - if (pos >=3D end) { - e++; - pos =3D addr[e]; - end =3D pos + len[e]; - } - } - if (left > AES_BLOCK_SIZE) - aes_encrypt(&aes, cbc, cbc); - left -=3D AES_BLOCK_SIZE; - } + struct crypto_shash *tfm; + int err; =20 - memset(pad, 0, AES_BLOCK_SIZE); - aes_encrypt(&aes, pad, pad); - gf_mulx(pad); - - if (left || total_len =3D=3D 0) { - for (i =3D 0; i < left; i++) { - cbc[i] ^=3D *pos++; - if (pos >=3D end) { - e++; - pos =3D addr[e]; - end =3D pos + len[e]; - } - } - cbc[left] ^=3D 0x80; - gf_mulx(pad); - } + tfm =3D crypto_alloc_shash("cmac(aes)", 0, 0); + if (IS_ERR(tfm)) + return PTR_ERR(tfm); =20 - for (i =3D 0; i < AES_BLOCK_SIZE; i++) - pad[i] ^=3D cbc[i]; - aes_encrypt(&aes, pad, mac); - memzero_explicit(&aes, sizeof(aes)); - return 0; -} + err =3D crypto_shash_setkey(tfm, key, 16); + if (err) { + crypto_free_shash(tfm); + return err; + } =20 -/** - * omac1_aes_128 - One-Key CBC MAC (OMAC1) hash with AES-128 (aka AES-CMAC) - * @key: 128-bit key for the hash operation - * @data: Data buffer for which a MAC is determined - * @data_len: Length of data buffer in bytes - * @mac: Buffer for MAC (128 bits, i.e., 16 bytes) - * Returns: 0 on success, -1 on failure - * - * This is a mode for using block cipher (AES in this case) for authentica= tion. - * OMAC1 was standardized with the name CMAC by NIST in a Special Publicat= ion - * (SP) 800-38B. - * modify for CONFIG_IEEE80211W - */ -int omac1_aes_128(u8 *key, u8 *data, size_t data_len, u8 *mac) -{ - return omac1_aes_128_vector(key, 1, &data, &data_len, mac); + return crypto_shash_tfm_digest(tfm, data, data_len, mac); } =20 /* Restore HW wep key setting according to key_mask */ diff --git a/drivers/staging/rtl8723bs/core/rtw_xmit.c b/drivers/staging/rt= l8723bs/core/rtw_xmit.c index 444966c0d..fdda407c1 100644 --- a/drivers/staging/rtl8723bs/core/rtw_xmit.c +++ b/drivers/staging/rtl8723bs/core/rtw_xmit.c @@ -1283,7 +1283,8 @@ s32 rtw_mgmt_xmitframe_coalesce(struct adapter *padap= ter, struct sk_buff *pkt, s /* copy management fram body */ memcpy(BIP_AAD + BIP_AAD_SIZE, MGMT_body, frame_body_len); /* calculate mic */ - if (omac1_aes_128(padapter->securitypriv.dot11wBIPKey[padapter->security= priv.dot11wBIPKeyid].skey + if (rtw_bip_cmac( + padapter->securitypriv.dot11wBIPKey[padapter->securitypriv.dot11wBIPKeyi= d].skey , BIP_AAD, BIP_AAD_SIZE + frame_body_len, mic)) goto xmitframe_coalesce_fail; =20 diff --git a/drivers/staging/rtl8723bs/include/rtw_security.h b/drivers/sta= ging/rtl8723bs/include/rtw_security.h index 32f6d3a5e..22eec2215 100644 --- a/drivers/staging/rtl8723bs/include/rtw_security.h +++ b/drivers/staging/rtl8723bs/include/rtw_security.h @@ -243,7 +243,7 @@ struct mic_data { * public domain by Tom St Denis. */ =20 -int omac1_aes_128(u8 *key, u8 *data, size_t data_len, u8 *mac); +int rtw_bip_cmac(u8 *key, u8 *data, size_t data_len, u8 *mac); void rtw_secmicsetkey(struct mic_data *pmicdata, u8 *key); void rtw_secmicappendbyte(struct mic_data *pmicdata, u8 b); void rtw_secmicappend(struct mic_data *pmicdata, u8 *src, u32 nBytes); --=20 2.55.0 From nobody Sat Jul 25 17:33:43 2026 Received: from mail-lf1-f54.google.com (mail-lf1-f54.google.com [209.85.167.54]) (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 A1C5447DF99 for ; Wed, 15 Jul 2026 12:50:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119830; cv=none; b=cZcV/Y9QvKrCg3flMjB3kFql/FXCtmlRP464XPyofnVAR6onc+AfOW+0AQTcqAkMnQNHRHhqleSf0CpIFvekwVuPgkWtMu9swXlp+bqK6b3BX/GMiEAl9YqniEaTvnAuBM73qjDwCQNJkbvN1i+4iZLMbJT4Pm9vzwMjtOyV9wA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119830; c=relaxed/simple; bh=72E/hbanqpvo/ZErEhhCXMKRkmfLzb82Zf7mXsXYBnM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AdRa/rmzLpWdg9MqN7vV31Y5utFKwi272R18Z/2I4q/WbckVxw57igNfgVGXsiXfK7+jWSj98uH5A90COCHz78ws5lx6LdSkzqNcKnA//BBDP2lBUGa+MzX+nlPMlwymIldH63KMH3N4sLkDpn2UUR4/vd9c6TbrIvjsRsyI4sw= 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=IU+evgPl; arc=none smtp.client-ip=209.85.167.54 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="IU+evgPl" Received: by mail-lf1-f54.google.com with SMTP id 2adb3069b0e04-5aea9d606f0so5627302e87.3 for ; Wed, 15 Jul 2026 05:50:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784119825; x=1784724625; 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=utdjDfJg9k64qknof9MWQ7zmlARBSSUnC6hD0kTqV/Y=; b=IU+evgPldGX8gdPzRmJiMQEqXzqFgmdC1FDRi0Erx7XP5XO0SfsSvyP8MwLc13J43J jzbBXj/QXqXY1rYWd1ZPn5/2UO46MsWvXfADYcGsP6ljHyULf9wcewRNm1GlLU5MOPmv TP2YKde461g253SXjBv7lrGjCuMJ64vZIKmtMSIq6NDv9mTsPysDpaHiF+O76LkQ/EfB kVTNMvsFEbrVw298uhnkfNje82izu2jWDyHY63GVOYqxFypGC45aQigJzcguW25jFHHk VXR97SuJE7mO4ucukngbn3JsFL5kFnH/A8FAi4DQq6eFw5ibhI21zK8/zhcWf55GP5j1 kNNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784119825; x=1784724625; 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=utdjDfJg9k64qknof9MWQ7zmlARBSSUnC6hD0kTqV/Y=; b=U28yqsTdZU9wqiNJjlk5esDh9FNishBI7i8lnn7T6kXip7me+UFMxOFWLrEBcObGy4 ja5V2+2oTftmf5Y9MAy8G6nKFWZxpUiBoV6L4p/kPlWcvBzRwfvIPks8zUeCpl/Omlat pzcOiY2HqqdMb2bXYEY5dgGNdghXALvVTaR+P4JoY8RQCJP/iOYZySBn7Y3vPCqztCxj US5l+IVXQWgSJw2LWMnB/Fy5WICx/dC5FLdAtIrNr58TktTte1aEyx3I0cT52r2U53/V CdgcgW1jBLF4Gc/SbbipSfhXZBlLCokje+2I+EdM/5YqhFuvG+HOKlJxwkDLI6pmDZKN R52Q== X-Forwarded-Encrypted: i=1; AHgh+RqhmW2xolzN3nkAieXkaVI76D0hQMKCOKSRS9XxqgZ7dz2mPY+hFKW7UFjQqnPxQrMEisVzw+dSeF11tO8=@vger.kernel.org X-Gm-Message-State: AOJu0YyE4+nibPIY8jjxSBDGMtyUqidreskUFqKr+LMy8sN09x0khRvX 6RnDNtF6hURXIN3Om22mt2GPcn9ipTUHG2XFkbburUmzdBtjhi28ZtLRvichz5k/ttM= X-Gm-Gg: AfdE7cnX0Ndw3OerEmN7pavooxAey3Uz7pUtH64skQfslstt1RSVJGOPSawJtO1bVjv REXCqmAfbPgi06C/9gS1pIjmuWA3PF4KbG/d3JeGgRfKk7S6ygmof7aMhOr/AL6SFrKyhcdqI52 J8c1fjqy1z3T2Kt8ScxdAt27Ga26T2ytRcyuZP7J7Dat8WpvbY9W8znhHHAm6gfJdtEGNcwUDoy o7Z4jwgc58l0fTP8LoMjSRUhfE2zd493wntEaRhuRvOjcKmcu18W/vyAYE2z2/pL3sGcDEeQCb5 cFuHD3Rs9k7eG1qKG3j3iwd6Xm6FWNiy7ZVlhWFuyzjvzoYjubrRXL88AxWtkNzn7T4Y+KA/CIO 5HoeeHvql79gxrZLDxGRwXl3uwhJlzvqtcl9k5RvXAtVUpFV//IoyC3ODqk1mfEA0/OosEcgxAd oOjnA20WXQ7nMpVLDddC6FvtgYQPIkBKo7w/Qvxzt22ihprmfoWHtUmo7H80a9JdpJtOXklYUKv pwvl75f75FFIw== X-Received: by 2002:a05:6512:3c8a:b0:5b1:5738:4d9e with SMTP id 2adb3069b0e04-5b15d7cbffcmr592857e87.65.1784119825410; Wed, 15 Jul 2026 05:50:25 -0700 (PDT) Received: from archlinux ([94.180.44.28]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b022fac999sm3404042e87.55.2026.07.15.05.50.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2026 05:50:25 -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 13/61] staging: rtl8723bs: remove redundant rtw_get_oper_ch() wrapper Date: Wed, 15 Jul 2026 19:47:41 +0700 Message-ID: <20260715124829.90290-14-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: quoted-printable Content-Type: text/plain; charset="utf-8" Remove the rtw_get_oper_ch() helper function since it is just a plain one-line wrapper around adapter_to_dvobj(adapter)->oper_channel. Replace all 6 occurrences across the driver with direct access to the structure member through the adapter_to_dvobj() macro. This simplifies the code, flattens the driver structure, and removes dead boilerplates. Signed-off-by: Arsenii Pashchenko --- drivers/staging/rtl8723bs/core/rtw_ap.c | 4 ++-- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 4 ++-- drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 5 +---- drivers/staging/rtl8723bs/include/rtw_mlme_ext.h | 1 - drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 6 +++--- 5 files changed, 8 insertions(+), 12 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_ap.c b/drivers/staging/rtl8= 723bs/core/rtw_ap.c index 274d99e6a..c8f0beec0 100644 --- a/drivers/staging/rtl8723bs/core/rtw_ap.c +++ b/drivers/staging/rtl8723bs/core/rtw_ap.c @@ -267,8 +267,8 @@ void expire_timeout_chk(struct adapter *padapter) struct mlme_ext_priv *pmlmeext =3D &padapter->mlmeextpriv; =20 /* switch to correct channel of current network before issue keep-alive= frames */ - if (rtw_get_oper_ch(padapter) !=3D pmlmeext->cur_channel) { - backup_oper_channel =3D rtw_get_oper_ch(padapter); + if (adapter_to_dvobj(padapter)->oper_channel !=3D pmlmeext->cur_channel)= { + backup_oper_channel =3D adapter_to_dvobj(padapter)->oper_channel; r8723bs_select_channel(padapter, pmlmeext->cur_channel); } =20 diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/stagin= g/rtl8723bs/core/rtw_mlme_ext.c index 7f101adcc..064c9923d 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c @@ -3869,7 +3869,7 @@ u8 collect_bss_info(struct adapter *padapter, union r= ecv_frame *precv_frame, str =20 bssid->configuration.ds_config =3D HT_info->primary_channel; } else { /* use current channel */ - bssid->configuration.ds_config =3D rtw_get_oper_ch(padapter); + bssid->configuration.ds_config =3D adapter_to_dvobj(padapter)->oper_cha= nnel; } } =20 @@ -3910,7 +3910,7 @@ u8 collect_bss_info(struct adapter *padapter, union r= ecv_frame *precv_frame, str } =20 /* mark bss info receiving from nearby channel as signal_quality 101 */ - if (bssid->configuration.ds_config !=3D rtw_get_oper_ch(padapter)) + if (bssid->configuration.ds_config !=3D adapter_to_dvobj(padapter)->oper_= channel) bssid->phy_info.signal_quality =3D 101; =20 return _SUCCESS; diff --git a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c b/drivers/stagi= ng/rtl8723bs/core/rtw_wlan_util.c index 1d37c2d5b..f610fa5b3 100644 --- a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c +++ b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c @@ -247,10 +247,7 @@ void set_msr(struct adapter *padapter, u8 type) rtw_hal_set_hwreg(padapter, HW_VAR_MEDIA_STATUS, (u8 *)(&type)); } =20 -inline u8 rtw_get_oper_ch(struct adapter *adapter) -{ - return adapter_to_dvobj(adapter)->oper_channel; -} + =20 inline void rtw_set_oper_ch(struct adapter *adapter, u8 ch) { diff --git a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h b/drivers/sta= ging/rtl8723bs/include/rtw_mlme_ext.h index 09f4d66cc..e949f5efd 100644 --- a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h +++ b/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h @@ -439,7 +439,6 @@ void Switch_DM_Func(struct adapter *padapter, u32 mode,= u8 enable); =20 void set_msr(struct adapter *padapter, u8 type); =20 -u8 rtw_get_oper_ch(struct adapter *adapter); void rtw_set_oper_ch(struct adapter *adapter, u8 ch); void rtw_set_oper_bw(struct adapter *adapter, u8 bw); void rtw_set_oper_choffset(struct adapter *adapter, u8 offset); diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c b/drivers/st= aging/rtl8723bs/os_dep/ioctl_cfg80211.c index 397440af8..a71eb008f 100644 --- a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +++ b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c @@ -1978,7 +1978,7 @@ static int cfg80211_rtw_get_channel(struct wiphy *wip= hy, struct wireless_dev *wd if (!adapter->rtw_wdev) return -ENODEV; =20 - channel =3D rtw_get_oper_ch(adapter); + channel =3D adapter_to_dvobj(adapter)->oper_channel; if (!channel) return -ENODATA; =20 @@ -2452,7 +2452,7 @@ void rtw_cfg80211_rx_action(struct adapter *adapter, = u8 *frame, uint frame_len, int channel; u8 category, action; =20 - channel =3D rtw_get_oper_ch(adapter); + channel =3D adapter_to_dvobj(adapter)->oper_channel; =20 rtw_action_frame_parse(frame, frame_len, &category, &action); =20 @@ -2475,7 +2475,7 @@ static int _cfg80211_rtw_mgmt_tx(struct adapter *pada= pter, u8 tx_ch, const u8 *b rtw_set_scan_deny(padapter, 1000); =20 rtw_scan_abort(padapter); - if (tx_ch !=3D rtw_get_oper_ch(padapter)) { + if (tx_ch !=3D adapter_to_dvobj(padapter)->oper_channel) { if (!check_fwstate(&padapter->mlmepriv, _FW_LINKED)) pmlmeext->cur_channel =3D tx_ch; set_channel_bwmode(padapter, tx_ch, HAL_PRIME_CHNL_OFFSET_DONT_CARE, CHA= NNEL_WIDTH_20); --=20 2.55.0 From nobody Sat Jul 25 17:33:43 2026 Received: from mail-lf1-f42.google.com (mail-lf1-f42.google.com [209.85.167.42]) (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 7099944683F for ; Wed, 15 Jul 2026 12:50:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119830; cv=none; b=ICS6d82bdwVk9xr9XzJoyCZBg/w5FuAdpPiC5X/xaLd8gvBUMrAX2HEHxWZIY7I5aaeVTSVY1ZBVHZD44Rc7+UGKf4btbMLSnGhaLHRiY43QuPzu/rWZXF1064vzdkqYqasCMEU/ewSAPr/Vtf15S0mwRw+iolRBNdKl5CiTJEw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119830; c=relaxed/simple; bh=O4GCA9dncFpjvEFsosHxcw7KoGXzfJdJTyHWVOQIRVQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YuyN4vxFoZGDnvkkFrnlYsptUpjX8sAbLwVTkdrZVWgPkB0bq/RA8tGDLn4k3HgJ4NEI67GUzFDReFVwAyc1GxQpd6DChP7dc0eu30T9gnk0Zy/SeXQXWAImOwbLOFOjn9/f3lyI3AhGlAluYTXAFfotGcMsKI6w0p4jtRn59q4= 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=C/gSZhe6; arc=none smtp.client-ip=209.85.167.42 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="C/gSZhe6" Received: by mail-lf1-f42.google.com with SMTP id 2adb3069b0e04-5aec139da7eso2068553e87.1 for ; Wed, 15 Jul 2026 05:50:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784119826; x=1784724626; 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=1azHGGJy3K9uDsx0DgVKa5M1cFQOMhZnbWAiiL9xWBM=; b=C/gSZhe6fGr65TVNguQA7cS/kuOJuaNsjp04dYbu8JPyNvmXJzpvnsCfqzzqQSJuLp nwAJnUcRMFBMoSee0gWhRLtmMvLnSb71+u/pBbFeYVhc9fc81EH3HYSSPbkF6WQE7UJO 0QmK4gsKmrpiNmLIUXc/DkAQszCD3Ut2c0lzcygySsyeHMT86yqWEvquJ/fpPmmzZy6Z sVMBHFmezhA3mg2ZsOaQzi4+XfLmhiqIxB5RV2CvFoZCIJ/seYUJf5rNgqWlXsbR2/H4 4sDPAvZFaF2WD2HjH5erFw2MUni4XV1pIveSWQ2PKA73MDZKKcsTettaKpcTeRr4anV+ pdpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784119826; x=1784724626; 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=1azHGGJy3K9uDsx0DgVKa5M1cFQOMhZnbWAiiL9xWBM=; b=hWg9ov8t+9oiqWIVeX+eW+e6xkiap9zdQPsNtnQMbAuhbqGk+Sq2/O/HsxF2CaCkoW eXB2ikjg9QBXnLDtYUEdkpvElKHIKLSzbSrtQPWp+YdN4Z0m5zZ9E9p13wVNWVSUjjhF StaoRbxyLZ6t/+ld2RS8yMBSSlDz0BXsRtrxnp3Axge9dws832OguEu1IQmbzkJCGhF/ 4RZvMW9xYNLlqNh74Y/iLbnnsQEuH9z7EhxlAW3SlKvEuGVWvHNE4vZZPo9Bk4pbKFtB 9BmnHj/4scPu3xxJ92mb85jDhqr5kokzE6sPYTT2nsPsieLK4mrPLocfys9LFqMOqiR4 j3+A== X-Forwarded-Encrypted: i=1; AHgh+RpPRKQaHAwnDnag9w1v6Cpa6eeg3/gADensg1+uVOF5RDteDOxpt0hfFgzcqAdM8+Ywk4ePTOPgpxxN9Vs=@vger.kernel.org X-Gm-Message-State: AOJu0Yzo+/Tap/MbOchSrBO2S5YrgDDS46vSIoAovLnxpx3bvqqASJjM 7R9g1NvBO9lVZwnq7v9w92fQcib2qYX07bUIFjvw8LywzXLrSQ49GhNwWDaVjLkGk/U= X-Gm-Gg: AfdE7cmqykAXM3tisTTzG1q4FyTwlU80xmGs76GEVG95tW/x0P50n4GM6JPXetcObm0 S0bmyUGOODJkk0PizA4lsxZr7bl1V3aPxzjP9Nh95dsqGS986Q6XcghEb/+jlWJBZWUHUr+YBNw PwclnCpZPlR4MP4KzuEGMiHl0R8NkCHPT1SZLTAKs4iGYIQhHPM5MZkHcMVIZJfNEbEYLkcGUqG YVcNvCBDdW98Vu3wtUcRaqV8gyOqiegKB+HxFb94whyWnTaJi1B+2Q3d+r2shJWQv3yZgrYmzWZ 9y6L/EKTqdMstaWEm2MsQnNxYpMMK/VaPB2RQZn73zCJ4i/RSYUWeJJR/c0fdmaLusq5EWA0/G1 m0hRPkT3oJa7m6F/gc7Y8y6UCocmkSPdUTwOV+tKzQDf6/3ZUDwQBb/lBNIlkxIsb1hG5f18vwW 97ijHHRT/IsrVjZuRvLbBchar9K84IqMS8jJy34c1GdrT2U2K0XJtQgEsBaSZ+mU9FxaWLboK4R 6wCWfxUdQ92Cg== X-Received: by 2002:a05:6512:3182:b0:5b0:227d:cef9 with SMTP id 2adb3069b0e04-5b0227dd3ddmr4759402e87.3.1784119826203; Wed, 15 Jul 2026 05:50:26 -0700 (PDT) Received: from archlinux ([94.180.44.28]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b022fac999sm3404042e87.55.2026.07.15.05.50.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2026 05:50:25 -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 14/61] staging: rtl8723bs: remove ODM_CheckPowerStatus and dead branches Date: Wed, 15 Jul 2026 19:47:42 +0700 Message-ID: <20260715124829.90290-15-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: quoted-printable Content-Type: text/plain; charset="utf-8" Delete the dummy ODM_CheckPowerStatus function from HalPhyRf_8723B.c, which always unconditionally returned true. Since all of its call sites across the driver checked for the negative condition (!ODM_CheckPowerStatus), the corresponding if blocks were unreachable and never executed. Clean up the codebase by removing both the obsolete function itself and these dead conditional branches to reduce code bloat. Signed-off-by: Arsenii Pashchenko --- drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c b/drivers/stagi= ng/rtl8723bs/hal/HalPhyRf_8723B.c index 70b68f473..b77598287 100644 --- a/drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c +++ b/drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c @@ -1077,10 +1077,6 @@ void ODM_SetIQCbyRFpath(struct dm_odm_t *pDM_Odm, u3= 2 RFpath) } } =20 -static bool ODM_CheckPowerStatus(struct adapter *Adapter) -{ - return true; -} =20 static void _PHY_SaveADDARegisters8723B( struct adapter *padapter, @@ -1093,8 +1089,6 @@ static void _PHY_SaveADDARegisters8723B( struct hal_com_data *pHalData =3D GET_HAL_DATA(padapter); struct dm_odm_t *pDM_Odm =3D &pHalData->odmpriv; =20 - if (!ODM_CheckPowerStatus(padapter)) - return; =20 for (i =3D 0 ; i < RegisterNum ; i++) { ADDABackup[i] =3D PHY_QueryBBReg(pDM_Odm->Adapter, ADDAReg[i], bMaskDWor= d); @@ -1556,8 +1550,6 @@ void PHY_IQCalibrate_8723B( /* u32 Path_SEL_BB =3D 0; */ u32 GNT_BT_default; =20 - if (!ODM_CheckPowerStatus(padapter)) - return; =20 if (!(pDM_Odm->SupportAbility & ODM_RF_CALIBRATION)) return; --=20 2.55.0 From nobody Sat Jul 25 17:33:43 2026 Received: from mail-lf1-f50.google.com (mail-lf1-f50.google.com [209.85.167.50]) (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 1A12D47F2D8 for ; Wed, 15 Jul 2026 12:50:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119831; cv=none; b=nMa1CYX/rjYpbQWybbojTVFRCMx3x8PyeYIby3a8XMSgqa6iDF+gvwi9RtSJ2VOu/PtE/I6MrrX3ZY4VPDyTG+eN3NOZnjantl6iUazVpz67QNKcez9UOPEVGad9k1T9ZDZgAlEyRrBTCOkkmEQM7gzV/DqdpCppkIgt+dHQYa4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119831; c=relaxed/simple; bh=W6BRbQosy9+VJxJ2NnAs6tVHo69WH7Dj+Y1Gx+AlapE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pcR9QwM30GkutQ81l5bgH6K1Sf241Te6UBmnwUB6GifCs6NoeP8L1y5lfV9IgAxr9+iDi4EhkQQGdh/eEQvwZ3xASeH3tNBGafaaftPdW6irrO6aXXvQBzrKuZOXmGWue8sq0DsBymU2uQvN9z6XHsMykoo4ZINM4WMAKkyhzU8= 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=kFTfn1Jo; arc=none smtp.client-ip=209.85.167.50 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="kFTfn1Jo" Received: by mail-lf1-f50.google.com with SMTP id 2adb3069b0e04-5aec139da7eso2068566e87.1 for ; Wed, 15 Jul 2026 05:50:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784119827; x=1784724627; 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=5PFnaOg+lw5Xf9qwyUTIHf1OlvU0B0nTlj+WhmVz3kE=; b=kFTfn1JodkJVN/jeI6iLFBw3j3svJjuW+8JIGjspaD7KJ1248+MBmmZYlC1G752uQk gh1ulrDX5eOStSSf8d3o4de2LuS0iPsj5m1DblIhy4ohqTjyS2uJkB/+yrX8FDRZQUNe S5rKvqkBtHlvPeWY8k/d95nJKEge/2tdCPdkjtpKrwZQNtX9MKMzv3eCKe7cglDQCaLg DbBlG+xegFzSabKxNuRGupM6Gv1uhroLBIVTKVaSs/kmjrIbzdOVb0HwH8vYtJCqrP8k iayFLS6pGMY+eldq5SkQ2Kc3K4t0SlR19JKc/Mxi0UYhyhzmm103ayrvQWAEd2L5APbk LODg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784119827; x=1784724627; 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=5PFnaOg+lw5Xf9qwyUTIHf1OlvU0B0nTlj+WhmVz3kE=; b=KNXg8eZ7ViXzKHT16aKOsEKY0ypjruj3mLfmHkPexbK5ZJWhtvfoUmj0P8Jb16r2Zy v+MHmwXhaIfLPUQaCyyTHqB51odRD9BnS/Le2pu+KB5WgFrD3tFgzzg+GdXXp9UOjWiX VBpT03SMvJAuGzn2voS1I5F80B3Fvh7JZshU8whmtMF/wfRi950kyf9eEQWfdurRh/Bb cGIhQvzR7Me8I1bdfzc/NNE+eD8jRBl3FlfJnw8Q5uSALemUAahPlC/GjcvvXmuVXal7 p2jEw0HSAkU/bZBmwStsXNYgL8+4J9f/fOwVyzefOx9Kxwr0EZPg/V2hz012W498Okxx B6UQ== X-Forwarded-Encrypted: i=1; AHgh+Rq26yVdI7OV/wzBTOZNEp1qmPh9aEGwHR+bsMdIeUFWEDWIAmD3NC1RiLKSavlzGFQcvpXSzCncM4a7o3g=@vger.kernel.org X-Gm-Message-State: AOJu0YyGr+HuQw002kGo8ezflQSvlbM7hVIEfYo7ymU1ss3rSgNgoVhi VqOePN5K7qOL0JZ8kBCNLignxWCvbbxt2Q623UnGShYqCbtQTzK/dsXU8u1t/sT1TZE= X-Gm-Gg: AfdE7clEgbrfemxuoUpSiLNdR6bQeVOJMHDU8Sky5F4Pj9K6zjR4G8Chp9N6HNqQ4pG rc9zYXCbi9tKazmTQ1yItne9MQXEKip8Sds7J02lZpCDxRzvLg6Uu/Ec8ZeA8eUiJQX2ZJeVVWv WZJaV9xijVTG/fdt2RgxyGIKo4BhZcoYhfrqRugeGn5qrJ3oJIHjkpC52rvU8zzPrNg/CVA6RZv 4XlCMIGlcv2BMOTgW8h5wqND5I9L6EtA7e9B18XmoOOtz1LTqyWqnkq54yhTJiP/Zn7hyHk6ekQ iQ4V2ChlQNKNqW5jr1XfBA2GSO1FdInQw7Qja7uw41IQYBydIBs9X74TcKSBfW9NorOqtbAiXga UJ+lhg1kLwD8nJuQGb/fiI+RsnoM3sMwebdWWhPAkMAJSpVO3jJMJbWnWBVth3v4DmtZc9TI89j EQ55ypHfTADVtrQM13uwXYSi/ciHrl7rmpwkOBF3AubrL1/w3F5RxmEVbLTrZ6FWG+XSYce3ynA Q1qyvlXb83gvg== X-Received: by 2002:a05:6512:68d:b0:5ae:b2d5:202f with SMTP id 2adb3069b0e04-5b02ba1e9a8mr3277797e87.21.1784119827029; Wed, 15 Jul 2026 05:50:27 -0700 (PDT) Received: from archlinux ([94.180.44.28]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b022fac999sm3404042e87.55.2026.07.15.05.50.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2026 05:50:26 -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 15/61] staging: rtl8723bs: remove unimplemented halbtcoutsrc_GetBtReg helper Date: Wed, 15 Jul 2026 19:47:43 +0700 Message-ID: <20260715124829.90290-16-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: quoted-printable Content-Type: text/plain; charset="utf-8" Remove the halbtcoutsrc_GetBtReg() stub function from hal_btcoex.c. The function was never fully implemented and simply returned a temporary constant value of 0. Clean up the codebase by removing the function definition, its associated prototype in the header file, and updating or removing its remaining call sites across the driver. Signed-off-by: Arsenii Pashchenko --- drivers/staging/rtl8723bs/hal/hal_btcoex.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/staging/rtl8723bs/hal/hal_btcoex.c b/drivers/staging/r= tl8723bs/hal/hal_btcoex.c index 195ccc4b7..c66ca6f73 100644 --- a/drivers/staging/rtl8723bs/hal/hal_btcoex.c +++ b/drivers/staging/rtl8723bs/hal/hal_btcoex.c @@ -729,11 +729,6 @@ static void halbtcoutsrc_SetBtReg(void *pBtcContext, u= 8 RegType, u32 RegAddr, u3 rtw_hal_fill_h2c_cmd(padapter, 0x67, 4, &(CmdBuffer2[0])); } =20 -static u32 halbtcoutsrc_GetBtReg(void *pBtcContext, u8 RegType, u32 RegAdd= r) -{ - /* To be implemented. Always return 0 temporarily */ - return 0; -} =20 static void halbtcoutsrc_FillH2cCmd(void *pBtcContext, u8 elementId, u32 c= mdLen, u8 *pCmdBuffer) { @@ -808,7 +803,7 @@ void hal_btcoex_Initialize(void *padapter) =20 pBtCoexist->fBtcGet =3D halbtcoutsrc_Get; pBtCoexist->fBtcSet =3D halbtcoutsrc_Set; - pBtCoexist->fBtcGetBtReg =3D halbtcoutsrc_GetBtReg; + pBtCoexist->fBtcGetBtReg =3D 0; /*not be implemented*/ pBtCoexist->fBtcSetBtReg =3D halbtcoutsrc_SetBtReg; =20 pBtCoexist->boardInfo.singleAntPath =3D 0; --=20 2.55.0 From nobody Sat Jul 25 17:33:43 2026 Received: from mail-lj1-f175.google.com (mail-lj1-f175.google.com [209.85.208.175]) (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 8E7DE47DF9B for ; Wed, 15 Jul 2026 12:50:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119833; cv=none; b=ILFuv7e4r8PXSTN+HoAYEBZpd62PZHlT4i+b0GAmgfGwojBrUBfuOL+5e6HZBQYq5HdMVopg630UJuH7wAKEBXEq8W9AhUWv/XVugRfAZ/0jkzDXfZ7EKuuI/vfEiu0jztTMTycEE3/4xfwBfVa8Z/SmktR6rgf5RtVUsBRXQvc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119833; c=relaxed/simple; bh=PWo8drYNmEl9T8m+e3kEc5tCHU5tvkZBEFlJt3YnZF4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WIDlrrerOqeWr+QtcWz5g7Ktnc4jrEBtdt/u3Y8W2ldmwmsLPCa+6NAvJIlrkallw6jgkWGeMG+ibYgNH0uXbF365BYF+0XNMBpN7O0yqFGzhuXAMd7Pp64FuGBoV9DVQ5klVjtNGjrln0JS5z/ignvKi5E+0TeYEBTnjKouep8= 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=dqr8FTgd; arc=none smtp.client-ip=209.85.208.175 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="dqr8FTgd" Received: by mail-lj1-f175.google.com with SMTP id 38308e7fff4ca-39ca300db70so33705161fa.2 for ; Wed, 15 Jul 2026 05:50:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784119828; x=1784724628; 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=mo9sFeBPLc9RN2BJhYoa0KVAtXoxfFGVpq2rblM6wTg=; b=dqr8FTgdIc8itYtGgZLUTjY4KSHx6TkZeePgLjMphLc9TwiB3yHGkUnnmRPyWS1RNY eUCAYSu7olYklniMsUcwXfyBsmjy6xl0fboP7G0XuwPzvMTUTLK5XcXLCEH0p1DTSXo7 1PxTVCz0NoSZsi5HzUGgLt2e01PbfQH6sFnnknDhj3cd84N4rLqZiXqFTp0CzOqStcBk xQBhVbY8FC8fV4K50JyJwF2JpUR+41k66V3YtmN5guOABD6fbwZf7r14h8OwoyCuVQpf 3dtGPm/kPUdB8QXDJOIrmyRBbvKtOZppMdXBu9qV7DgL8YY1EZ+bXIXkd2QRVSeGhjTR EqZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784119828; x=1784724628; 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=mo9sFeBPLc9RN2BJhYoa0KVAtXoxfFGVpq2rblM6wTg=; b=NQ1f6X0WkZ8ONARhXWGVFixf3VnWoYCivQ+A9RjsaV4A8XBnc+g0e77tKIoc+UwxWn BY5nrcMFZD4n+4XGoVrrC9bo1V/930MA8L2ZjnFNMMtVYk8AJXW03X14YiofOy03A7k+ rnHMpvkKOcs/9NHMeber5GsOIZWXB6AH7eDesesaUlQ2mpdaeKygME+EIoC2jNQcUB9j Ykn3o/+wVb/wHBt3Eo3J4TJt56Ru/Iw/5TqberJzQoA+33LR9vlNEF2YCDrnJ8BeijgT /GbHmnvxoV4NR4RHT0KsZLmXMDdySLBV1cKV38b/g5xg1wLhadBPrVQFvGIqeI7wVlBX ozIA== X-Forwarded-Encrypted: i=1; AHgh+Rqdir/QwXu/cA5MwQD7WhgeBn4En24V4V7KxSNbe9rnF21LdwF6bT7Zr7k3bQ0S4lW8+kWyCfGHqmwAFFM=@vger.kernel.org X-Gm-Message-State: AOJu0YzYt8APUg8N0rmiOyHqyO2ET67vuE81zQQp6tZ/5XsH7YKUXdZe owpEVhY0rluImHUgg2qkr3wFKvwMlc8B/ulVsSeE7ff6+QKBRKX7lrM2 X-Gm-Gg: AfdE7clXCP1y1ObafycTqLDaxng60S7xmE7jepgh+pGr4G2Q7np+TfKDbn57L3W1lnz g/hH/w9WjTP+EAEBZRLDILCf6wSiNvF9lcllWNrPRydjDOe0yuaaiPBgsfpi/LG3lDdKE2CzxJl y0dhR9o2X8BIG9J1sgbv2/Yn2kNyhtH4jihJPsWzn43A8VWkEnsNqZtw0cvXSN3CBA13Cv6u5mc QbOdXM0V1XvB/gzeDQyuo2tTWLh82ohM9TlXO/TI9+gZNw6EeEPp9d8rLxSkkRUHra/rGT/ANxk xhh7MCOM0pA/yuEUQU1D4SqT1nkO0G0mt4d0nTprN+cywiT4c+f/18d2maBWDkZEA34DpMn/yNM UYX/TohgoRktki9/IOdRCJ3a7+EBar6PRtoPWlUt1oVvszS52r/1vLEhSp/N9u4OlVPh91Led7s nzlMoKoXmexM/ylGLHCP5bMjuq3UiXjdTTG5MdKaMUZ3ya9wKvk8nBRp5d2rax/IbM84SZzL8yZ BJ3ZczumDOSJA== X-Received: by 2002:ac2:4bc5:0:b0:5b0:1eb2:53de with SMTP id 2adb3069b0e04-5b15d7ae06fmr634702e87.44.1784119827818; Wed, 15 Jul 2026 05:50:27 -0700 (PDT) Received: from archlinux ([94.180.44.28]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b022fac999sm3404042e87.55.2026.07.15.05.50.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2026 05:50:27 -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 16/61] staging: rtl8723bs: remove rtw_free_evt_priv wrapper and rename helper Date: Wed, 15 Jul 2026 19:47:44 +0700 Message-ID: <20260715124829.90290-17-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: quoted-printable Content-Type: text/plain; charset="utf-8" Remove the redundant rtw_free_evt_priv() wrapper function from rtw_cmd.c, which did nothing but call _rtw_free_evt_priv(). Simplify the code by renaming the internal _rtw_free_evt_priv() helper to rtw_free_evt_priv() and using it everywhere directly. This eliminates the useless leading underscore naming and reduces call overhead. Clean up the old wrapper definition, update the function prototype in the header file, and adjust all call sites across the driver. Signed-off-by: Arsenii Pashchenko --- drivers/staging/rtl8723bs/core/rtw_cmd.c | 6 +----- drivers/staging/rtl8723bs/include/cmd_osdep.h | 1 - 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_cmd.c b/drivers/staging/rtl= 8723bs/core/rtw_cmd.c index d2c6d48a8..b91182549 100644 --- a/drivers/staging/rtl8723bs/core/rtw_cmd.c +++ b/drivers/staging/rtl8723bs/core/rtw_cmd.c @@ -212,7 +212,7 @@ int rtw_init_evt_priv(struct evt_priv *pevtpriv) return 0; } =20 -void _rtw_free_evt_priv(struct evt_priv *pevtpriv) +void rtw_free_evt_priv(struct evt_priv *pevtpriv) { _cancel_workitem_sync(&pevtpriv->c2h_wk); while (pevtpriv->c2h_wk_alive) @@ -286,10 +286,6 @@ struct cmd_obj *_rtw_dequeue_cmd(struct __queue *queue) return obj; } =20 -void rtw_free_evt_priv(struct evt_priv *pevtpriv) -{ - _rtw_free_evt_priv(pevtpriv); -} =20 void rtw_free_cmd_priv(struct cmd_priv *pcmdpriv) { diff --git a/drivers/staging/rtl8723bs/include/cmd_osdep.h b/drivers/stagin= g/rtl8723bs/include/cmd_osdep.h index 91d933d71..2259fe57a 100644 --- a/drivers/staging/rtl8723bs/include/cmd_osdep.h +++ b/drivers/staging/rtl8723bs/include/cmd_osdep.h @@ -9,7 +9,6 @@ =20 int rtw_init_cmd_priv(struct cmd_priv *pcmdpriv); int rtw_init_evt_priv(struct evt_priv *pevtpriv); -extern void _rtw_free_evt_priv(struct evt_priv *pevtpriv); extern void _rtw_free_cmd_priv(struct cmd_priv *pcmdpriv); extern struct cmd_obj *_rtw_dequeue_cmd(struct __queue *queue); =20 --=20 2.55.0 From nobody Sat Jul 25 17:33:43 2026 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 45FD6480332 for ; Wed, 15 Jul 2026 12:50:31 +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=1784119833; cv=none; b=dHuxmQf28fHCBp/21blgJIKx+2ayTEWEIE5ZTr6yGQZPe4Grtk45mlWwbbhFUxfJxcg/keudESCQo5Cuk5kCX+Zrhzc5tZj/6lDL/frR8jv72cYsl6dlvrJO7PZlThrW8hxQSBG7MW3LtT6kZioIbcjOYN8LR4Vj026dJDioWio= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119833; c=relaxed/simple; bh=W8WQ5/ZV4NvYHsst5ICR+qjIXFWVTLMeMb7DFpklPi8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fjcA5qPI1JWIWYrshiLBipMM1vN/GC3DQ/7VgofOoCpFbWAPYDqBxSogkMrmSYzKFgrvZXy4HiY8nf57eKk03eXtYhvq3UXcP3p5ABliaddc46rgPPmgYBQFt/JeLC21YuHRmlBtzMraUs+tu9ipHcF0gyWY4ZcXnOFRzNqICT8= 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=E0JB6Z1c; 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="E0JB6Z1c" Received: by mail-lf1-f43.google.com with SMTP id 2adb3069b0e04-5b159850b16so1841606e87.3 for ; Wed, 15 Jul 2026 05:50:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784119829; x=1784724629; 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=H5+EGYyE5WopOPt564ReimP2aWQt+GDgRIHdPMKppUc=; b=E0JB6Z1cyxCLWbAhVaaoRVL0Bptl4OwDPhdStAfwwyp98HwjjfWQpegCIjfIYlQ9Se WgGQblSova0gH5vtgmfC1iwiErLtHGfSTIYWmhjrkltKU/18dlQxYtKcvT936S8dZajo tuLaSqTykCWGAXNaqU4DiN2fyZ3DsdyFGASNSY9uh6bY7r3S5ctnmQ3UwRMPOCefRvGn 43ZzRehgpimX4TU244cS1zxvzJXxPi6kwgl7JKwbt4vv+A/rvKQabiZmkQoddxRA9rFA LTBriG0KZC7mhq88Kuf1U83amY27rQCAYSw8ArUe+hqb1cE9zdeaOeVPJ0QsyxXYXl6u iDzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784119829; x=1784724629; 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=H5+EGYyE5WopOPt564ReimP2aWQt+GDgRIHdPMKppUc=; b=QdN9mRfu/eRNe5jIINzmO7l9BUR+nECGM/T7EZ4UxUvfL9X0re6HLHPIXjWPHL6PV2 zVpaaZBES0HWT4KmDuiiI4VNFftl2xENzvGDMdNcCAj7ayzMDcpk8ilwwvazeCpEZlLk JapojqVend9fHEXaAFfKYGVDCU7ebzmU9HmhdU8ycyZfqdnf6WjLCzKUtQ/HFKpkZ/fW 7kMN8QNDYMHtnOkprqQgAylBsVLChvuVaBR0TkNnR0akMgnJwc6MWu/WKD4z/zKVgN79 YDKr2dIcnol7bReGZ2Yra88OGn/XvMaaatcOhm1BoJM9xFeaIU5g4XGgGiMhnpPBXa0F dQxg== X-Forwarded-Encrypted: i=1; AHgh+Roq0onh4BCJCWC53jANl9SlTtWuRN2Dg/jE9uItUyeaxVvcwo2+Hg2e8fSkbHbsIl/3i799vzsZ5pqS8lc=@vger.kernel.org X-Gm-Message-State: AOJu0YxqNwAkUdDESi0/00IYU9de7TkxVGD1TnlwNQAczpw4UJa/M6HQ V5taqak6aXwCqYW4n5YMXA8fh69PUGWz7Bx1LhXe7oGhD/62BvSQ7UUw X-Gm-Gg: AfdE7cmLHz2arE1U2pUiBxFJ/kBqAKTDWSm+oYWqLbxP1ck+h/onRnHnByYectX6CmZ Jrj+xQchpkJpcqOtNOMlH+DdMN3kLa2NxbCg9ixzVOv8U/qXZ5jQUynyQfTqAAKb/flhzhEI0qg G5dyrit9PC1OoI191J/3TP45Rgjbs2YHaNXaFrWodWnca9Sg4KHo7yCnnFHoVX8qT3HWqLeTnNg EreJ5zvuAlRI7FnKnDJYaR5+6QKASdGOi+RJb6wJ7rdLlE20248Hqu6MLsXrR0ektnTrAHeq3dm ppImanQQcutwiN95cWpL89/ZnXn9S5DpEwgJgxzLl7oyA7PZ8Q51W/ZOOx8s4gxAOkxKjRm8km3 JOpbWVHaW2I77w73HjuuZBHJCNyDbpvStVLZwMBwPpvOofD2StcBDgseJx/lK05hlN4ArQL5t4F rSjoMqOra5dsu8r7kRY9jSMyqqKCd8I+p7rBAdjp+jUwfb6rCdRaEPv6wIhFdCNLe0RPgJkXDyC g3dlNxz9vv7Sw== X-Received: by 2002:a05:6512:65c9:10b0:5b1:5afc:1727 with SMTP id 2adb3069b0e04-5b15afc1880mr842414e87.57.1784119828624; Wed, 15 Jul 2026 05:50:28 -0700 (PDT) Received: from archlinux ([94.180.44.28]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b022fac999sm3404042e87.55.2026.07.15.05.50.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2026 05:50:28 -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 17/61] staging: rtl8723bs: remove rtw_free_cmd_priv wrapper and rename helper Date: Wed, 15 Jul 2026 19:47:45 +0700 Message-ID: <20260715124829.90290-18-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: quoted-printable Content-Type: text/plain; charset="utf-8" Remove the redundant rtw_free_cmd_priv() wrapper function from rtw_cmd.c, which did nothing but call _rtw_free_cmd_priv(). Simplify the code by renaming the internal _rtw_free_cmd_priv() helper to rtw_free_cmd_priv() and using it everywhere directly. This eliminates the useless leading underscore naming and reduces call overhead. Clean up the old wrapper definition, update the function prototype in the header file, and adjust all call sites across the driver. Signed-off-by: Arsenii Pashchenko --- drivers/staging/rtl8723bs/core/rtw_cmd.c | 6 +----- drivers/staging/rtl8723bs/include/cmd_osdep.h | 1 - 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_cmd.c b/drivers/staging/rtl= 8723bs/core/rtw_cmd.c index b91182549..02b7d24c3 100644 --- a/drivers/staging/rtl8723bs/core/rtw_cmd.c +++ b/drivers/staging/rtl8723bs/core/rtw_cmd.c @@ -227,7 +227,7 @@ void rtw_free_evt_priv(struct evt_priv *pevtpriv) kfree(pevtpriv->c2h_queue); } =20 -void _rtw_free_cmd_priv(struct cmd_priv *pcmdpriv) +void rtw_free_cmd_priv(struct cmd_priv *pcmdpriv) { if (pcmdpriv) { kfree(pcmdpriv->cmd_allocated_buf); @@ -287,10 +287,6 @@ struct cmd_obj *_rtw_dequeue_cmd(struct __queue *queue) } =20 =20 -void rtw_free_cmd_priv(struct cmd_priv *pcmdpriv) -{ - _rtw_free_cmd_priv(pcmdpriv); -} =20 int rtw_cmd_filter(struct cmd_priv *pcmdpriv, struct cmd_obj *cmd_obj); int rtw_cmd_filter(struct cmd_priv *pcmdpriv, struct cmd_obj *cmd_obj) diff --git a/drivers/staging/rtl8723bs/include/cmd_osdep.h b/drivers/stagin= g/rtl8723bs/include/cmd_osdep.h index 2259fe57a..2afd60a7d 100644 --- a/drivers/staging/rtl8723bs/include/cmd_osdep.h +++ b/drivers/staging/rtl8723bs/include/cmd_osdep.h @@ -9,7 +9,6 @@ =20 int rtw_init_cmd_priv(struct cmd_priv *pcmdpriv); int rtw_init_evt_priv(struct evt_priv *pevtpriv); -extern void _rtw_free_cmd_priv(struct cmd_priv *pcmdpriv); extern struct cmd_obj *_rtw_dequeue_cmd(struct __queue *queue); =20 #endif --=20 2.55.0 From nobody Sat Jul 25 17:33:43 2026 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 D720847F2C8 for ; Wed, 15 Jul 2026 12:50:31 +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=1784119834; cv=none; b=bxe0/cfdWWV+SEVGf9eSaQx8MANELM1mj5LoLk+xZSJsTXq75ttZJZhpHR6V8GcKalUNC9Py4RINm4eJBgWRDqfCwPoLX00PLxCW3TyZ3tQPwDGFYauPazydxTBHKZIqX+vLswoJvD5hD+RPlP+K7CW76dx1+VB4/QqrtcMLrA8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119834; c=relaxed/simple; bh=LDjnU8wWcc8WVujOeS2iCrdBFq4t8S0oQujwBbiTOO8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=urukfAQpFUgXbAj1pESY+SiPWc0RTyDTx2wEhWs7VgA7mnwN8mM6vJ/47golXwZQuqthsXO8usdkGhs7jFsPLA5a0h3U6ukWzctnXIP2Nnu+vFwzojEcdcC2CjrJrPAL/ouHMhmv664RFtzl6JMp2YPkXqfl/Tx3q2fJS4XQa4s= 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=PBbOT8zP; 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="PBbOT8zP" Received: by mail-lf1-f43.google.com with SMTP id 2adb3069b0e04-5b0231a3e86so4633172e87.0 for ; Wed, 15 Jul 2026 05:50:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784119830; x=1784724630; 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=ml0TaZ73hFYK/wxsUsTYoqomxGiJC157MiXEoyPfmO8=; b=PBbOT8zPr+WMifa2prwm5FU3DL30D7I3/hKZiaeb/TVjGMoAmLkzZiQZLfO6RJ7ZU1 uaIklaespk/8dJqEbECFwcT3vlOzWJYWTtI0D2Rmwr2leXNtVYwTB7UKjdjWu+hlwF1w khbCJ0Y8E/WW+aovekfBJHbNpZ5Qq+gpJKuBxqLFsBts80STvorqRJ9b8a6Y5EHciIev CAdUBU0rkjkoC2eIrXbGFNn+W+Kb3N/3YyNW9nA7+Z082lj7ZAOJbgoPlMkXqnduOP0Y EMce4tHqykRneCAmBMu4h3WnaRt7fcjqEYiY6OS+/Ry8Zrhk7aLuA2msMMx1KVpE64nA KfBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784119830; x=1784724630; 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=ml0TaZ73hFYK/wxsUsTYoqomxGiJC157MiXEoyPfmO8=; b=jVYb4lom3+WLGosoL68jU4cyN8nSeF6ibOsyEg6J8xw/o04qXCFw0+IVhHS+9y0VO+ 2MFTRqMIjf2b26rLCmDM8fFXujTImtmqdDqVXY3vh6wsFF10wvPfyE+H0DT53mNGepZ0 HQeLbizPQl+hRkYSmvIp2UpnnMFKQqc3LSZ8AJb83FaloF0zdnZKz+JHrF3BjjlW0jU+ IBrjj02bpkwluJGNqk4CqQ/XzO2FAjxRgmLc9+JvruRcalN/UvYjYW4qHd+V3cg93hpw lsk11ss22oeILpFtpuammfRbQGLf7YCwiQ/iXFqizAUYBTZSWnaGNexYBdryOAl3pbzO a7WQ== X-Forwarded-Encrypted: i=1; AHgh+Rqd2g/w3xsuYvn5hKuf4ITFx7DAZhQeTTes0StbMIcSejc+kFt5tuVrP8uOj4oxhpGU+VSMuHS0Bht2G0g=@vger.kernel.org X-Gm-Message-State: AOJu0Yynpb3klTayWz612DNy3XWBaVLLfyF2YCXhJL96f+6YLEZbZKL1 ep+GSzSuuiCS05NLzOgkcThsy/oqQkl+6klO80pI0WWRIqaDXVBHm+t/ X-Gm-Gg: AfdE7cmSK9aVKyPoeDsvxjLXsHijRsAJAqOw0zwMacotISUhCWl4wu0xw6c2XhF4h8Z aGWCLpFlS/iIyehy0AUuk8V6QcguAmymO4Pev+/JjEd4lnOgfST3/Af0M7tbWylLjL2b4BdxqKl 0dXLtoi0q0UDpPP3AtDHjjpxcgnCMnu3zIWzAyVe8zo6Qn5bJ2zp5HKjqSOpUVOGKK43ioA43Kt 5FZweBNvcuzyQzcdIxkY6YYSi6eu1cB9oZ8Xs6sKZT1XO3pLUFTTWwP2Xz+EFFmwQluhbhy18qR RFcwUbGWq7A28++s4Bhr66ZpfYmK/OWACq6hMy9bpwkjK0aJAImyCPiCS1N3wZKDj/QXWKVSaL3 7qgVVjvmTdEfYlXrzmLfC7BUM5V1w+m+dMjIbbDkEyKdNUuEQkRCNraS5ezv87EozD98wzoNCQi dBIHq9K04aeKMkB8lGxxYOhSVF8rQLa6T0Fj0PiMoKkfA9ozzxyYGykcQ/PNCUdkNSqHHIoL87M ilIRs1kzIdUyg== X-Received: by 2002:a05:6512:8388:b0:5b0:1760:fabe with SMTP id 2adb3069b0e04-5b15d7766e5mr418334e87.15.1784119829423; Wed, 15 Jul 2026 05:50:29 -0700 (PDT) Received: from archlinux ([94.180.44.28]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b022fac999sm3404042e87.55.2026.07.15.05.50.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2026 05:50:29 -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 18/61] staging: rtl8723bs: replace rtw_dm_in_lps_hdl with direct hal call Date: Wed, 15 Jul 2026 19:47:46 +0700 Message-ID: <20260715124829.90290-19-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: quoted-printable Content-Type: text/plain; charset="utf-8" Remove the redundant rtw_dm_in_lps_hdl() wrapper function from rtw_cmd.c and replace its call sites with direct calls to rtw_hal_set_hwreg(). The wrapper provided no additional abstraction or logic, serving only to pass fixed parameters (HW_VAR_DM_IN_LPS, NULL) to the underlying HAL function. Removing it eliminates unnecessary overhead and cleans up the driver interface. Clean up the function definition, remove its prototype from the header file, and update all invocations across the driver. Signed-off-by: Arsenii Pashchenko --- drivers/staging/rtl8723bs/core/rtw_cmd.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_cmd.c b/drivers/staging/rtl= 8723bs/core/rtw_cmd.c index 02b7d24c3..88ac64a6b 100644 --- a/drivers/staging/rtl8723bs/core/rtw_cmd.c +++ b/drivers/staging/rtl8723bs/core/rtw_cmd.c @@ -1354,10 +1354,6 @@ u8 rtw_lps_ctrl_wk_cmd(struct adapter *padapter, u8 = lps_ctrl_type, u8 enqueue) return res; } =20 -static void rtw_dm_in_lps_hdl(struct adapter *padapter) -{ - rtw_hal_set_hwreg(padapter, HW_VAR_DM_IN_LPS, NULL); -} =20 u8 rtw_dm_in_lps_wk_cmd(struct adapter *padapter) { @@ -1753,7 +1749,7 @@ u8 rtw_drvextra_cmd_hdl(struct adapter *padapter, uns= igned char *pbuf) lps_ctrl_wk_hdl(padapter, (u8)pdrvextra_cmd->type); break; case DM_IN_LPS_WK_CID: - rtw_dm_in_lps_hdl(padapter); + rtw_hal_set_hwreg(padapter, HW_VAR_DM_IN_LPS, NULL); break; case LPS_CHANGE_DTIM_CID: rtw_lps_change_dtim_hdl(padapter, (u8)pdrvextra_cmd->type); --=20 2.55.0 From nobody Sat Jul 25 17:33:43 2026 Received: from mail-lf1-f48.google.com (mail-lf1-f48.google.com [209.85.167.48]) (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 DA35F472768 for ; Wed, 15 Jul 2026 12:50:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119834; cv=none; b=Ltez7gQTvY4lmXLbrcCWsqBu2CFkBiZT3K2IFOhzZhzFlOw1g6IW5M7sKWN6fnNj7ewbat2L1x5QZea0zSoyVeGbhAmN6mx0W/Cd3VoB4GLMryIxroEIJ7rwLlSv0y17CCY8xBCeL5rD23KQr9s8q4oNxG24xW7LdscidHqKIV0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119834; c=relaxed/simple; bh=AFGOrB9Pa11r7psjjZSqpoL+4HED2uf5W/sWqcZrktk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oquTjM1uebkBqn9qg5unrOytPSWtN1inVR18LDdYGHk+Oe0VTeAGUW9Jn4gxL2Q9E8VGgHka5ag8OOgnTY0OylMfNFmPMByvTaq36uYlYJFnKIwJJd8sK73uUFAeMWRcgIKNNHZqjc4+dwtQ6wSoGukeGXngSwKuPJO/5Svimak= 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=NbPHqRIG; arc=none smtp.client-ip=209.85.167.48 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="NbPHqRIG" Received: by mail-lf1-f48.google.com with SMTP id 2adb3069b0e04-5b01cb18515so5050999e87.2 for ; Wed, 15 Jul 2026 05:50:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784119830; x=1784724630; 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=VnLNMxFbMW9A+osLS4HGXt4qSj8djglE8s86E5aJFnE=; b=NbPHqRIGyPZ9MqZrwoxvvuY7XaqE/VvH2WL751OZc3lhpuww603eBtjXBmU+58q72k iSTVJYbgWSRLo1wm6IGw6kSZCMNgshb67+r4+fIs//nhY435AZCjvueuYIfU3ufxY9MM RVq4WCavxYHq+PyP6ue+nQrUhvOr3hyBqWWGII2GldFR3Wzdcfr4KcZo4Zz6z311sojw yUvUawz74EcmuEwBzO7s4Q0SiihDyTkmqimZXBeCcKTbKO4aEB/V1L8HKtLjTDZlv2sh 4VR/1rxUSjMmzcwqUsUjEfGQEWentGx/sGUz368iJAezq7/AjKQHDqUwR+uqjtDgdWhq 2D+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784119830; x=1784724630; 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=VnLNMxFbMW9A+osLS4HGXt4qSj8djglE8s86E5aJFnE=; b=hngP+En2XfG3r4sPNz7jrvfF/xTJoJy+ybC1mKzpUMFQpAzmngOEfGVp/wSSDCxueo pfY8prse56Co+dbEXiSKa87aLtj9xD5ouYjY6jvV1gpyoyfG9sSKT6pauPuyueQZqjiU 9fCdyQXlo9hRbNYh9p7GPYU7vm3dbVY3Xw7i3Xt3VOhKLNhtS5x2hqmMBhRyR5nzTAAJ 6BS3ObZagSEolh0azKBBjDPeQ+4Ls6d+WF5NGUITk6sJOOgu+CfUUTskQNo0yUoRXLFw kwZHfhh0nooYPAhaFXYXBwJkZTjO6yvm9b9mfrIHPCi01OdfqKel6ZbpO6O6+2difkjh WLRg== X-Forwarded-Encrypted: i=1; AHgh+RqLYx9NUgyD2UQNt8G7sG3YbPyVeG7p/IuHtU1Fusloem/j9TDBM7tLvbFqpVzKY6pBir30iT7qXwyV2KQ=@vger.kernel.org X-Gm-Message-State: AOJu0YxnhTUvokjfa+jtKIWDaQdVb0YPIDQWjfQOySPw/gvctrVrfFMj +aP1HtTCbZZHmunQxpf8gWHEgY7O8Rbb3oL8GA6nxM7uD1S5VlkLWih0 X-Gm-Gg: AfdE7cniHKsuP751JxcE/0K9Ts7CUR8SyEHVICe3DoBFUU/vYpqqcjE0zgVnoV3YOqY +viCkkpJVC7rP1VoHH8NdAHa9oC97nCFnmp229a9nE+Yky+3fgGYqKL3a58Ve6rmK324H53uUWK G/497YagXi5BORDxvLQasQfZnPzVbI8CCbGNpEpKDLz6Ifdt/xN2FzsvrY+oQFtkXqaDdw/z8b5 Bs7xGX8T4uLnZAoQomzBNOBDl3AB1ZQdWXA/FtEWe0cuSzrODEGGYhhakex8dcyT+fvO4IujHx6 JixHhwBxdZLD6/dJ1gcYZZ96uLkgpvW6wssZHpOg1zxA8aelfIHuSO5tLeisEzThykw5nKLV4J4 6YR0PSrlpBFFf1tdWjteANhakhBVUgH58ZqyC9RDpDwjtnHXJbKGplCEiyPP8bu2I868zQmEhHu ZSIqMJYhU+DOkP1j9ZNX1dO0j+GK7BiHMTXpLHJ1wV95P93NU5SO6FOeig92Eu85C80XBIq4nik SplC1M+nl3LAQ== X-Received: by 2002:a05:6512:230e:b0:5ae:bec7:8b73 with SMTP id 2adb3069b0e04-5b159b8bb13mr1406385e87.57.1784119830237; Wed, 15 Jul 2026 05:50:30 -0700 (PDT) Received: from archlinux ([94.180.44.28]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b022fac999sm3404042e87.55.2026.07.15.05.50.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2026 05:50:29 -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 19/61] staging: rtl8723bs: make lps_ctrl_wk_hdl() static Date: Wed, 15 Jul 2026 19:47:47 +0700 Message-ID: <20260715124829.90290-20-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: quoted-printable Content-Type: text/plain; charset="utf-8" Make lps_ctrl_wk_hdl() static since it is only used within rtw_cmd.c. This properly restricts its scope to this translation unit. Additionally, remove the redundant forward declaration located directly above its actual definition in rtw_cmd.c. This duplicate prototype is completely unnecessary since the function body immediately follows it. Cleaning this up reduces code clutter. Signed-off-by: Arsenii Pashchenko --- drivers/staging/rtl8723bs/core/rtw_cmd.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_cmd.c b/drivers/staging/rtl= 8723bs/core/rtw_cmd.c index 88ac64a6b..bc2536c1b 100644 --- a/drivers/staging/rtl8723bs/core/rtw_cmd.c +++ b/drivers/staging/rtl8723bs/core/rtw_cmd.c @@ -1262,8 +1262,7 @@ static void dynamic_chk_wk_hdl(struct adapter *padapt= er) rtw_ps_processor(padapter); } =20 -void lps_ctrl_wk_hdl(struct adapter *padapter, u8 lps_ctrl_type); -void lps_ctrl_wk_hdl(struct adapter *padapter, u8 lps_ctrl_type) +static void lps_ctrl_wk_hdl(struct adapter *padapter, u8 lps_ctrl_type) { struct pwrctrl_priv *pwrpriv =3D adapter_to_pwrctl(padapter); struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; --=20 2.55.0 From nobody Sat Jul 25 17:33:43 2026 Received: from mail-lj1-f169.google.com (mail-lj1-f169.google.com [209.85.208.169]) (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 715A248097B for ; Wed, 15 Jul 2026 12:50:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119835; cv=none; b=nS1zTvkFtOuWah/2f3qJJMAGkZqscuKY51RnbZBP8NxOFPRK7Z4mWwL5dS+WkknOi+xRJA4LoukRmEI3IUQliCGQTEBuIJThW3stUjKMyPqcBqc8TGhD0n+WoBqrpGT7AwS1tPvPCJkU2/zWp2rzS7nSvAVa8jRwtvpgX6cBCBw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119835; c=relaxed/simple; bh=dBVdRgXIWAoyKsj3TPr1oJMnRG77I8qkl71C8ky55BU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=f1ZjD7iht5DZGzVENPSTljzciUFK5dA9ObNoRjvWZ67O2bachcv2WZD1L2lMf9VCNnK83FjLTz86Cx1xCkgq+5+avue8TnOL1f9/iQoS76Duzm+ki4YYM/zitU9k9g5BwKf/gys7YRYqayvUxpcrhfXpQDLx5rpE4lu4jmnF8VI= 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=jNMYKbcc; arc=none smtp.client-ip=209.85.208.169 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="jNMYKbcc" Received: by mail-lj1-f169.google.com with SMTP id 38308e7fff4ca-39c8e65e3f5so50407761fa.0 for ; Wed, 15 Jul 2026 05:50:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784119831; x=1784724631; 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=Iop18RDc/dqM3JoQfcP5lwliQX3WzU3E7lAR8YIGN5A=; b=jNMYKbccGhXjVanclUYlUdwPpZYw2gsEcjOM2x126o+3/XOju6ANJGjjzLRQooQc0x NBTpIWaTnYvYm2QAtHgGkrYnbia5Ut2nPdabIKr/FT/w907N3kzujqwECw/3GXRMIR6Q Zu1BukmnibWQdpEexvwzvuLAn13IUwO8iqZICKIkR4dzERvzXT9geDLDQH8AxLtJmmbx noSB7dUOPUJkTpUgGSHJurNlomQTYogtoMbfXFCFiL3j2E5epT93m3bWpmAUfB8rFmu7 7fgYGi/6LGWqAIkAjYx+UTa2xanE0/58QnB6E4/AHl8HHsbA3gHS6TUOeKmKwX1IXQLa WuIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784119831; x=1784724631; 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=Iop18RDc/dqM3JoQfcP5lwliQX3WzU3E7lAR8YIGN5A=; b=TvaaIbALulnG9cYuLaZG3KXfVw1PqfODj8+CjA4Tz4gSQ68KJdgvv3NJHDGY1oQnSi F3Q2ojQ8Z1lmVM8LyPhnGYsUrK2Q0jx37CrO07U9jyflanDJbFSistVajpQCimUUN6Q+ mMrZBUZFYZWDA/ZzGZtchzCfHXKllGgnm+H+53AmIa6eaMmwiFjK5kvxfwgV9yG9fIGr oaaagHb03m41w9Avtn4YgnCdidRSOJLrjZ7ANs8rorpRQvCD3lTEenud4XN22/BnBJO1 LC8GV3roen0usIOPzBJI9m+l9A1iCERffVK7iFu9abr4JJlO2Z6KCEhtJ9wwO8gOmFgN GntA== X-Forwarded-Encrypted: i=1; AHgh+Rp66lyobYd36kvNh/nkZRIHFtnCF4AMCa4dY6Yr4y2SqFbHaPgTnbtByzucIfwCIUPe5Mfg0XYvXK4Bbgc=@vger.kernel.org X-Gm-Message-State: AOJu0YxNsTmDZDuZ79gw9bugx3/bxbIv4PoO20S958xsliStVeu/FmgT Epx9d7LwiWe9UR2g6M/Y/9BWCcqzaJpk5cOES1JO5XrQ7vDZYAyl7Kcarf6FLU9zx80= X-Gm-Gg: AfdE7clUT9Y8bWXT9qpH90j0osfoxBypSrYoDDF861EmyFbXKiZ1cRCLrR4pULjuaKK Co+WMhIgyq+aQqefRo5sD+aUloNIQsYV25gjgX19Epray6pwAQCj3zd81+5M5XaXRWoVMIUpmIy 693wZ3H/P7M0/S6NHODo8A8V5/DlIKoz5MhMEmeQnZGfFwDhouAcvi8Xbqn8QBCch0+Y/zGZa1T uMdRBLDlN0Dg/PloMQb+xdvQTXQNlF7yDg5+aisfY5llPsO6RnhgRXzVTPh4kKy9ri0+aLG/pXE 3zsrWRLDajgj6GPxQducMLpLtVkxUvxomm00RI1gMEo3MH2jZsAbHMqvIYFj0ehkPbl5gki0Xto JIky9PMUBOB/GbGbwJ1Qw82IGiPlAR2wDyKLyMTNzK9vedaydAb5/Ozinv6V2z+Or3jgwgt4lvA N+CoF46z4/eLrhXqzJvkmYZv8XS+q12Ly30v+S10AjOaL5tugsZeVnhbpZVXdZyY3elQ2FJizCP 2uDVqGNlG4MmQYq6tICPEEE X-Received: by 2002:a05:6512:400b:b0:5ae:bade:3d27 with SMTP id 2adb3069b0e04-5b159b87076mr1325021e87.37.1784119831028; Wed, 15 Jul 2026 05:50:31 -0700 (PDT) Received: from archlinux ([94.180.44.28]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b022fac999sm3404042e87.55.2026.07.15.05.50.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2026 05:50:30 -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 20/61] staging: rtl8723bs: sanitize and align efuse read function headers Date: Wed, 15 Jul 2026 19:47:48 +0700 Message-ID: <20260715124829.90290-21-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: quoted-printable Content-Type: text/plain; charset="utf-8" Fix the function headers for rtw_efuse_read_1_byte() and rtw_efuse_one_byte_read() to conform with the Linux kernel coding style. Place the return type on the same line as the function name, collapse arguments into single-line definitions, and drop the obsolete trailing comment. Signed-off-by: Arsenii Pashchenko --- drivers/staging/rtl8723bs/core/rtw_efuse.c | 30 +++------------------- 1 file changed, 4 insertions(+), 26 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_efuse.c b/drivers/staging/r= tl8723bs/core/rtw_efuse.c index a40d6eab7..52ec19294 100644 --- a/drivers/staging/rtl8723bs/core/rtw_efuse.c +++ b/drivers/staging/rtl8723bs/core/rtw_efuse.c @@ -25,26 +25,8 @@ rtw_efuse_calculate_word_counts(u8 word_en) return word_cnts; } =20 -/*------------------------------------------------------------------------= ----- - * Function: rtw_efuse_read_1_byte - * - * Overview: Copy from WMAC fot EFUSE read 1 byte. - * - * Input: NONE - * - * Output: NONE - * - * Return: NONE - * - * Revised History: - * When Who Remark - * 09/23/2008 MHC Copy from WMAC. - * - */ -u8 -rtw_efuse_read_1_byte( -struct adapter *Adapter, -u16 Address) + +u8 rtw_efuse_read_1_byte(struct adapter *Adapter, u16 Address) { u8 Bytetemp =3D {0x00}; u8 temp =3D {0x00}; @@ -79,14 +61,10 @@ u16 Address) } else { return 0xFF; } -} /* rtw_efuse_read_1_byte */ +} =20 /* 11/16/2008 MH Read one byte from real Efuse. */ -u8 -rtw_efuse_one_byte_read( -struct adapter *padapter, -u16 addr, -u8 *data) +u8 rtw_efuse_one_byte_read(struct adapter *padapter, u16 addr, u8 *data) { u32 tmpidx =3D 0; u8 bResult; --=20 2.55.0 From nobody Sat Jul 25 17:33:43 2026 Received: from mail-lj1-f174.google.com (mail-lj1-f174.google.com [209.85.208.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 8DC72480DE3 for ; Wed, 15 Jul 2026 12:50:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119837; cv=none; b=VFqNTz0VWRofrW61wFk7kzHLZVjk+cAKGUwWBTqU+7Yt1kQwqUoQA3r8LZJOYm9OiIHynHbLe7ZqEFJRGEmTVaAV9T9m3FwTlVg9m11lSEAWrXIioXlCsBjH1Z5e9i7jufcSzMWk8U6r24xk+GQ2NQvHzbZ64LEo+TPRfwDq3jg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119837; c=relaxed/simple; bh=TwhfZ4JB7l42nuWDc+QaRaXnnleV2uCuNE5aMb6okK8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pvjxni9WquLqRdNNDpGCvO6z7jjjzaNbnHxU0e+Uhmz+LAMO3XyxJTrR381QIsSF52om+AA7rO/fnAtQKjDX+5uX9PUFBQ+S0STffvSqKiEC/OsJ6jzP1lrMyqNmpTmYpei5tflE5/vf7zHWHgS79KqhsbWkUb+mIwfC9Eoa5Tc= 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=Oui5eGN2; arc=none smtp.client-ip=209.85.208.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="Oui5eGN2" Received: by mail-lj1-f174.google.com with SMTP id 38308e7fff4ca-39d560a1dd4so4258561fa.1 for ; Wed, 15 Jul 2026 05:50:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784119832; x=1784724632; 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=L+xB4UeaffLISYYnOmZkuvvRpVXgpH0hBEJdxsuUwA8=; b=Oui5eGN2IyfOeWSflsdt6VKAcEc/WHtNqkVMuA15q3gFyZBzErNd3xw7gEcRanCuKp XoTjsCIQnf/x3J/4A2ehqZbt32Bu1c53m0BbTmYfMWE15eJe0Y1mF+1zJVnYhCl4D8My r1QEopWqTz154mCDQnXckSPiR2sf08WLjoikFuOi28WAW/Mgji3gC2Xi31yu+yeRd9+y 7KtVLdXqBECvlhL5CtmvLgVbVQXHiMKp43/tO+KYUq3PyhXecKsKLw8qTY1Xxh1A+scm gUoCloNpJ2mW8t5fywiQyrDn76SY85d6ER8ZPFlsubTHkv2PZhmi6SkwJYRqqcc0NEi+ ZwyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784119832; x=1784724632; 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=L+xB4UeaffLISYYnOmZkuvvRpVXgpH0hBEJdxsuUwA8=; b=BcA3a5BB7tblMvREoNdD01tvHniAnaThr/WNVyjXaFi2rOSC+MMR0V08NhHZOAHCcg vYUAcpiWVmW0FkEuWrXupCjBxEGofmEsWpzMnLAAF0E4Uo4ojhgSaR8xrJOCyLO61cMR pTEoezWIU3sm0R0vxKZLtRY0vQLOnkMjIaMikOCf+jsMEd5avW0QSoBuuo2lGZXNq3yo nXG1RsEXJCUut0RWz8rWhF+/8QWkBCa0apkZ+8bFdFsaCAGoHNPCac6rkpOx5sZLIiEU 7uLuxg7ikyH5I7WhG8r8O5nL2bZufu1hMBlxq9Xpsp8ZUh1Akw0h4UIoiYekQPCUPdZR 2Vxw== X-Forwarded-Encrypted: i=1; AHgh+RpxZoD7J+ktCSUczdPDD7WoWsl4PTpzR7soNoUwtok3r5Kxp4B19QOaBuqOR04UlEkNykjLQKH/+LVYTng=@vger.kernel.org X-Gm-Message-State: AOJu0YwWnolzaL49NhO2bLOCXE9GDVAgOs7qfghqilBpL623OQK2kC2K udfr5cpAdP8GD6XSmfT9uPfR+LVjalxB52xqmijy8b5LtCQrSNiGrG83f8ljZEUEfnQ= X-Gm-Gg: AfdE7cml4dB+eNN0nb3bHK6gay2z1DRADhw+bk4ikNv4RICF51oLvrpQ0U2RpGlMGHA y0tRneVSjgT4VizI42JTp8nMFCqN1W2mq93dOGhAx4Mp39SpNaWRwFiapwGDXrpAUJD4qQwvrrh +bDc+GSw1aH2QwIE3dWmw++yVAHHbqtpGYfPY3XyKZknS/6gr8b1AD98QZDjlEGbwpiOJQvfJ3A IAaRE8W0RaQfPDh99cCGPAgBtgBZFhDM4DqrTVXOCS2IFjBrOlf8a9QtFUc7T59R9v2HbO41SPv JX3e3kNI75KLDMYGH6VQSFEYbUxYPCRa7FYxYZnAAXkieOcfe380WOhNavinaoqBLgvb01S9XEA tqec58nCp1rmfjl76n1CTRcRiUkLQ9bBhpbVXSt1yUSkNS2eUxUGcVUag8U0iih5puln/Rxpqto 3zMXMcPDbKcsA/eNEEZZGg8SIyDnSKlnbdYq39J5eouRiKcIrHeLLNEg+rThS5tLuHSiLKsF/fJ b0UGpZZUDkr3osSR9GC3Zw7 X-Received: by 2002:a05:6512:3d8e:b0:5ae:b260:cf47 with SMTP id 2adb3069b0e04-5b15d76ff34mr608220e87.10.1784119831837; Wed, 15 Jul 2026 05:50:31 -0700 (PDT) Received: from archlinux ([94.180.44.28]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b022fac999sm3404042e87.55.2026.07.15.05.50.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2026 05:50:31 -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 21/61] staging: rtl8723bs: replace rtw_reset_continual_io_error with atomic_set Date: Wed, 15 Jul 2026 19:47:49 +0700 Message-ID: <20260715124829.90290-22-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: quoted-printable Content-Type: text/plain; charset="utf-8" Remove the redundant rtw_reset_continual_io_error() wrapper function from the driver and replace its call sites with direct atomic_set() invocations. The wrapper does nothing but call atomic_set() with a fixed constant value of 0. Eliminating it simplifies the driver's error-handling interface and avoids unnecessary call overhead. Clean up the function definition, remove its prototype from the header file, and update all invocations to use atomic_set() directly. Signed-off-by: Arsenii Pashchenko --- drivers/staging/rtl8723bs/core/rtw_io.c | 6 ------ drivers/staging/rtl8723bs/include/rtw_io.h | 2 +- drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 2 +- drivers/staging/rtl8723bs/os_dep/sdio_ops_linux.c | 4 ++-- 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_io.c b/drivers/staging/rtl8= 723bs/core/rtw_io.c index c793ae7ea..2692c9088 100644 --- a/drivers/staging/rtl8723bs/core/rtw_io.c +++ b/drivers/staging/rtl8723bs/core/rtw_io.c @@ -144,9 +144,3 @@ int rtw_inc_and_chk_continual_io_error(struct dvobj_pri= v *dvobj) =20 return false; } - -/* Set the continual_io_error of this @param dvobjprive to 0 */ -void rtw_reset_continual_io_error(struct dvobj_priv *dvobj) -{ - atomic_set(&dvobj->continual_io_error, 0); -} diff --git a/drivers/staging/rtl8723bs/include/rtw_io.h b/drivers/staging/r= tl8723bs/include/rtw_io.h index 3c99a2bc1..2c33d8053 100644 --- a/drivers/staging/rtl8723bs/include/rtw_io.h +++ b/drivers/staging/rtl8723bs/include/rtw_io.h @@ -33,7 +33,7 @@ struct intf_hdl { #define MAX_CONTINUAL_IO_ERR SD_IO_TRY_CNT =20 int rtw_inc_and_chk_continual_io_error(struct dvobj_priv *dvobj); -void rtw_reset_continual_io_error(struct dvobj_priv *dvobj); + =20 struct io_priv { =20 diff --git a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c b/drivers/staging= /rtl8723bs/os_dep/sdio_intf.c index d2419c776..0adfc2766 100644 --- a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c +++ b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c @@ -170,7 +170,7 @@ static struct dvobj_priv *sdio_dvobj_init(struct sdio_f= unc *func) if (ret) goto free_dvobj; =20 - rtw_reset_continual_io_error(dvobj); + atomic_set(&dvobj->continual_io_error, 0); =20 return dvobj; =20 diff --git a/drivers/staging/rtl8723bs/os_dep/sdio_ops_linux.c b/drivers/st= aging/rtl8723bs/os_dep/sdio_ops_linux.c index e9a2f3f7e..f728594b0 100644 --- a/drivers/staging/rtl8723bs/os_dep/sdio_ops_linux.c +++ b/drivers/staging/rtl8723bs/os_dep/sdio_ops_linux.c @@ -217,7 +217,7 @@ u32 sd_read32(struct intf_hdl *pintfhdl, u32 addr, s32 = *err) sdio_release_host(func); =20 if (*err =3D=3D 0) { - rtw_reset_continual_io_error(psdiodev); + atomic_set(&psdiodev->continual_io_error, 0); break; } =20 @@ -293,7 +293,7 @@ void sd_write32(struct intf_hdl *pintfhdl, u32 addr, u3= 2 v, s32 *err) if (claim_needed) sdio_release_host(func); if (*err =3D=3D 0) { - rtw_reset_continual_io_error(psdiodev); + atomic_set(&psdiodev->continual_io_error, 0); break; } =20 --=20 2.55.0 From nobody Sat Jul 25 17:33:43 2026 Received: from mail-lf1-f41.google.com (mail-lf1-f41.google.com [209.85.167.41]) (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 C41F4480DF0 for ; Wed, 15 Jul 2026 12:50:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119837; cv=none; b=EUTmtUPasxsSZVN+XWWtqwz2IXsdwR3GAiZsP2bInr9vRibmjbKXNmX17v7imjXuRNNdnW43moI54dD+YlvYZs3KV84sFgqwC2CFsRt/Tk5Uihx5NcsActR0LI0Iwdbvraj5/yYrCi73oQqHB0e2ppupn9WrB7Ki0oSwvyobsfg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119837; c=relaxed/simple; bh=im5v7plYnVL19o33g8lyvm2Jq97CV75vKcPw6PmxTKc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ezFvwkjZYmzETrFE3Rs0AtjQDiVozMP9rMIue8omLvsuppAiga7ZDKonfsdhRCxyrJl6LDZFd+P3q19QU1avNvDAUXgrAdbQcZZw76ESqZfrjst/MuAQx1pO8dddqSyUZ4I2tOKYMgDsGeuGrmtn3jE3nfFMnsGcdV4GzxUBIX8= 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=OYxUV06Y; arc=none smtp.client-ip=209.85.167.41 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="OYxUV06Y" Received: by mail-lf1-f41.google.com with SMTP id 2adb3069b0e04-5aeba09900bso1548252e87.2 for ; Wed, 15 Jul 2026 05:50:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784119833; x=1784724633; 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=N3xnvEidNAcLGJBtkHvj3DBY0GwTLkUJo2iIVQ5ynqM=; b=OYxUV06YZC6oLGFjLgzHfzDcjE+blhuad1L4C4iAUgKsS33ve8I5LdE+j0clJtbjHQ xKdd33bqlm2SXaQ9kPNQdlxREGefttIcN7i5kWRFTMOGfV/sbEpLSp9RYolDMCXQ/yUW HUKScz0xw8f+HP968DGF3HwQqQId012L+5uRx/bmWcXef2pufNLzfEn7+tR92nSuZNf2 f6LaWlvzTgOonlC+w1ArcvEacJCSqlecxHJqcJjQntlW6gmvQseCPYexLm2NRUX9rFnj nkFgTun4/vjeyqn1u638rJrp+1r04kBqT6quiyvVUP7KKQH30lNHPMOzjOJS6YutABJb x7Tg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784119833; x=1784724633; 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=N3xnvEidNAcLGJBtkHvj3DBY0GwTLkUJo2iIVQ5ynqM=; b=Spc5ykpOLTV22FtyyXvhVCSELQP1bTMyjxHOfICn05Io6MQ5CLlWYsFhPH+7C+dfZl NlqqkkSr2VTutymOd9F5m7W0X6tcpDXPXMKspM6cTxktKVFd/mWLzvQjYS1Uk0YWGcq1 oc+cl8artRafekt4/y1xZ191wtRsL2b3mvKdBt1/cA80ttw3XE5HNt+oGv2sDYEp0UpI ZKInJY1Rh1J+0lL4LeGiMeKCepBlUiTRob33CDtos/S/Qjch9ddgjUAHy7hiFPmopnhV KoWrtT2w5HW7ofT55WbhHfhKgItdGuPvQoOnOmrtOQ9uVHp0zavlmUqESeG4zL9Z38xN X3Kg== X-Forwarded-Encrypted: i=1; AHgh+RpFgEyHMIJla2jcRh3WF22Dx4IpPHCMz4mvS72UvNWf0YdnmeTjUmY5XOqhKKkpnJJCFxc9bNF+FyxwgL0=@vger.kernel.org X-Gm-Message-State: AOJu0YzC1xBe0JS49e6lu1HnNKOJwV68UQkkHZGk7osUSu0ul63kJatv LXMQeB3EXcvfQeQQZX1geyFGIwJf8364mjaB97tYj2Vi7Y0qI013DPbR X-Gm-Gg: AfdE7cnpxbTm7fiM1j8ixrhLeJV/mS+o8SHH5l2xBXz6fCbSBGTP+6T96cQxm18Axvf x6VOMsTER+nVTC4sfW/3jGM0zz1GVYjHW4uFmicPi3hRkPLoaWmTMYGmPMPSxf6Q4aPQm+fEWIB 9fTDHZ3O31gSLQe2Fv0ob0YvlG9IjxriTkIsiw3i2Rh5Dk5rGski4aXWHzzzp0JkAwYNEoyFHv2 iukflvqTp7js3VjCCtqJkGhDgvZs53Ziu8PydvbQR/HDyF4FuQdXL7PogTlIacQ/B+OSJS7eVjo 0rCZYMspCFnOmXwx5BAFzneOOQa0cNMNhvfCtTCihmhIsBiOv/tgJS2kEbo2zL+VUyIe30tgfW0 RHV9cN+4/Rz8IFHV4OflP+v8VUn6J7ag9cH5DTD6uqr5Fq7SeDdvbdJWztNzVuGL+E0+S6Cdifx tTn1N7pGjxTr3+A34/cvG32ONtQCfnt+NV/sdtmuup08/JngYUtK19he6vp/YE/l2x5LFRardDj L7AluLZU5LZ8w== X-Received: by 2002:a05:6512:3509:b0:5b0:197b:9811 with SMTP id 2adb3069b0e04-5b0236b6f58mr4393191e87.53.1784119832671; Wed, 15 Jul 2026 05:50:32 -0700 (PDT) Received: from archlinux ([94.180.44.28]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b022fac999sm3404042e87.55.2026.07.15.05.50.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2026 05:50:32 -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 22/61] staging: rtl8723bs: inline single-use init_mlme_default_rate_set Date: Wed, 15 Jul 2026 19:47:50 +0700 Message-ID: <20260715124829.90290-23-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: quoted-printable Content-Type: text/plain; charset="utf-8" Remove the init_mlme_default_rate_set() helper function since it has only a single call site across the driver. Inline its rate configuration arrays and memcpy operations directly into the initialization routine where it was used. This simplifies the MLME initialization path and reduces code clutter. Clean up the function definition from its source file and remove its prototype from the corresponding header file. Signed-off-by: Arsenii Pashchenko --- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 34 +++++++++++-------- .../staging/rtl8723bs/include/rtw_mlme_ext.h | 1 - 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/stagin= g/rtl8723bs/core/rtw_mlme_ext.c index 064c9923d..54690c2fc 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c @@ -184,19 +184,6 @@ void init_hw_mlme_ext(struct adapter *padapter) pmlmeext->cur_ch_offset, pmlmeext->cur_bwmode); } =20 -void init_mlme_default_rate_set(struct adapter *padapter) -{ - struct mlme_ext_priv *pmlmeext =3D &padapter->mlmeextpriv; - - unsigned char mixed_datarate[NumRates] =3D {_1M_RATE_, _2M_RATE_, _5M_RAT= E_, _11M_RATE_, _6M_RATE_, _9M_RATE_, _12M_RATE_, _18M_RATE_, _24M_RATE_, _= 36M_RATE_, _48M_RATE_, _54M_RATE_, 0xff}; - unsigned char mixed_basicrate[NumRates] =3D {_1M_RATE_, _2M_RATE_, _5M_RA= TE_, _11M_RATE_, _6M_RATE_, _12M_RATE_, _24M_RATE_, 0xff,}; - unsigned char supported_mcs_set[16] =3D {0xff, 0xff, 0x00, 0x00, 0x01, 0x= 0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}; - - memcpy(pmlmeext->datarate, mixed_datarate, NumRates); - memcpy(pmlmeext->basicrate, mixed_basicrate, NumRates); - - memcpy(pmlmeext->default_supported_mcs_set, supported_mcs_set, sizeof(pml= meext->default_supported_mcs_set)); -} =20 static void init_mlme_ext_priv_value(struct adapter *padapter) { @@ -216,7 +203,26 @@ static void init_mlme_ext_priv_value(struct adapter *p= adapter) =20 pmlmeext->cur_wireless_mode =3D padapter->registrypriv.wireless_mode; =20 - init_mlme_default_rate_set(padapter); + + u8 mixed_datarate[NumRates] =3D { + _1M_RATE_, _2M_RATE_, _5M_RATE_, _11M_RATE_, _6M_RATE_, + _9M_RATE_, _12M_RATE_, _18M_RATE_, _24M_RATE_, _36M_RATE_, + _48M_RATE_, _54M_RATE_, 0xff + }; + u8 mixed_basicrate[NumRates] =3D { + _1M_RATE_, _2M_RATE_, _5M_RATE_, _11M_RATE_, _6M_RATE_, + _12M_RATE_, _24M_RATE_, 0xff + }; + u8 supported_mcs_set[16] =3D { + 0xff, 0xff, 0x00, 0x0, 0x01, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 + }; + + memcpy(pmlmeext->datarate, mixed_datarate, NumRates); + memcpy(pmlmeext->basicrate, mixed_basicrate, NumRates); + + memcpy(pmlmeext->default_supported_mcs_set, supported_mcs_set, + sizeof(pmlmeext->default_supported_mcs_set)); =20 pmlmeext->tx_rate =3D IEEE80211_CCK_RATE_1MB; pmlmeext->sitesurvey_res.state =3D SCAN_DISABLE; diff --git a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h b/drivers/sta= ging/rtl8723bs/include/rtw_mlme_ext.h index e949f5efd..a850675d5 100644 --- a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h +++ b/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h @@ -418,7 +418,6 @@ struct mlme_ext_priv { u8 active_keep_alive_check; }; =20 -void init_mlme_default_rate_set(struct adapter *padapter); void init_mlme_ext_priv(struct adapter *padapter); void init_hw_mlme_ext(struct adapter *padapter); void free_mlme_ext_priv(struct mlme_ext_priv *pmlmeext); --=20 2.55.0 From nobody Sat Jul 25 17:33:43 2026 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 21B67481253 for ; Wed, 15 Jul 2026 12:50:35 +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=1784119839; cv=none; b=koousbcvHYYkrikNU3Juz1gPZrEFbTdqqcKz0L6BeOKu6KX20fz4XhKAWk0lKAZLdXi5nKpc2TSqBXTzaE5fxDBje/uYhYl/ypSOwZNJKOC0ZkysExv2R/2jmRQ/L6cU0o91GUTiiBweS9rZBvYxvH7YorFnGb9LeXK694hmCB4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119839; c=relaxed/simple; bh=yL3MDBeVkAVOB9oDfKbW+0M2Vb7XK/uO0pym0tpxAao=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=plJnUgnpu4flnmDXm4WVhKDwW7DPjHeUkg2cxjbuG07RUYzhZqH4h6l6J5fqEigiWV9ywp6gcFk3Bc3r1oForgbEcahvqoYiSp3dFf4DIYyA1HnYa5WOMl/YCz5+lqkf7ev/60ONLWr4xDURovZeFnCFlzKDhF6q/Lhspl8kYsM= 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=hPjpuZJB; 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="hPjpuZJB" Received: by mail-lf1-f51.google.com with SMTP id 2adb3069b0e04-5aea9d606f0so5627441e87.3 for ; Wed, 15 Jul 2026 05:50:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784119834; x=1784724634; 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=1XiIWCVLfMVYPMIlR/WL0zQsHXtVSv4kGRxUBvVkPwI=; b=hPjpuZJBLl5RNVhAHRURA5F+H30rwWR0mhG0YoZ919QDUnbEKqeaBiU+LX8nC6xPIm JXLX5ORK7easz9gmOoxkgip007wrswWL5v4XBr/Se1e1nzuUUFY47rFAnQrcX81GFA16 EFmtYVsvKHx8fE7Snw10QF8f+kf230D5skGIQIdGrhxfPDIxtux527Ir6zywP7FBmQpX 2Tj9rZn4TcGXuzEcC36Tts6Xv9W4uoKh/CJlxwSmnjKKlQcm3A7xCOR4ij96T3rP1VwY pH3ZYjOivYVhbHPzlYKp4UOq0avgYjpcweZH19GTuHdkaEb2xQ2+9GXoVyfwQqghXZQl WWxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784119834; x=1784724634; 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=1XiIWCVLfMVYPMIlR/WL0zQsHXtVSv4kGRxUBvVkPwI=; b=D+Nfkpb2Vf8DyU8KJLknXViV6u8FvHxfp4Q65KeHl1LbBn8SWfVjsGL1HVnE/Hx/iS 6K4NtK7FdLjYNnvrHvByZuAu/bNUFXcWgeCKGb8g2qA+36KwJ2Lhv9nZ9iLwBbU2qZ2f 9s/s4q63HiK7rblxh/GQKmLrO1iKaeFwjShES2zxr1iUu80CywUxOGVFkdHSU17TQiQx AkkDgyh04167I5BvmKm9psNHBcd/JtEatK8Q2Z4qD0UxsQ8RrSMGAVTgOnY+EdASxBNN C5lVPbJ40oBRiIuva/IwxG2+WYizZCKZP7Oz/ggYDvn1zPdsg71K7sKrNMiA8FKk5q+b f25w== X-Forwarded-Encrypted: i=1; AHgh+RpOGIZwrKSRxIskq2NK2/mrzqej9X3YmxwI8n1JIq47yqSpdnLXyf8UXvIdsyfoclx21+a7ENhvHE8BXU8=@vger.kernel.org X-Gm-Message-State: AOJu0YyWqWFww2HeAK8f0XEM/kN9adIkgn84Urp/pYFNTvG8VjAnnm5O EfryF+W8AQ1dohE0HSdPaK0dI5W+j5yBaQc2Pzqge+JjwbsUeM4WAk6h X-Gm-Gg: AfdE7cmfjk8Fv1V9UcPyYPS+5Aos43ilL+XhnpZo8v87HgS4xFLR24cft6MElAdyGyX 8uyoiAsuFDkNeeH9jSFHPgQGSbalC/G8s4jgbAGfJnmFWAup2hhIPbmxP6vFSrdrnehvh9FHPWD D7wQYS5p0tBw0evoG+T+LJ3vGRMG5/4ycPHmRBrPtfMrOo5HJrt+m4Qfh2TJhSzBSlGDMq7UmFJ 8lzLJKQE+t4lf9H35KmLwuLo9DaL9IoVRAqGjWbOSiUG72W1EBfO7TefYrlTCPUAGwxR3uMRSWG d10wZqDyrLy/gzjW1RNRkgqRkf9zo0DhQ+y2P+Wo1NLVCZasdOHANztQDb7/GZ9mswiY2NCHtAW eFhCtFs2QQMfyU9ke0aj1hxJt8kOWvYlzBYxpFQxqmKul+1V54t13D3bX7gJE19JjlNpHHGXzgE 12GbvVViafAdlvvRyy49Q8lA9b+lD2kiSLAgHrMeutdsY+xamXMMIoTtZAPmv031Na43OOZfLyV qNnmXPLXBpXgrREJPXvafJ9 X-Received: by 2002:ac2:5689:0:b0:5ae:b9b3:8ba8 with SMTP id 2adb3069b0e04-5b15d7c2ef5mr635991e87.57.1784119833531; Wed, 15 Jul 2026 05:50:33 -0700 (PDT) Received: from archlinux ([94.180.44.28]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b022fac999sm3404042e87.55.2026.07.15.05.50.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2026 05:50:33 -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 23/61] staging: rtl8723bs: remove issue_probereq wrapper and rename helper Date: Wed, 15 Jul 2026 19:47:51 +0700 Message-ID: <20260715124829.90290-24-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: quoted-printable Content-Type: text/plain; charset="utf-8" Remove the redundant issue_probereq() wrapper function from rtw_mlme_ext.c, which did nothing but pass fixed default arguments to _issue_probereq(). Simplify the code by renaming the internal _issue_probereq() helper to issue_probereq() and exposing its full signature. Update its only call sites across the driver to pass the required explicit arguments (0, 1, false) directly. This eliminates the useless leading underscore naming convention, reduces unnecessary abstraction layers, and cleans up the MLME extension interface. Signed-off-by: Arsenii Pashchenko --- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 24 ++++++++++--------- .../staging/rtl8723bs/include/rtw_mlme_ext.h | 3 ++- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/stagin= g/rtl8723bs/core/rtw_mlme_ext.c index 54690c2fc..0c5770f09 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c @@ -2357,7 +2357,7 @@ void issue_probersp(struct adapter *padapter, unsigne= d char *da, u8 is_valid_p2p dump_mgntframe(padapter, pmgntframe); } =20 -static int _issue_probereq(struct adapter *padapter, +int issue_probereq(struct adapter *padapter, struct ndis_802_11_ssid *pssid, u8 *da, u8 ch, bool append_wps, bool wait_ack) { @@ -2450,10 +2450,6 @@ static int _issue_probereq(struct adapter *padapter, return ret; } =20 -inline void issue_probereq(struct adapter *padapter, struct ndis_802_11_ss= id *pssid, u8 *da) -{ - _issue_probereq(padapter, pssid, da, 0, 1, false); -} =20 int issue_probereq_ex(struct adapter *padapter, struct ndis_802_11_ssid *p= ssid, u8 *da, u8 ch, bool append_wps, int try_cnt, int wait_ms) @@ -2462,7 +2458,7 @@ int issue_probereq_ex(struct adapter *padapter, struc= t ndis_802_11_ssid *pssid, int i =3D 0; =20 do { - ret =3D _issue_probereq(padapter, pssid, da, ch, append_wps, + ret =3D issue_probereq(padapter, pssid, da, ch, append_wps, wait_ms > 0); =20 i++; @@ -3703,20 +3699,26 @@ void site_survey(struct adapter *padapter) =20 /* IOT issue, When wifi_spec is not set, send one probe req without W= PS IE. */ if (padapter->registrypriv.wifi_spec) - issue_probereq(padapter, &(pmlmeext->sitesurvey_res.ssid[i]), NULL); + issue_probereq(padapter, + &pmlmeext->sitesurvey_res.ssid[i], + NULL, 0, 1, false); else - issue_probereq_ex(padapter, &(pmlmeext->sitesurvey_res.ssid[i]), NUL= L, 0, 0, 0, 0); + issue_probereq_ex(padapter, + &pmlmeext->sitesurvey_res.ssid[i], + NULL, 0, 0, 0, 0); =20 - issue_probereq(padapter, &(pmlmeext->sitesurvey_res.ssid[i]), NULL); + issue_probereq(padapter, + &pmlmeext->sitesurvey_res.ssid[i], + NULL, 0, 1, false); } =20 if (pmlmeext->sitesurvey_res.scan_mode =3D=3D SCAN_ACTIVE) { /* IOT issue, When wifi_spec is not set, send one probe req without W= PS IE. */ if (padapter->registrypriv.wifi_spec) - issue_probereq(padapter, NULL, NULL); + issue_probereq(padapter, NULL, NULL, 0, 1, false); else issue_probereq_ex(padapter, NULL, NULL, 0, 0, 0, 0); - issue_probereq(padapter, NULL, NULL); + issue_probereq(padapter, NULL, NULL, 0, 1, false); } } } diff --git a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h b/drivers/sta= ging/rtl8723bs/include/rtw_mlme_ext.h index a850675d5..ae4c4586f 100644 --- a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h +++ b/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h @@ -539,7 +539,8 @@ void issue_probersp(struct adapter *padapter, unsigned = char *da, u8 is_valid_p2p void issue_assocreq(struct adapter *padapter); void issue_asocrsp(struct adapter *padapter, unsigned short status, struct= sta_info *pstat, int pkt_type); void issue_auth(struct adapter *padapter, struct sta_info *psta, unsigned = short status); -void issue_probereq(struct adapter *padapter, struct ndis_802_11_ssid *pss= id, u8 *da); +int issue_probereq(struct adapter *padapter, struct ndis_802_11_ssid *pssi= d, + u8 *da, u8 ch, bool append_wps, bool wait_ack); s32 issue_probereq_ex(struct adapter *padapter, struct ndis_802_11_ssid *p= ssid, u8 *da, u8 ch, bool append_wps, int try_cnt, int wait_ms); int issue_nulldata(struct adapter *padapter, unsigned char *da, unsigned i= nt power_mode, int try_cnt, int wait_ms); s32 issue_nulldata_in_interrupt(struct adapter *padapter, u8 *da); --=20 2.55.0 From nobody Sat Jul 25 17:33:43 2026 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 E0800481647 for ; Wed, 15 Jul 2026 12:50:36 +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=1784119841; cv=none; b=C0sBr1AI1pdtcn6WvqLtQX9mipoGUxDpFBFWKJpZflsJsKAGCq3PSyko0VfFwnwcUZybUSgXzvp2HVASfDsY5yJ9IKpdMZaneAG1ZG8ZDgjYNwkPIxWqAfzMz2QT7796UEKTopFpVEs9Xk2qarQBhkQLjg/Xu+epbs3gwk+7oeo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119841; c=relaxed/simple; bh=6FEsm9xy2/G5ePTRB9/G5MfuZCJpfgDFjyq6xDkTXBE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=abCgK03oIpliQXld7tGPVVuCLHWgveszILjoF8D6j/B3cp4buZYb1LkDGx6/XVNG7Z/0rvBFtKz++cYyZHui4t6rrnBifEZkzJOoQ2nS3WNCQgwpwzWGV/uupTUa6XDAbiBH9yv3rIFBlX61MYZvDO+N9H+GtK4aS0vImLjJJbc= 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=cFVQntBz; 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="cFVQntBz" Received: by mail-lf1-f51.google.com with SMTP id 2adb3069b0e04-5aebd52488cso5790848e87.2 for ; Wed, 15 Jul 2026 05:50:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784119835; x=1784724635; 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=R4T+BgF6vFyikfScyBULJ8vIlQDG1v6/afOfd/dpITo=; b=cFVQntBzhWuOFZwOIIRGivFsNbHdb9BO3D1NKgrLsa5FGyRn6yHb11M0SL5EE/NBCj KVTmaU+yCtjLAcDsD6wv4NVFnSBC9bIAeS7BLhcwTFGmxBg28dLsMNQsBk5j/VEhA9zs L9LAxVuCG4GKTVSv1k3AStDX35fnxLuqsCcBQFn7tG+kh2MgcQu5t1Ij0zg6bIDgEQD+ pg3VZ7HLt7Q1BwDRImuaA0XsZl7KFgoT3LvuNK04lgYpb+LETvIjcw0V5u6ZFEDxlKEs pwgtj19ntU0IzISUDCLeUOHzf6H8ea2CGr4DwGOoiuolvUfoElbkxFGP5deMjjNQ9HMw 25Wg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784119835; x=1784724635; 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=R4T+BgF6vFyikfScyBULJ8vIlQDG1v6/afOfd/dpITo=; b=WR5FiKDh946XnQ/B65WJh2wReJkOsdEmTQi/N5K22cJ9QJ5XA7Ov+xalqxMzeYgcAD lUloCEE/iT9zUOylIEvdYLl4kecbVMCly0sx7i/rO3bW3vORA0SgMnAGBO5qjbvvz8yp GaZoQHOsApd3S2jYlV+/+aJJm4X/BTvxEBVXZf/A2pEbyS1jts4Wq52F+PaZJTImaUr8 GibsEuvnksCQ+tLdDdCrZT76jVI90KSd5+GfWgSa/3+pOXMZn4ca2FJp0KXMrhOrO0WY YYoaPSXYtAYR7jnuAhfRWrQvXlxO3Sp+f9LgDLKPPh0RpB1oTBoz/xIfr7cmgHbZfNcG uYrQ== X-Forwarded-Encrypted: i=1; AHgh+RpneLz0TCJZWwqigKdy2YqX6KTr0Iyakr93OTCHWizQos8BQp8EUU+kAU4DP3kOcueWwiXzfxzXSt0V3Sc=@vger.kernel.org X-Gm-Message-State: AOJu0Yxo64qpVmC1exYkdlo1MPbTrmJnXU2WDLeRJ5yZeBtPMHBuaRRJ zX3gQcEFrJ49ggMSHRh61NlNdQq5SywccQ+6YPUqYaOsVC3vH/ja5MEk X-Gm-Gg: AfdE7cnqeLiE+uxDf8OZlWesTg77ypE2If9fgNbCN4D8Wuh511i5yvBiOD2+svRZySY WrmJDpWMdZfsaX1igWOHXWnaLd9PuvReUCFAEzlEn/MiwEkA5ko9PoX45P3ed8HnwPToBk4D2mq DLoWjBaguoeQutHD+7TEMu3g9hy+yNImm6NPKEMtt5f4y+ZztYkUdGJxYcYPvRUmPtMLMcWjEbx F6FD/qTSHRybTHPfKJ8u/UJzKNgAW8PKoaoncXxtgTvDIphbwgppibXoVz9FzrsQXKDQOJDMqOO K4TgZzPH4fEPYAwFg3WntGFOq46HFeZNSTb0mxwpjRpy4n0Ucdh17YuO0w9oFEx/mrZ1fUz8lTq nCNjGQGIju9hlvRJYkrpJCENt4HPMYhtQmQ2gMqEj5youneOjSK/xNeSiTRahLgb7OK+vooJzwZ wVYuYeFSH/9xcd9dvziqV93I2j6lVNoLOyzvoVABn9H8G895m4Zc65yNeKli5Nc0JMXMl6HuiC2 1pxszgwgBmdEQ== X-Received: by 2002:a05:6512:3514:b0:5b0:11e5:6bd5 with SMTP id 2adb3069b0e04-5b15d7a945cmr628452e87.40.1784119834393; Wed, 15 Jul 2026 05:50:34 -0700 (PDT) Received: from archlinux ([94.180.44.28]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b022fac999sm3404042e87.55.2026.07.15.05.50.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2026 05:50:34 -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 24/61] staging: rtl8723bs: remove register_task_alive inline helper Date: Wed, 15 Jul 2026 19:47:52 +0700 Message-ID: <20260715124829.90290-25-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: quoted-printable Content-Type: text/plain; charset="utf-8" Remove the redundant static inline helper register_task_alive() from the power control management code. The function provides no additional logic, validation, or locking, acting merely as a wrapper around a standard bitwise OR operation on the pwrctrl->alives bitmap. Replacing it with a direct expression simplifies the driver's power interface. Clean up the inline definition and update all its call sites across the codebase to manipulate pwrctrl->alives directly. Signed-off-by: Arsenii Pashchenko --- drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c b/drivers/staging= /rtl8723bs/core/rtw_pwrctrl.c index 1d6fe3734..c52988cfc 100644 --- a/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c +++ b/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c @@ -667,11 +667,6 @@ static void pwr_rpwm_timeout_handler(struct timer_list= *t) _set_workitem(&pwrpriv->rpwmtimeoutwi); } =20 -static inline void register_task_alive(struct pwrctrl_priv *pwrctrl, u32 t= ag) -{ - pwrctrl->alives |=3D tag; -} - static inline void unregister_task_alive(struct pwrctrl_priv *pwrctrl, u32= tag) { pwrctrl->alives &=3D ~tag; @@ -704,7 +699,7 @@ s32 rtw_register_task_alive(struct adapter *padapter, u= 32 task) =20 mutex_lock(&pwrctrl->lock); =20 - register_task_alive(pwrctrl, task); + pwrctrl->alives |=3D task; =20 if (pwrctrl->fw_current_in_ps_mode) { if (pwrctrl->cpwm < pslv) { @@ -789,7 +784,7 @@ s32 rtw_register_tx_alive(struct adapter *padapter) =20 mutex_lock(&pwrctrl->lock); =20 - register_task_alive(pwrctrl, XMIT_ALIVE); + pwrctrl->alives |=3D XMIT_ALIVE; =20 if (pwrctrl->fw_current_in_ps_mode) { if (pwrctrl->cpwm < pslv) { @@ -834,7 +829,7 @@ s32 rtw_register_cmd_alive(struct adapter *padapter) =20 mutex_lock(&pwrctrl->lock); =20 - register_task_alive(pwrctrl, CMD_ALIVE); + pwrctrl->alives |=3D CMD_ALIVE; =20 if (pwrctrl->fw_current_in_ps_mode) { if (pwrctrl->cpwm < pslv) { --=20 2.55.0 From nobody Sat Jul 25 17:33:43 2026 Received: from mail-lf1-f41.google.com (mail-lf1-f41.google.com [209.85.167.41]) (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 1FADC47B410 for ; Wed, 15 Jul 2026 12:50:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119844; cv=none; b=VwTRVLXR2z0zgVEcx3UsfAOtj7IiGUxNLohnT+x3XPfuWRLlFdk4dvrs8IYZwvNje4BF0RwucfAAYYdUDcq0YPxfiqTQy6Ray0SopTMWiwgFzu2jKMJMgTbzSiIahoRbuDTi4KoBBiOVc4WTcFnEhitudg8zTsefRXhXl10ysCs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119844; c=relaxed/simple; bh=tRipzmLpOCevwuknURNOpBvPuJZmD+gFPvi10SppIGA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CKLXx8kNg1oTa1p1Nsx8tV4s806WOKJ+GXO6fUkf0U5IKkXujcmEV0cEflUsn3YH7aid7yFNmSwFXH0S/bWLYK1EXcxTGz6HNsSiDh2xWsg2N0XDLkQq50xfLk3qfvk6B0gffv8EzQPmMg4zw9hX8XUcVmXSlHhanLDCbWd3MGs= 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=tDwR9eSU; arc=none smtp.client-ip=209.85.167.41 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="tDwR9eSU" Received: by mail-lf1-f41.google.com with SMTP id 2adb3069b0e04-5aea9d606f0so5627468e87.3 for ; Wed, 15 Jul 2026 05:50:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784119835; x=1784724635; 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=IfjYa8DESgLZHi2LJ4dhLFuZRUwHsIA52JsmeA7NWRU=; b=tDwR9eSUhOcTHyzmqyIs9cZOft091HyUW2n2ybdnVPs889YPtglw7DvxJ3/QiWbjY9 nzNKWHFbPgX4UHYXrMNr2mFZcq0/+JmfCwr+DmaX6yIQSTZStNc2VOEIM6Dx/qq61Hbq XwwJnVbrZckSZs+nxKfa7CWl+WV+eN9Q7L2kknu6vFciDKHxhoIody1AT8Ix30ae1S7o c8RrEEMbzR+5AtSY+6luhJOv2CDhunL0Ykg1cVVRTGjov5R2L3XVamFPqnNNtSObG/F1 +bJ6q/VAddispA+42/nINKKM8eBel81qreALy4CYG/VuuzzGN5Av55XyT0QclL8YKtK5 FV7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784119835; x=1784724635; 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=IfjYa8DESgLZHi2LJ4dhLFuZRUwHsIA52JsmeA7NWRU=; b=lMTrq2vA3+ECVNeRenjY70Ee1CLXQLEWBJR/HSmNiEFYGLsU0ekPiw0FRtNt+ttofv WtY9RTuGHdgYL4LyMXy2BjAAqff2oKxUtyjGt3lR5QndsST8z0HX7iEd150QDsTx5usj BklypLc4E+wKuwRnE35gAu6d3nLgCjpv/OMlz0SRdpobQmZuXOcML6T4wirRnCmYR92Q 6PUjltfOQuQTB6MjNPTacP58tv75Px//MFCirobxVJeWGEpTu3l0e/Du+ZeSgBezB0eS 1ROl7miDmeMvQFAEJPsxORxoiG43J9W+81gBiBAfrqjS0rPcrVvkv4Q5hrpMfuWssJnE 0mmA== X-Forwarded-Encrypted: i=1; AHgh+RpTKmuU34uQdW8wA7rv2u23X03Gsx5lyf0uLEUSmw5L9mY+bpo/t7NWuAv9ZSBZlQNlRyGHNt19iJw/Nc4=@vger.kernel.org X-Gm-Message-State: AOJu0YzqdAzu2Vog+4agT3XzXknFUNmTJfC2C6UqouO7LcxBw80UEID/ d0Zep1eJhilJU+DFCRj6OMkGhg/PCSAsJAmlESOGN1O1s/LF5M76e8cU X-Gm-Gg: AfdE7cnXb82c9bhukEGv60TJnwAEqgYj2rg41CdVUClySbSPHgUYn9uCn6s+YRjEWWw ldOmYrc3X0zdIgKwvIeoaD4aRHJY2DFL5PhHrbqgkCjr8IONNn9FkaPCAIfynhdIAalXJVKpNPU 3qiAlcNIXlvMNyBjWxpkGcHMShf5URZPe9bHbzqhnXLOKHVJe9nziGmyS2NUkTsCI4pdYXxtpm2 +FAOkm4Jk7FXTqQTW9Xf6ht6KWJznu551xSCKygNgmApHECMosy7KfXNHLnsYPfJi643l1/X2NI +t2DhxDPMtzbsVyGRuD5VQqMHlp+VU40ONqbTbqLQzPcnjJsOIemfYhevzaipwilsm7kHnIJM9I RcXDF9t+XNy1u2+E6c6fmt/HFlHpIWfl6v6Cw7ZoHTOjkPREhEfjs6qDcFigc8UPAW05ayM/QQ7 zjbhKSs9cN1Dzb22v+q+xc+qB2gYheueCmthXfXaBR3cPuFXGVlmYPXZLiPyrOcJxm+HENUKneD coMOUZRKL20GA== X-Received: by 2002:a05:6512:66da:b0:5aa:6f0e:8404 with SMTP id 2adb3069b0e04-5b15d782523mr462324e87.21.1784119835167; Wed, 15 Jul 2026 05:50:35 -0700 (PDT) Received: from archlinux ([94.180.44.28]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b022fac999sm3404042e87.55.2026.07.15.05.50.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2026 05:50:34 -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 25/61] staging: rtl8723bs: remove unregister_task_alive inline helper Date: Wed, 15 Jul 2026 19:47:53 +0700 Message-ID: <20260715124829.90290-26-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: quoted-printable Content-Type: text/plain; charset="utf-8" Remove the redundant static inline helper unregister_task_alive() from the power control management code. The function provides no additional logic, validation, or locking, acting merely as a wrapper around a standard bitwise AND-NOT operation on the pwrctrl->alives bitmap. Replacing it with a direct expression simplifies the driver's power interface. Clean up the inline definition and update all its call sites across the codebase to manipulate pwrctrl->alives directly. Signed-off-by: Arsenii Pashchenko --- drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c b/drivers/staging= /rtl8723bs/core/rtw_pwrctrl.c index c52988cfc..a15f3ee9b 100644 --- a/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c +++ b/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c @@ -667,11 +667,6 @@ static void pwr_rpwm_timeout_handler(struct timer_list= *t) _set_workitem(&pwrpriv->rpwmtimeoutwi); } =20 -static inline void unregister_task_alive(struct pwrctrl_priv *pwrctrl, u32= tag) -{ - pwrctrl->alives &=3D ~tag; -} - /* * Description: *Check if the fw_pwrstate is okay for I/O. @@ -747,7 +742,7 @@ void rtw_unregister_task_alive(struct adapter *padapter= , u32 task) =20 mutex_lock(&pwrctrl->lock); =20 - unregister_task_alive(pwrctrl, task); + pwrctrl->alives &=3D task; =20 if ((pwrctrl->pwr_mode !=3D PS_MODE_ACTIVE) && pwrctrl->fw_current_in_ps_= mode) { if (pwrctrl->cpwm > pslv) { @@ -874,7 +869,7 @@ void rtw_unregister_tx_alive(struct adapter *padapter) =20 mutex_lock(&pwrctrl->lock); =20 - unregister_task_alive(pwrctrl, XMIT_ALIVE); + pwrctrl->alives &=3D XMIT_ALIVE; =20 if ((pwrctrl->pwr_mode !=3D PS_MODE_ACTIVE) && pwrctrl->fw_current_in_ps_= mode) { if (pwrctrl->cpwm > pslv) @@ -910,7 +905,7 @@ void rtw_unregister_cmd_alive(struct adapter *padapter) =20 mutex_lock(&pwrctrl->lock); =20 - unregister_task_alive(pwrctrl, CMD_ALIVE); + pwrctrl->alives &=3D CMD_ALIVE; =20 if ((pwrctrl->pwr_mode !=3D PS_MODE_ACTIVE) && pwrctrl->fw_current_in_ps_= mode) { if (pwrctrl->cpwm > pslv) { --=20 2.55.0 From nobody Sat Jul 25 17:33:43 2026 Received: from mail-lf1-f44.google.com (mail-lf1-f44.google.com [209.85.167.44]) (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 C34BF477E42 for ; Wed, 15 Jul 2026 12:50:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119842; cv=none; b=ONx/5orZWAFGfuh84mPWjISLh8svt1DiWlRLQLQlIYg59dxPvp8sVvgPUFvgwbeu1T47gwe/lcjtoHNsdPYFHA71norB4pNg74/+gqLoe0cWtGewJO+oJXS6UBY9Vyr1dMmFG3r3d7rsFnzxk1B5wf6pvLajrB7fUsH46BhUF/A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119842; c=relaxed/simple; bh=W1kfFFf1UUPfOfx0z2bPSwVddljx+aBrFAOom2o0kOc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Kju87noNr03I66TbIvcOAetX8z9gFCMkHK9F5U77PjNjomUCM6jftR6/RFFtqzWJCQ7HTPslV/VFnQl+4nANwKbLevGeZbRA9WwqO5HMehXMlHwvIM6qqXR7Rt+ads17pInNs26+MAfUgLgwwlTfwENdqxpUHdEbi1XSZ37KRlk= 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=XyhQamXu; arc=none smtp.client-ip=209.85.167.44 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="XyhQamXu" Received: by mail-lf1-f44.google.com with SMTP id 2adb3069b0e04-5aeb5e85378so5765922e87.1 for ; Wed, 15 Jul 2026 05:50:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784119836; x=1784724636; 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=Om3ALfTPaVgmdWBb4RekgbtnCb4GzAeqiusNpd+QUcM=; b=XyhQamXuW8lqAqm8zWXnA6C0Mhg5aHdJIvCNSYwHM3ovPz/luf70/qkdYinirlmgoB rU857Bjx+/2mR3eCZVmuo3t2FKfnAsi7RWnuJpMQbcBGXKFDHhUdrHzGsd++ZV5qRr97 wTYzxB8VXptXKgU/xlFAvtJn5wTkDoNBwvZzB8i4VChJVIOUb8ibEzf3z9wrgw/JMVwb WmKmOHVkH8PloaygWHqPUKP6EyyuWRZ8eXPK0+zyG4YKTHXYC6qDSn4l4SCyAGoAgJr4 ljPESnPg+FqeL3rWt6uuG39ajU1K/DR5sZ+Nsvgag7fZy5ikzbKmJKixn9c7m4HGnlKf ZT0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784119836; x=1784724636; 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=Om3ALfTPaVgmdWBb4RekgbtnCb4GzAeqiusNpd+QUcM=; b=qGSh1t/UNTDOlvrewvTUcNCJ+JPxKY8lUeM9zrhHbD5PkeaZ8vy8RvMKxpncv638JF FhTs0BruiqVAuFfn1R7E6x8Syw9P6EPdPMURxTNTAmCXHXyAHLs0rzO9OBE73xXXzlc3 gnZDGrlNOk6o4UJnpetilQ24SUgZzeg33HTjt+j2SINDlN433ytL2vbFoNM/jFoUk/Vw HcPlF16gQfjS8WQy/SC2aRuZP36iB8gxCdQTZQBRySAh2C27N8wSGWmbAqeKyq6P0nVp 8N0JB+pIoWUbr3L1h/sfCGly5vmoBtZ43X/HFCD/yhXJ9RD2eZgaUBP3uPQl0pPotjjn 2dlg== X-Forwarded-Encrypted: i=1; AHgh+RpsXA5nHBZe2DECLHVludWJz967+nVyN3Dd/ZKQi31ePnE3J3GmUhIg3lVHoZc6nrAOmadK4ecVp1lTtNU=@vger.kernel.org X-Gm-Message-State: AOJu0Ywb+ww09yypEvQpo2eAWRCvbGjMMsvS4U9OPvdE8SQ4mZLf3H3M EkcXsq6d+c5i+ikovk4mBJTHzfHKsqtAFWpJdt68tAeQyotV+HRMrsEsFX3nQLLmWwo= X-Gm-Gg: AfdE7clHYpyCF3AWdQ65LfA1ymgTAzYwUA1Ax2zBkDCdog/mNbVA3ZOiC96PYbFBQ54 d58DQmowHT4CeYlbPnkLrVU1365l2ZZ5UaoX3t0Vfh9vKdmbG5Pp2znA/TBZc0P/BCqsfEk64nQ vLaKESpqEK/+xEvrHXeFv964U7PFIIxEM2uHhwwCJDyig/8vRKMI+EIx065aBPTIzTPRMuj9A3z Ir8QaNb4V0QB6zRV0JIeqaC6wfqXmEnSFWJSx9bK2+Va/HyrTN7ndRU5idGA43AQpBZBMWQqVdB QDtMiMaYLrS8++4JTINENl5YZtCTMZeZT3rHuNJzb8VPrBUrMB6s4jCnVYLKdDpF5xR7XmbutkP 2FdPPb2dls220xdz2s1TeHYfF9Vn2fSKG81iG2g44Ixnsq/7IlJV9KvwWO6KHHAlL2MMS+b9JhY Ig50/VgIwbhM8QX9W+ZEGD75Osj/le2x+Bp7nK7AMmlj4o+xtzeSNCdXhDC4XaIUHggNL2XL12E KaTiJvjbCKqKQ== X-Received: by 2002:a05:6512:3a8d:b0:5ae:d80f:c77c with SMTP id 2adb3069b0e04-5b159b8410bmr1494206e87.30.1784119835984; Wed, 15 Jul 2026 05:50:35 -0700 (PDT) Received: from archlinux ([94.180.44.28]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b022fac999sm3404042e87.55.2026.07.15.05.50.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2026 05:50:35 -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 26/61] staging: rtl8723bs: clean up Michael MIC pseudo header logic Date: Wed, 15 Jul 2026 19:47:54 +0700 Message-ID: <20260715124829.90290-27-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: quoted-printable Content-Type: text/plain; charset="utf-8" Clean up the single-use Michael MIC calculation logic. Simplify the priority array initialization to a standard zero-initializer and pass the array directly instead of using the redundant address-of-first-element (&priority[0]) syntax. This reduces visual clutter and aligns the block with modern Linux kernel coding practices without introducing an unneeded helper. Signed-off-by: Arsenii Pashchenko --- drivers/staging/rtl8723bs/core/rtw_recv.c | 27 +++++++++++++++++- drivers/staging/rtl8723bs/core/rtw_security.c | 28 ------------------- .../staging/rtl8723bs/include/rtw_security.h | 8 ------ 3 files changed, 26 insertions(+), 37 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_recv.c b/drivers/staging/rt= l8723bs/core/rtw_recv.c index 78bd04982..cad44923b 100644 --- a/drivers/staging/rtl8723bs/core/rtw_recv.c +++ b/drivers/staging/rtl8723bs/core/rtw_recv.c @@ -378,7 +378,32 @@ static signed int recvframe_chkmic(struct adapter *ada= pter, union recv_frame *p pframe =3D precvframe->u.hdr.rx_data; payload =3D pframe + prxattrib->hdrlen + prxattrib->iv_len; =20 - rtw_seccalctkipmic(mickey, pframe, payload, datalen, &miccode[0], (unsi= gned char)prxattrib->priority); /* care the length of the data */ + /* care the length of the data */ + struct mic_data micdata; + u8 priority[4] =3D {0}; + + rtw_secmicsetkey(&micdata, mickey); + priority[0] =3D (unsigned char)prxattrib->priority; + + /* Michael MIC pseudo header: DA, SA, 3 x 0, Priority */ + if (pframe[1] & 1) { /* ToDS =3D=3D 1 */ + rtw_secmicappend(&micdata, &pframe[16], 6); /* DA */ + if (pframe[1] & 2) /* From Ds =3D=3D 1 */ + rtw_secmicappend(&micdata, &pframe[24], 6); + else + rtw_secmicappend(&micdata, &pframe[10], 6); + } else { /* ToDS =3D=3D 0 */ + rtw_secmicappend(&micdata, &pframe[4], 6); /* DA */ + if (pframe[1] & 2) /* From Ds =3D=3D 1 */ + rtw_secmicappend(&micdata, &pframe[16], 6); + else + rtw_secmicappend(&micdata, &pframe[10], 6); + } + rtw_secmicappend(&micdata, priority, 4); + + rtw_secmicappend(&micdata, payload, datalen); + + rtw_secgetmic(&micdata, &miccode[0]); =20 pframemic =3D payload + datalen; =20 diff --git a/drivers/staging/rtl8723bs/core/rtw_security.c b/drivers/stagin= g/rtl8723bs/core/rtw_security.c index a4a4f0e6d..6f3069498 100644 --- a/drivers/staging/rtl8723bs/core/rtw_security.c +++ b/drivers/staging/rtl8723bs/core/rtw_security.c @@ -196,34 +196,6 @@ void rtw_secgetmic(struct mic_data *pmicdata, u8 *dst) secmicclear(pmicdata); } =20 -void rtw_seccalctkipmic(u8 *key, u8 *header, u8 *data, u32 data_len, u8 *m= ic_code, u8 pri) -{ - struct mic_data micdata; - u8 priority[4] =3D {0x0, 0x0, 0x0, 0x0}; - - rtw_secmicsetkey(&micdata, key); - priority[0] =3D pri; - - /* Michael MIC pseudo header: DA, SA, 3 x 0, Priority */ - if (header[1] & 1) { /* ToDS =3D=3D 1 */ - rtw_secmicappend(&micdata, &header[16], 6); /* DA */ - if (header[1] & 2) /* From Ds =3D=3D 1 */ - rtw_secmicappend(&micdata, &header[24], 6); - else - rtw_secmicappend(&micdata, &header[10], 6); - } else { /* ToDS =3D=3D 0 */ - rtw_secmicappend(&micdata, &header[4], 6); /* DA */ - if (header[1] & 2) /* From Ds =3D=3D 1 */ - rtw_secmicappend(&micdata, &header[16], 6); - else - rtw_secmicappend(&micdata, &header[10], 6); - } - rtw_secmicappend(&micdata, &priority[0], 4); - - rtw_secmicappend(&micdata, data, data_len); - - rtw_secgetmic(&micdata, mic_code); -} =20 /* macros for extraction/creation of unsigned char/unsigned short values = */ #define RotR1(v16) ((((v16) >> 1) & 0x7FFF) ^ (((v16) & 1) << 15)) diff --git a/drivers/staging/rtl8723bs/include/rtw_security.h b/drivers/sta= ging/rtl8723bs/include/rtw_security.h index 22eec2215..5bad48ed6 100644 --- a/drivers/staging/rtl8723bs/include/rtw_security.h +++ b/drivers/staging/rtl8723bs/include/rtw_security.h @@ -249,14 +249,6 @@ void rtw_secmicappendbyte(struct mic_data *pmicdata, u= 8 b); void rtw_secmicappend(struct mic_data *pmicdata, u8 *src, u32 nBytes); void rtw_secgetmic(struct mic_data *pmicdata, u8 *dst); =20 -void rtw_seccalctkipmic( - u8 *key, - u8 *header, - u8 *data, - u32 data_len, - u8 *Miccode, - u8 priority); - u32 rtw_aes_encrypt(struct adapter *padapter, u8 *pxmitframe); u32 rtw_tkip_encrypt(struct adapter *padapter, u8 *pxmitframe); void rtw_wep_encrypt(struct adapter *padapter, u8 *pxmitframe); --=20 2.55.0 From nobody Sat Jul 25 17:33:43 2026 Received: from mail-lj1-f180.google.com (mail-lj1-f180.google.com [209.85.208.180]) (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 7CFFE481252 for ; Wed, 15 Jul 2026 12:50:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119844; cv=none; b=GG17zdokNxMl6o6xLS7kT/C0fU61ANAUeWToGiFjntiJCdjdy2aegfF+3ATfb11iy+9gYQpujWishi9wqIZPgKVWvQXUXrSrOGDSu3jBCBvyzNUBhn5LA5emHlPsFeSn3Qeb+V/AMcAhYwcesU3RJII3O7BGZVz7rmsroy7QJlY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119844; c=relaxed/simple; bh=2Dgf8HyAsawosrrXRnK2QIVNgW2NN2lADqyUxbdOPos=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Z4eTzw81WbxycLoKZUGPf51hlGgquyaYSrLZpEs1jwGpisfSj+6YzT8ycniDqt3Z83Qv7laWs59ORbN5YO2gAT+05yTx2wLqMGLoYlZGOD4sdw9uJEHNW2ud8wb5EJSOj9RmrI/qY7reFAQvYqKq+gGaSeHG4X/GkGXSxH63BsY= 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=gnFWJe8h; arc=none smtp.client-ip=209.85.208.180 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="gnFWJe8h" Received: by mail-lj1-f180.google.com with SMTP id 38308e7fff4ca-39669bcaadfso21142511fa.0 for ; Wed, 15 Jul 2026 05:50:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784119837; x=1784724637; 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=nMEuJlfO+SP8MWqJmA/pbwlftlH0vhRr0hh+YpswdiI=; b=gnFWJe8h/JJW+1veK3+HAZjMIoLHZc40lB+JanpOVRPFrkMeHUDJHC+wvdkGhrp52W p1sncUmnBDUrdTNN4LyOrZgKb4I3JYkcsOQ6iX+OzguSDDRjf4uKO0nYB4YQTq1YrbHF knBsRIsXG+oQmKHDNUPvMu+jvX6DnWSO/Cp18Ro+1TkBSzmFdveSsEfmQQt+gyzpVqXv iyPcd9qeHz7+IDRsdSIl4OcwQLBvZvAsK+uDGTNw7XNiG4rllN4x+kOlpMugcQkAwfrr 4kBEvFbdwFU0UFI8iOWzU9ylQPwl5vN+ePIjH64BZxJTYROSbMfTXMNg/0drRLRs5E+h NSsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784119837; x=1784724637; 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=nMEuJlfO+SP8MWqJmA/pbwlftlH0vhRr0hh+YpswdiI=; b=KawD9opv9ByXkbFf3TK1EGBp6eZr0dX5Pe5hRON+tDrpkJPL9cU2KgRNBYjA7jwCFg JDXLOjQH2JeVHXVpLc6mwUyfWtsfE7OAKPGWwXeSlUETd/foXyAhvKZVhZ2t1ViBw1Fa 42cOJLruTRcdoYBERVXHT8Udcmr08M2/e4zICxTeoIjK5VpBQxU+L/n7FBSoZjp3k1Wt DaOmVxHSv1UTfnJ6NnN0wo+l0/xeyvAXkXE1jUnS/AAohTSXGPvJsh8rdXpVLgznxZK9 Utiq2unnlT06pCtbhsLin1hP+TbX7LKjX8eAQZk1ZJuOS3izaqpHgFuzORAtOCRM8bqt ZwjA== X-Forwarded-Encrypted: i=1; AHgh+RotVCjBGR3+VMrNx5JTzsqiqISCPKq8d017zKI6YgcwpczpFH2OEyNtEMfguG+sZaznN7Dr4Vwcy3c2cBk=@vger.kernel.org X-Gm-Message-State: AOJu0YymsFgVTdlyQ7k+aCrqkzIQlfCGG1H64yP1mBoqi7VSWJdO7H6t 0MyQoHM0tS8PB4rtgSdq4nfTT17YRgZThRZhFi0d2GX+k7NB0mg0ymco X-Gm-Gg: AfdE7cmrCDj05p1fo57VkGfgifBen0qqvO673HsRnvl5wXiyFfaZT7dRuQOL+bEViV4 aRkKwZK5YNxsj+0rdjyWS05snyuudQEqAZphHmUzckeNCvsJYDe8Hncdc6GMZkYvn0eJrPnrv64 +JU/KoKdi9GIUtfxEsW0TLmWu3h+eO6WtBJzST2z9gEjtPKaSNDv4z4oNxu5jhMds/jBxU/W+87 QnbWAd9Zl4+UJZCrDEQ7PBFmEX2rJJ1lU610/SW7bFtLy+l2wuaJj2Z2Mf84oDR2igtZ8D2frkw t4VbPMZ+OlK2mWX7hqHdmLrvMmld7fTKhy+r49WTaFlvcfpELZMOYUOWMtUXION79Ybc+h4J1+X rBP9YGYvVpgqZR64wHny4VJ7Uj+FS7x1A9H2RRa39F9gyRonAN4ALwVRP3mdiEukEfz455eAwQG mIQ+6hlUPfSkVseJBsXOWTGDF11BxXemhlaBcaIDKTLMYlzP9XZ36JmPuyYcZwXLsAUdCH9qCOl AIvCLuw0TJyjP470vOyFHsR X-Received: by 2002:a05:6512:3409:b0:5b1:5ec2:45b3 with SMTP id 2adb3069b0e04-5b15ec24699mr502501e87.59.1784119836882; Wed, 15 Jul 2026 05:50:36 -0700 (PDT) Received: from archlinux ([94.180.44.28]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b022fac999sm3404042e87.55.2026.07.15.05.50.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2026 05:50:36 -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 27/61] staging: rtl8723bs: replace rtw_set_oper_bw with direct assignment Date: Wed, 15 Jul 2026 19:47:55 +0700 Message-ID: <20260715124829.90290-28-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: quoted-printable Content-Type: text/plain; charset="utf-8" Remove the redundant rtw_set_oper_bw() wrapper function from rtw_wlan_util.c and replace its call sites with direct structure member assignments. The helper provides no extra logic, locking, or validation, acting solely as a setter for adapter_to_dvobj(adapter)->oper_bwmode. Removing it reduces unnecessary abstraction layers and simplifies the driver interface. Clean up the function definition, remove its prototype from the header file, and update all invocations across the driver. Signed-off-by: Arsenii Pashchenko --- drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 14 ++------------ drivers/staging/rtl8723bs/include/rtw_mlme_ext.h | 2 -- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c b/drivers/stagi= ng/rtl8723bs/core/rtw_wlan_util.c index f610fa5b3..053861f29 100644 --- a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c +++ b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c @@ -260,16 +260,6 @@ inline void rtw_set_oper_ch(struct adapter *adapter, u= 8 ch) dvobj->oper_channel =3D ch; } =20 -inline void rtw_set_oper_bw(struct adapter *adapter, u8 bw) -{ - adapter_to_dvobj(adapter)->oper_bwmode =3D bw; -} - -inline void rtw_set_oper_choffset(struct adapter *adapter, u8 offset) -{ - adapter_to_dvobj(adapter)->oper_ch_offset =3D offset; -} - u8 rtw_get_center_ch(u8 channel, u8 chnl_bw, u8 chnl_offset) { u8 center_ch =3D channel; @@ -317,8 +307,8 @@ void set_channel_bwmode(struct adapter *padapter, unsig= ned char channel, unsigne =20 /* saved channel/bw info */ rtw_set_oper_ch(padapter, channel); - rtw_set_oper_bw(padapter, bwmode); - rtw_set_oper_choffset(padapter, channel_offset); + adapter_to_dvobj(padapter)->oper_bwmode =3D bwmode; + adapter_to_dvobj(padapter)->oper_ch_offset =3D channel_offset; =20 rtw_hal_set_chnl_bw(padapter, center_ch, bwmode, channel_offset, chnl_off= set80); /* set center channel */ =20 diff --git a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h b/drivers/sta= ging/rtl8723bs/include/rtw_mlme_ext.h index ae4c4586f..4b05779f2 100644 --- a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h +++ b/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h @@ -439,8 +439,6 @@ void Switch_DM_Func(struct adapter *padapter, u32 mode,= u8 enable); void set_msr(struct adapter *padapter, u8 type); =20 void rtw_set_oper_ch(struct adapter *adapter, u8 ch); -void rtw_set_oper_bw(struct adapter *adapter, u8 bw); -void rtw_set_oper_choffset(struct adapter *adapter, u8 offset); u8 rtw_get_center_ch(u8 channel, u8 chnl_bw, u8 chnl_offset); unsigned long rtw_get_on_cur_ch_time(struct adapter *adapter); =20 --=20 2.55.0 From nobody Sat Jul 25 17:33:43 2026 Received: from mail-lf1-f53.google.com (mail-lf1-f53.google.com [209.85.167.53]) (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 B5E54480DDE for ; Wed, 15 Jul 2026 12:50:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119845; cv=none; b=NSgJq6aTVMQurXrzay+ts/DvCZMYXU4fBbck70VCI5BEHcvFWE/ZEsnU3KrdiG6gNsbqcdrhl6d6CAoNBjKjCACWhI0tVW7gdCeINUxRisG12rHmhBx8boiUrtqd+VCzzzddMfl9T019lfpraSEYX+gqB1KfwnjKQo51xnVTtNc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119845; c=relaxed/simple; bh=cPk5o9xZQlZRpoDRRXFcK94zW/JW9mx4H5C7vF0GpXU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kljk911GCHU63CmpqFaZqaxTzLxB/2heOvXep4SEYRenseZnUVeQmOROBWMdZ0uWpcgUc0qhaVVRYE/s4LehPss/C40WeyZNJ3wDGqd2GOh05Dim4tmTNFF+f2tisQ0mm1wnH7Y7/LiFTFvxKEg9kBaJsfH+m5PcvZEldv91GQk= 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=CubTI8uV; arc=none smtp.client-ip=209.85.167.53 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="CubTI8uV" Received: by mail-lf1-f53.google.com with SMTP id 2adb3069b0e04-5b14d1f9315so3760346e87.2 for ; Wed, 15 Jul 2026 05:50:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784119838; x=1784724638; 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=nnEmABn36nReF54sXLFaE23DbbF9DMEhTK4qKYnVCLM=; b=CubTI8uVGmd6yf9qIah5ET2au//r5sHKJxxhkV00THXTQoJub0ClpHv8u6xQSXmx7G oPUDgomIgfJUUnqm4gE0V6vaZr4r/t+TqBt7HP6om74gT+x+VR1wWZjC+vr87pZTMZ7e by9FmI+WEPUCxxOUHB9AJnO8nCYzFF6PXdDGk9fYIhQlXVtPFEOQzMqTr6Jpzkrd87Ix qWz5bXYBrz1HZA6DAa/1tZpuNd4eOSMMbALbKrPE7sKdv77aRFSefA82HjRtCIaWIkMS zLncaqOaqulZNoE5li2h3FWd3kPG9cAa8esUOTh++sik5AFvAmBVIcpC0daWC4CisRHh paQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784119838; x=1784724638; 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=nnEmABn36nReF54sXLFaE23DbbF9DMEhTK4qKYnVCLM=; b=knRKNUKXQydKQCtk9cm5VFGdg5NsAqaMxaJ+pSrsWGonvKn4XoObOhatPp9hJxglPc DnlJzgyfZdGgkqCiPwVh9EW4fw948Vq/mHjauqFqiaz19R39MYEBKG/aIKgKiB+UGhqm cbGZlGpj9Rl3te7jG53R9U3GZQTtEnJBOz6/8UXS7GGc+j8wCLLieNgRZ/IhcorbaZD6 cfW9MDIuGWcYX9bgVUZ9Z5DjhRArHqKdjbVNACdMhH/VpyR8LNJlXaQlOk6IoIxkvzwE WWutKgyYGcOI0zOiev7d4H4Js4dA5tEs8AqD1BcwmMYwXiJvRdj8QVGlPJMDU7NalLCe manQ== X-Forwarded-Encrypted: i=1; AHgh+RrZaqy9eLBn6z++xA2c5VTwZMlhTCa8gkX0o9sM++m1YwS6HFUpTUbk4o5pNiXEZrQnMbYuAQxh6sf7tB4=@vger.kernel.org X-Gm-Message-State: AOJu0Yzwdjf+bn6BjiBnojtFu1BttGucZrbQGEMrTn/bn1uyNiXLF8VD y35CAPIO5W2vJjre5Bi02lGcUpZBpj7cAGpU0acPl2RknHxXXZNe69gG X-Gm-Gg: AfdE7cmzoBZsD4iwBNzTpzwcEz1uZ6PZEtXtk925nOPMYCXJ9BTHs16sJtmrHhg/Aee hWtiqzJlxkpu/6hExKmtGcqmiWPzDm+V9qW9y6wgc1CBfpiA+Z6ooeNpB4yn3tGZawWuvER4gvs CBhHuYS0SPQGoXTfDjP9wNaIQN8ASsv+GRprGWAbRmftk9udVBsuPCZWXw3AJI/zzZWbwfDzWWn uEJz5o1lEvbe8atro7xC0A0gfC0pHHJEb6XiAy+9wFEZQLIS2QYBZClheCb9RGkZ5J0wh/qXLZd bHcuV6Yvijzl4LHGkzhKqj4Gycj2I1f0JpQTtvFwsstqYS61zQn9KYWf1I6CbOnc21UEIsZCIcY p8wnOVRYDD5r2K9/ctnRzm13SBxr3utt/Cn80Jx9N9auPZWA3Xd4negOMU54lB77PJS8rDryHTj im6MzSxZCV9kYvVhsOfDFGquP7fxMMzH+GSndO+HTcO6qwE0h9khH8qPs76XbEykhXYb9cobQkQ Z41rLJdZCRCew== X-Received: by 2002:ac2:47ec:0:b0:5b0:15b1:3d4b with SMTP id 2adb3069b0e04-5b1582a34bfmr1173162e87.37.1784119837670; Wed, 15 Jul 2026 05:50:37 -0700 (PDT) Received: from archlinux ([94.180.44.28]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b022fac999sm3404042e87.55.2026.07.15.05.50.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2026 05:50:37 -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 28/61] staging: rtl8723bs: inline single-use _clear_cam_entry helper Date: Wed, 15 Jul 2026 19:47:56 +0700 Message-ID: <20260715124829.90290-29-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: quoted-printable Content-Type: text/plain; charset="utf-8" Remove the _clear_cam_entry() helper function since it has only a single call site across the driver. Inline its logic directly into the sole invocation site and modernize the array declarations. Replace the verbose 'unsigned char' types with the standard kernel 'u8' type, and swap the explicit hexadecimal zero sequences for clean, fixed-size bounds with zero-initializers ({0}). This eliminates an unnecessary abstraction layer, reduces visual noise, and cleans up the driver's CAM management path. Signed-off-by: Arsenii Pashchenko --- drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 13 ++++--------- drivers/staging/rtl8723bs/include/rtw_mlme_ext.h | 1 - 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c b/drivers/stagi= ng/rtl8723bs/core/rtw_wlan_util.c index 053861f29..c85055687 100644 --- a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c +++ b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c @@ -423,14 +423,6 @@ void _write_cam(struct adapter *padapter, u8 entry, u1= 6 ctrl, u8 *mac, u8 *key) } } =20 -void _clear_cam_entry(struct adapter *padapter, u8 entry) -{ - unsigned char null_sta[] =3D {0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; - unsigned char null_key[] =3D {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0= x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; - - _write_cam(padapter, entry, 0, null_sta, null_key); -} - inline void write_cam(struct adapter *adapter, u8 id, u16 ctrl, u8 *mac, u= 8 *key) { _write_cam(adapter, id, ctrl, mac, key); @@ -439,7 +431,10 @@ inline void write_cam(struct adapter *adapter, u8 id, = u16 ctrl, u8 *mac, u8 *key =20 inline void clear_cam_entry(struct adapter *adapter, u8 id) { - _clear_cam_entry(adapter, id); + u8 null_sta[6] =3D {0}; + u8 null_key[16] =3D {0}; + + _write_cam(adapter, id, 0, null_sta, null_key); clear_cam_cache(adapter, id); } =20 diff --git a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h b/drivers/sta= ging/rtl8723bs/include/rtw_mlme_ext.h index 4b05779f2..2b8df2bdb 100644 --- a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h +++ b/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h @@ -449,7 +449,6 @@ unsigned int decide_wait_for_beacon_timeout(unsigned in= t bcn_interval); =20 /* modify HW only */ void _write_cam(struct adapter *padapter, u8 entry, u16 ctrl, u8 *mac, u8 = *key); -void _clear_cam_entry(struct adapter *padapter, u8 entry); =20 /* modify both HW and cache */ void write_cam(struct adapter *padapter, u8 id, u16 ctrl, u8 *mac, u8 *key= ); --=20 2.55.0 From nobody Sat Jul 25 17:33:43 2026 Received: from mail-lf1-f48.google.com (mail-lf1-f48.google.com [209.85.167.48]) (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 6687F481ABA for ; Wed, 15 Jul 2026 12:50:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119846; cv=none; b=TUdR9/S70I1mXXm22Za2W24MNhvT/0NGwDquTgYuJDSbNpz7EVla8qwUYQEVCCzz5wS7YyMkU2oNO/yAjW+bOBR5VPUsVtYsBHTofs4BEcvQqUh38lEQ7aPLKnzcQqPfVMNyOy2VTJWZnMzDfaBtq8cvGx71BVc7iavSZeLoekI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119846; c=relaxed/simple; bh=hwgrA2AsXgals+JVfVdyV9WiAbtcA87ZujfW2BPVomM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IdRNDCzlq0ElCzIcrmWT6cNU7/W8yw0eYucbT2JjRSaLOQbZIStG3oozm9FLyalfFkG4eEuEpAo9XELi4Pg9LkD3LSwpS+Z2MPXnSDGkuTi/bnYAzoAVEPO79JN7qccFdi8koH2guLLwo0zQAxJenrGji77HJRLlG/BH1SuqlvY= 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=T1XqPgpd; arc=none smtp.client-ip=209.85.167.48 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="T1XqPgpd" Received: by mail-lf1-f48.google.com with SMTP id 2adb3069b0e04-5b018fe8318so1768032e87.3 for ; Wed, 15 Jul 2026 05:50:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784119839; x=1784724639; 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=KC4r10Nh+xEolU1TENafjOqAEh3dTzK3TpQE6nAo7gQ=; b=T1XqPgpddM+dxhEVIIfoiDMpgByXKaPQNJtxm4R35H4EdbfH7BUVE1RloBxwhQJ6P6 95Gzsbx7ext8w5/jQOPMphEwnTi6/+4BJPdYajlqjohH2fc57oVisXOH9mdUyV2vnDMW 2inRzfqb6iHc8Po7hWFOa/+P5qcfBBsYXzS9codqLklMxZnXn5AKiJUZPR+Mtn4Y7V4R Yi6DAk+rxKO1oBKlvjf94pPNJSiKu/ABERqeAGr64XiYlB0Sd15Yfd80vo3EVlzPgHqL SdY1xBWzoM3+L59GoSTjKR3taemmwPUx0P0P5ZqnMqdbC8Nh6xqrcJMM9QC6s+Uo/v88 EzCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784119839; x=1784724639; 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=KC4r10Nh+xEolU1TENafjOqAEh3dTzK3TpQE6nAo7gQ=; b=KNs73sdHmDylo8GAKM8TN/jcn7ULdx2m8XejOPK3uAt029Gf0hLnCp53n+2ICoxqIv uR6TunPUDDNOxYLC3deK/1AKrtLfMJ98DjSoIsKwZK7fQQ+14gr0G/Xlij0s076DuQpG 2ZXYy2XnwWcxUk6YIvyYQ3fw9FMLB3mgZjFO0yHpTsym6x2jZ5k3lIE3FU+SnImC2O9Q AIuQHbbqEoK34ZsC6DWdTQHexErlzohVHIfFUOA2CPQ1uQbCpeSBzXnnQHZB5yu94R8O l6q6itKxE01WrZG3/6ItVpO/xGhQXoR0qmffwpEI8HQFj+db9H97VOL5RY9RU5Dph7dQ Ptug== X-Forwarded-Encrypted: i=1; AHgh+RriX3ftigdt/c48v1miLxq/8aiJRUtM/ISILftfWSuowmGzPubwt8wwTHXu+/wUoiQFZLDrAUlOGcuJRd8=@vger.kernel.org X-Gm-Message-State: AOJu0YxYlgR/mQEAkU7YY9n7hE3PqIJ3LGmbOQ5yr9r2UOrVpNnyz/D8 vPLqVndzniRK0fg2zsPIcGgonYSmZd3jnAkOtgCbjTeYA8RgBkgliRiZ X-Gm-Gg: AfdE7ckj3oVtALnAoUVcF6ApB7Gc2DpDwrL06AZ/OzQPiNUmGOcPEGs4mPAQvlaNJnm mT0Y2t9V523l9sFwYCWJmqQSKsMLmtUpQmhRQ/wV6/u1J2WaM6iuq/dOIHOp0kSUG1NaVHu6RPm V0drB0HM0obq5m9yReL8xgcUo+h8BjTGgCqZYNk4b4RuEdovCvLlteKqH086wa3edpdLEvK8Fh0 6Yz7raryGqkmh4begDoXtfGRITlPvzjQRaY3j86jP0D7CyjuuH6vIWzelbZ0R4eZPzlxSUCxlhd RrYHL2VrZT0KJhD8TH4ovLzbixrLCpNsFUem2oHFgvU86mOgFMaxWSRuTWx1IsGJ0IaRiOVmbMc NT0PQgLYfqbrg8yx5wFeL6fjDZdSZk3lbEkPOa/H0V9WuRVb+/NHHwu1ut0B/HtMeLmorlrlQqd s//iBlftJy+uYVyiuJmHf0t7EJvq2gdyUKrtyk1lQ/FVFIW5No04VB0EWzEKo27wP8Jowc4CrnQ PruT6RzwFCLxw== X-Received: by 2002:ac2:51d5:0:b0:5b0:f9cb:2979 with SMTP id 2adb3069b0e04-5b0f9cb2d0dmr3585727e87.15.1784119838470; Wed, 15 Jul 2026 05:50:38 -0700 (PDT) Received: from archlinux ([94.180.44.28]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b022fac999sm3404042e87.55.2026.07.15.05.50.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2026 05:50:38 -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 29/61] staging: rtl8723bs: collapse set_sta_rate and Update_RA_Entry wrappers Date: Wed, 15 Jul 2026 19:47:57 +0700 Message-ID: <20260715124829.90290-30-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: quoted-printable Content-Type: text/plain; charset="utf-8" Remove the multi-layered redundant wrappers set_sta_rate() and Update_RA_Entry() from rtw_wlan_util.c. These helpers provided no extra logic or validation, serving merely as unnecessary abstraction layers that ultimately passed execution down to rtw_hal_update_ra_mask(psta, 0). Eliminating this nested wrapper chain simplifies the driver's rate adaptation interface and reduces call overhead. Clean up both function definitions, remove their prototypes from the header file, and update all external call sites to invoke the underlying rtw_hal_update_ra_mask() function directly. Signed-off-by: Arsenii Pashchenko --- drivers/staging/rtl8723bs/core/rtw_ap.c | 2 +- drivers/staging/rtl8723bs/core/rtw_cmd.c | 2 +- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 4 ++-- drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 9 --------- drivers/staging/rtl8723bs/include/rtw_mlme_ext.h | 2 -- 5 files changed, 4 insertions(+), 15 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_ap.c b/drivers/staging/rtl8= 723bs/core/rtw_ap.c index c8f0beec0..9ecf75ef4 100644 --- a/drivers/staging/rtl8723bs/core/rtw_ap.c +++ b/drivers/staging/rtl8723bs/core/rtw_ap.c @@ -1926,7 +1926,7 @@ void rtw_ap_restore_network(struct adapter *padapter) =20 if (psta->state & _FW_LINKED) { rtw_sta_media_status_rpt(padapter, psta, 1); - Update_RA_Entry(padapter, psta); + rtw_hal_update_ra_mask(psta, 0); /* pairwise key */ /* per sta pairwise key and settings */ if ((psecuritypriv->dot11PrivacyAlgrthm =3D=3D _TKIP_) || diff --git a/drivers/staging/rtl8723bs/core/rtw_cmd.c b/drivers/staging/rtl= 8723bs/core/rtw_cmd.c index bc2536c1b..c8bdd0f3c 100644 --- a/drivers/staging/rtl8723bs/core/rtw_cmd.c +++ b/drivers/staging/rtl8723bs/core/rtw_cmd.c @@ -1413,7 +1413,7 @@ static void rtw_lps_change_dtim_hdl(struct adapter *p= adapter, u8 dtim) static void rtw_dm_ra_mask_hdl(struct adapter *padapter, struct sta_info *= psta) { if (psta) - set_sta_rate(padapter, psta); + rtw_hal_update_ra_mask(psta, 0); } =20 u8 rtw_dm_ra_mask_wk_cmd(struct adapter *padapter, u8 *psta) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/stagin= g/rtl8723bs/core/rtw_mlme_ext.c index 0c5770f09..d472570db 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c @@ -4674,7 +4674,7 @@ void mlmeext_joinbss_event_callback(struct adapter *p= adapter, int join_res) psta->wireless_mode =3D pmlmeext->cur_wireless_mode; =20 /* set per sta rate after updating HT cap. */ - set_sta_rate(padapter, psta); + rtw_hal_update_ra_mask(psta, 0); =20 rtw_sta_media_status_rpt(padapter, psta, 1); =20 @@ -4747,7 +4747,7 @@ void mlmeext_sta_add_event_callback(struct adapter *p= adapter, struct sta_info *p psta->raid =3D networktype_to_raid_ex(padapter, psta); =20 /* rate radaptive */ - Update_RA_Entry(padapter, psta); + rtw_hal_update_ra_mask(psta, 0); } =20 void mlmeext_sta_del_event_callback(struct adapter *padapter) diff --git a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c b/drivers/stagi= ng/rtl8723bs/core/rtw_wlan_util.c index c85055687..dc2e341aa 100644 --- a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c +++ b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c @@ -1342,16 +1342,7 @@ unsigned char get_highest_rate_idx(u32 mask) return rate_idx; } =20 -void Update_RA_Entry(struct adapter *padapter, struct sta_info *psta) -{ - rtw_hal_update_ra_mask(psta, 0); -} =20 -void set_sta_rate(struct adapter *padapter, struct sta_info *psta) -{ - /* rate adaptive */ - Update_RA_Entry(padapter, psta); -} =20 static u32 get_realtek_assoc_AP_vender(struct ndis_80211_var_ie *pIE) { diff --git a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h b/drivers/sta= ging/rtl8723bs/include/rtw_mlme_ext.h index 2b8df2bdb..6b1ac26b3 100644 --- a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h +++ b/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h @@ -498,8 +498,6 @@ int update_sta_support_rate(struct adapter *padapter, u= 8 *pvar_ie, uint var_ie_l =20 /* for sta/adhoc mode */ void update_sta_info(struct adapter *padapter, struct sta_info *psta); -void Update_RA_Entry(struct adapter *padapter, struct sta_info *psta); -void set_sta_rate(struct adapter *padapter, struct sta_info *psta); =20 unsigned int receive_disconnect(struct adapter *padapter, unsigned char *M= acAddr, unsigned short reason); =20 --=20 2.55.0 From nobody Sat Jul 25 17:33:43 2026 Received: from mail-lj1-f171.google.com (mail-lj1-f171.google.com [209.85.208.171]) (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 006F847ECFA for ; Wed, 15 Jul 2026 12:50:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119846; cv=none; b=hL0aZ7EGTFCB83u4uT5aQF372UuLqJw9Sg60U4bLJhf9wjRBCGueaeV2LddvZnnAFUz9M5CCu2E5w74YH738Fk5AkxEoZrCjEA//HgL9Rz+NBbU5PB7i0mO8zJN62A/36P17hGZ8vrYOV6G7txb4FuL/sG/Dj6KF6dGwFrG2n4k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119846; c=relaxed/simple; bh=zZXAo8npoDzLKVKKYOc0BU24XqQ2NLcE3VqH4JNn+WI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=S9JArr5RJITNU+tHjG23Ns8s3nOSjrUMHFABzua4o1cjiJBjQBb/sdm5PF2t8b5x45bU1aV9HlGsSBKmFt4dqR5S/isPJ7Gqnc7TwL6rhmJ6OUtrD3r1w2R47PurvLQ3BdYjVdsHVTiiXJ0G7IJtbBIYNWj2536I0qCOVCVPK7M= 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=CLiQsYAP; arc=none smtp.client-ip=209.85.208.171 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="CLiQsYAP" Received: by mail-lj1-f171.google.com with SMTP id 38308e7fff4ca-39c7fd45465so44856661fa.1 for ; Wed, 15 Jul 2026 05:50:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784119839; x=1784724639; 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=XDOCH3L6xBsyr24MyXHVgIBAtfoXRa0Y/GN8N+RqAIw=; b=CLiQsYAP5iRtr1SjQnxM04UzJQobSgRZMMFl44a8o6+iBHRDXt4J55ZPsIR0zi2pR3 6Nqlu8UuN0sDXhnl08CFFEDMEHXNCgJuFUlDg6UeUaCHfAG3szDIdk8RvZ3jigKuF4vy agtxe9HRwpAMDX+85uCR+WSle6RmtGAfKodbarjFOC4B3HqnSr+lT7mwIL3gK4VAT1BD dK+DsgarLp8SGfOcs6fKRqtaa9sxi7KszyMNUp+LHT0UMCNZ+qKqi0HjqsQ+oWH5Rb4B 3FK6raPZsVoxoXDn96dNVoRBIPl+ZiXmHnylah9hoBd+tcsgnbUqSzibz65Sv5GQzaX1 OvhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784119839; x=1784724639; 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=XDOCH3L6xBsyr24MyXHVgIBAtfoXRa0Y/GN8N+RqAIw=; b=s8vohtOAAuQNFzxtbwbxhTPt8qalrzkUgWIEqoHS54xOngrsx9iV0LxCE5jpATDmoN x2h6MK1deVR9S0q6Fc5B5XMw1adS8vP1g3ra336mvNG4H8ONEALgOcoZze8BPaGplV1k rqfgSCrISSgINVm8wUq7D7kyvQq5hohXZ4PN6wKaNxNrla7uQGP2LaspJV3JG8IerDNo gxZfnukFQs4eGLC9kahm7EP35+418ukYR9vFuYjxX1I2bXtmuyjY0fFlURNgeFUOcSvE AxQXPrmaDrvsAjtGNp3HFbJlDrYI19chwwqP+ubSs4K43OUD8hilPYglcZWL96aWpCjR RPPQ== X-Forwarded-Encrypted: i=1; AHgh+RpUXHpJKwnw69b9uNr/xFHVpXZ0KOtg9v+/NBvY2ULP7BoyjPwaJsqsLKSSCdIVJKs8Vk14tJBlbciW3HY=@vger.kernel.org X-Gm-Message-State: AOJu0Yzn8VfNVyocWIjEsN3yaknJVHVvbDml2a8ANNpn0gwt9vn3xxOx 1EI4Vz41Uzl2TFJjCO2WaTae7g+vzRcEBakeYshdwVgSt0TprV5tVmLI X-Gm-Gg: AfdE7ck42cIz7XbuuV59lW7WcQVPuul1WTTrzfU9ehOjrV5ZtosdVkrvlBOjj93QAzq TrDJNa3cfs6yCoJ4zrHnXstc/1E8pHvCxxrGpRyec+vW3PcYUYuTywGQuK1VoNiRaPw49kJlXzr 0AsFBpsHrjk1PWv6vkOziAqFErMc9F8EySlkkd8m7ULJi82j8mAB+SDRHq7rUBCtvf/VBNhZ1jm xhdYtpGpSF5Ow1RbUVSTwOayv8NLraZUCTKnrML+fp70m6cYEiT9WXkUkR5ObuiSKwm542ZrhCr v/98Wt+mXf85C/DeawM6L7jR+a/lO6hPtejFhNlyAFwt6qkvQsVonG87bgX/FHjEJjnUpx4OazB s/HNO4fI9N76/6+wSvtAVdKiF15y0gzvG+RMZ5ytP/W5anp7YtOAa23UQy+w4z8ejHk0RbIkzxN ihp+ryQ6hoMUidvSmCbWU0FwDQZr7Naqgi8B/SsS0MzAWwg6ga77lD5saZTCJiY9OeON6HMenRP zyXnCgUzyRj7Q== X-Received: by 2002:a05:6512:2524:b0:5ae:bd5e:95f7 with SMTP id 2adb3069b0e04-5b159b6ab5bmr1418321e87.4.1784119839311; Wed, 15 Jul 2026 05:50:39 -0700 (PDT) Received: from archlinux ([94.180.44.28]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b022fac999sm3404042e87.55.2026.07.15.05.50.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2026 05:50:39 -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 30/61] staging: rtl8723bs: replace correct_TSF with direct HAL call Date: Wed, 15 Jul 2026 19:47:58 +0700 Message-ID: <20260715124829.90290-31-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: quoted-printable Content-Type: text/plain; charset="utf-8" Remove the redundant correct_TSF() wrapper function from rtw_wlan_util.c and replace its call sites with direct calls to rtw_hal_set_hwreg(). The helper provides no extra logic or validation, serving only to pass the fixed HW_VAR_CORRECT_TSF flag and a NULL pointer to the underlying HAL layer. Removing it simplifies the driver's synchronization interface and reduces call overhead. Clean up the function definition, remove its prototype from the header file, and update all invocations across the driver. Signed-off-by: Arsenii Pashchenko --- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 4 ++-- drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 5 ----- drivers/staging/rtl8723bs/include/rtw_mlme_ext.h | 1 - 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/stagin= g/rtl8723bs/core/rtw_mlme_ext.c index d472570db..9dfa31171 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c @@ -4690,7 +4690,7 @@ void mlmeext_joinbss_event_callback(struct adapter *p= adapter, int join_res) =20 if ((pmlmeinfo->state&0x03) =3D=3D WIFI_FW_STATION_STATE) { /* correcting TSF */ - correct_TSF(padapter, pmlmeext); + rtw_hal_set_hwreg(padapter, HW_VAR_CORRECT_TSF, NULL); =20 /* set_link_timer(pmlmeext, DISCONNECT_TO); */ } @@ -4714,7 +4714,7 @@ void mlmeext_sta_add_event_callback(struct adapter *p= adapter, struct sta_info *p /* update_TSF(pmlmeext, pframe, len); */ =20 /* correcting TSF */ - correct_TSF(padapter, pmlmeext); + rtw_hal_set_hwreg(padapter, HW_VAR_CORRECT_TSF, NULL); =20 /* start beacon */ if (send_beacon(padapter) =3D=3D _FAIL) { diff --git a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c b/drivers/stagi= ng/rtl8723bs/core/rtw_wlan_util.c index dc2e341aa..03e047397 100644 --- a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c +++ b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c @@ -1600,11 +1600,6 @@ void update_TSF(struct mlme_ext_priv *pmlmeext, u8 *= pframe, uint len) pmlmeext->TSFValue |=3D le32_to_cpu(*pbuf); } =20 -void correct_TSF(struct adapter *padapter, struct mlme_ext_priv *pmlmeext) -{ - rtw_hal_set_hwreg(padapter, HW_VAR_CORRECT_TSF, NULL); -} - void adaptive_early_32k(struct mlme_ext_priv *pmlmeext, u8 *pframe, uint l= en) { int i; diff --git a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h b/drivers/sta= ging/rtl8723bs/include/rtw_mlme_ext.h index 6b1ac26b3..b12128963 100644 --- a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h +++ b/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h @@ -602,7 +602,6 @@ void sa_query_timer_hdl(struct timer_list *t); extern void process_addba_req(struct adapter *padapter, u8 *paddba_req, u8= *addr); =20 extern void update_TSF(struct mlme_ext_priv *pmlmeext, u8 *pframe, uint le= n); -extern void correct_TSF(struct adapter *padapter, struct mlme_ext_priv *pm= lmeext); extern void adaptive_early_32k(struct mlme_ext_priv *pmlmeext, u8 *pframe,= uint len); extern bool traffic_status_watchdog(struct adapter *padapter, bool from_ti= mer); =20 --=20 2.55.0 From nobody Sat Jul 25 17:33:43 2026 Received: from mail-lj1-f171.google.com (mail-lj1-f171.google.com [209.85.208.171]) (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 3283B47B415 for ; Wed, 15 Jul 2026 12:50:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119846; cv=none; b=s6GWLjXbCD8frJtLEjCNzdKokPWkvzXlgIEjNC97mQqGtk+QtgKXRJ8qExOMtvqCo3dyaL5qI2rdAzYLisPUC2fQPgXBWGUyNEpKlkA3qbQKLzmf7zkXP1pjhWa4VjJVEu0FFYMNrwRJVBUqCHWP6tlvYH9SvjHRSkg+jpKfQYw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119846; c=relaxed/simple; bh=WWVrQEGBR/w9v0EI6kme+tNtURJsD6oKvV59TvhbnAM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GI8CMb8rLcY0J0pzYbrYJxIiiF7lKHjqMC/NjIx9/Df8rZC+0PcjVtX0U2zHeIFSd4/rFSGxtIr6e52IoRWkOKBucz5+T8aAG5ObVytpWEBjyat5P664WDRnpVoM2JCO+1UVRO1hRa//m+OXGwPEwey0enTqRJ+vsDi3iHVVJzE= 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=c0jRMBO2; arc=none smtp.client-ip=209.85.208.171 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="c0jRMBO2" Received: by mail-lj1-f171.google.com with SMTP id 38308e7fff4ca-39d4c864bfbso23142471fa.1 for ; Wed, 15 Jul 2026 05:50:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784119840; x=1784724640; 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=FtlASsqkw0C4v5Z/7LIib8Kc0TPvk4rZzD6C198Kz1k=; b=c0jRMBO2PsvzLS3nuBH8CvR5bQQYIgwFcjSzu+WX7yOr3UlWKJ4NZhF0Tf6cqlE+EX SzJaAvZCw5EIb7sIkuGgHScfmbj2ZbMgIAADwl35Y0LLCmNKjwsNmfwQczFIWM9D2rmR Y7Ot0/YrIlzJuqpMte4+6GATDpcDRLRxH0BJ8C15TrPWt8olPnRPr6Ue3vVvVMbVShV3 n7LrXjJi0qki9FVGh/HOL6EyflvWUoSMIOG1sAxGL4CdjgfdONxwhEEDE2VTls7KuKdB Y2sN8zXn1w1h51oBaHunnziu9Z/DcMBlPgtkWcOsMzZLmKwXtydhdDjODgv0hKxSpD1P DROQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784119840; x=1784724640; 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=FtlASsqkw0C4v5Z/7LIib8Kc0TPvk4rZzD6C198Kz1k=; b=VC3PhpONpZdXINCWeQSj6QpZIstOwlc4tlNQ6xbioFQMNKWVxCxjk5hQwjcTwc6HmG h1iWXyLIiqAMQl/QAwHMbPQu6KM4skF9eEvzUz2qa9bAdGhWgxRCVdCf7d+QoefI033a wKMgHA43EC+fsklnxWbCruVM1bc2bt/OeRPFAqMme+RsQhCN5+GK5Tt7603QwrZV/Hpe FOxyHU0JiArV82wGx0gUuMOLOZ0uhfQh1tBhFQwUfCQ1caUKRsh50K6ZFl5LSVY+oMQC 3DUuvYNYG51Mbo/WoTu+Jin3HIXiq9+fnj7CtoNyiLajgS/vfkgWJouIZ4Q8oAKB/8r8 QKew== X-Forwarded-Encrypted: i=1; AHgh+Ro6oPlc3NcHoa3LuOMpN14EfIHSBXYpXdn8Uaixp8PMcxhwmBVEofzI+Cn1kqrk7ly9lNwxF+G/piaTGF4=@vger.kernel.org X-Gm-Message-State: AOJu0Yw1J7jTW6qay1Mkmob7jfkcOMI2kSao+BO92RjAI80tXepLlWyJ Pet03VIEDvPKWbWXx6El2/PvMEprubmb0a9zNEMBrHJlkZ6uNV58XxTucHoMTCnWD2A= X-Gm-Gg: AfdE7ck7ibRnGnX338r8ryS53FjYaShG8fgf41/Ikh7BReEQ+EyGr3+mDzAT1YXG47f B+nssm6qRE8RDgOGbKjLT6yTXxipPiWOF+BFiu10EukG0EbBphkO7sxfvMEdTyNwB46RAXBamBc qHaufkqgwwoG0HMI1wo2ib7l/5QxG2uR0YjpDyaNoWOeaCxqqQgHcb7WTp1RHGmFpmhaHxb9cOX lofkG4ABzk2heAC9HqU9BnM0hiENgfvKel/9XtDtypV752AXaBhPtFsJjkUfFKGkrm3VD9YQx+H xzCiLQMaVc2hQYd30cgSOxqw13snUh3v81KElIrMvYiXi8qMh5QlYDAJcx0kpHcrz4tE4HP2p16 VrPfyAOo7I4e3RlT9KkY5CWTnZG4OIyUqmKc//p4TKgPRphg5SDzBTAue+Ez+aW8uVKo4DECrRx 9jFam2daVki/KOfck1YfN+zpQ9E8+vyPWOLzIZ2Fusj2BBgOzU3MUZ4h8+fER8F6PIOB9Le8ffF s2wOqKVOLFtLg== X-Received: by 2002:a05:6512:3c88:b0:5ae:b7ca:33ec with SMTP id 2adb3069b0e04-5b0235613f8mr3811386e87.9.1784119840071; Wed, 15 Jul 2026 05:50:40 -0700 (PDT) Received: from archlinux ([94.180.44.28]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b022fac999sm3404042e87.55.2026.07.15.05.50.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2026 05:50:39 -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 31/61] staging: rtl8723bs: replace rtw_sctx_done with direct status call Date: Wed, 15 Jul 2026 19:47:59 +0700 Message-ID: <20260715124829.90290-32-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: quoted-printable Content-Type: text/plain; charset="utf-8" Remove the redundant rtw_sctx_done() wrapper function from rtw_xmit.c and replace its call sites with direct calls to rtw_sctx_done_err(). The helper provides no extra logic, serving only to pass the fixed RTW_SCTX_DONE_SUCCESS status code to the underlying error-handling function. Removing it simplifies the transmit context interface and reduces call overhead. Clean up the function definition, remove its prototype from the header file, and update all invocations across the driver. Signed-off-by: Arsenii Pashchenko --- drivers/staging/rtl8723bs/core/rtw_cmd.c | 2 +- drivers/staging/rtl8723bs/core/rtw_xmit.c | 4 ---- drivers/staging/rtl8723bs/include/rtw_xmit.h | 1 - 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_cmd.c b/drivers/staging/rtl= 8723bs/core/rtw_cmd.c index c8bdd0f3c..01f8b378e 100644 --- a/drivers/staging/rtl8723bs/core/rtw_cmd.c +++ b/drivers/staging/rtl8723bs/core/rtw_cmd.c @@ -463,7 +463,7 @@ int rtw_cmd_thread(void *context) FUNC_ADPT_ARG(pcmd->padapter)); =20 if (pcmd->res =3D=3D H2C_SUCCESS) - rtw_sctx_done(&pcmd->sctx); + rtw_sctx_done_err(&pcmd->sctx, RTW_SCTX_DONE_SUCCESS); else rtw_sctx_done_err(&pcmd->sctx, RTW_SCTX_DONE_CMD_ERROR); } diff --git a/drivers/staging/rtl8723bs/core/rtw_xmit.c b/drivers/staging/rt= l8723bs/core/rtw_xmit.c index fdda407c1..9a525be74 100644 --- a/drivers/staging/rtl8723bs/core/rtw_xmit.c +++ b/drivers/staging/rtl8723bs/core/rtw_xmit.c @@ -2565,10 +2565,6 @@ void rtw_sctx_done_err(struct submit_ctx **sctx, int= status) } } =20 -void rtw_sctx_done(struct submit_ctx **sctx) -{ - rtw_sctx_done_err(sctx, RTW_SCTX_DONE_SUCCESS); -} =20 int rtw_ack_tx_wait(struct xmit_priv *pxmitpriv, u32 timeout_ms) { diff --git a/drivers/staging/rtl8723bs/include/rtw_xmit.h b/drivers/staging= /rtl8723bs/include/rtw_xmit.h index f67cb22e3..f85a03efe 100644 --- a/drivers/staging/rtl8723bs/include/rtw_xmit.h +++ b/drivers/staging/rtl8723bs/include/rtw_xmit.h @@ -212,7 +212,6 @@ enum { void rtw_sctx_init(struct submit_ctx *sctx, int timeout_ms); int rtw_sctx_wait(struct submit_ctx *sctx); void rtw_sctx_done_err(struct submit_ctx **sctx, int status); -void rtw_sctx_done(struct submit_ctx **sctx); =20 struct xmit_buf { struct list_head list; --=20 2.55.0 From nobody Sat Jul 25 17:33:43 2026 Received: from mail-lf1-f48.google.com (mail-lf1-f48.google.com [209.85.167.48]) (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 C51493368B7 for ; Wed, 15 Jul 2026 12:50:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119849; cv=none; b=UhbJT1573wlzJtrxC5D3TLNAH4y8Fxu7VnJuY8m7qHBJJ1yWSPIFazoJ38rrDHFJd7uiQnsx4HVy7OnZc14wrQbW2PQ3oJiJ7failnWwK2QI5bjPt81V9ncbSw24M/wM5mdgLwxmFEnFI4JpbzoWN2zOqG/elipua7LgFzYirlc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119849; c=relaxed/simple; bh=RQgHe7MNFy2jTX3N82Ppi9LspoMW1n8fVhbZL+pIuxA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZYc6oPSckv7OCA71tjlTkgaGNTOdH+H4Yjb3oo2mccKbGbKkWXIJ98Z4qDqFDkeWMEAfQn7grYECkfd54beUidep3el2mGuPZ6hgRc+yeok+Evu3qnt/OuiT1LvydZWAWbwAKgASGRzQtQnLSGHdyh5df7fj/mV83nY4aB4Fq0A= 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=MQPq+113; arc=none smtp.client-ip=209.85.167.48 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="MQPq+113" Received: by mail-lf1-f48.google.com with SMTP id 2adb3069b0e04-5b15d5e986eso155915e87.1 for ; Wed, 15 Jul 2026 05:50:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784119841; x=1784724641; 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=EccBw5SDsbElCyYYL5IOHllhMjqbCF7PrrIukfOLRUY=; b=MQPq+113HTW9MOXPJNE8ukfZ3Dot/mQ6KMn2N9kpbyAdjlKTOLfdxI33xQJrVIVzlB 6356r5JbiYiQ9GHcxSDQY8Br5LXGE6laHnFmk284hSq2dYgXgu39XfCiSMVipLIVBeQn xcpKKvmh3pNr+GnEwlTeH9aCLOv5f3Yg4e6OgFVcipP7NK3MzAZ2yVXXZVBWVTza8Imj 4kenW/JfA1BficJnp0t/G0tjXe9ZbBFCfBmGVTRWnSNGRxK4drdjJb76S/LnQWYy3BZY 75qKK/XxoH5m21MpsmAqurrpB/i0a365VIR5tmA+C83AZotj6psXI5BmAnaGPXt32TTI oNYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784119841; x=1784724641; 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=EccBw5SDsbElCyYYL5IOHllhMjqbCF7PrrIukfOLRUY=; b=d2l675XmazVkYhVNI77YRIRgH+qdjbLYcOqpop/Yd7lfbXxvfL9nfjZJpo9Kht2VNz J9kZlL/TDMDi702orIfoZAxoMw0xmpuFPqrL6G2EFA0h3YQj7eNQME2RaNNLsnmFlT/v MaDUAxISX8p0Dq4cNH5I2/CdYUaloAt+mSNDxOB8HU8Zn9euJUj+LzG7cuzxlnEiyAkl EqfLzLXUl5e3wYjb/VvlOuPJW+cL7IHoy/p/ldVbuVOL5C6Q4uJ/kO/l6FyrLcON36Lf fVqDZEZCh+Xp0B42tjaGS+iT/Zo0rWvnbfCbH33KwfEi4bDIXO83UGWNayhrv1nrSK0x 7TEQ== X-Forwarded-Encrypted: i=1; AHgh+Rojfgw4lPZbGxy8P08VhNjXnswclbrvO6Ec8/9lEvdFgw8iLBfOig60L8CfGYAjuYLcjQ2nQKjyy5+j/eQ=@vger.kernel.org X-Gm-Message-State: AOJu0YyC5PRpa+AW3MOJn9rpwTrbUA1dqkmWh5NsD+SmvjNs+AND20s9 rm0ZeGHCumCD6/1Bebfq0gbYiHSIzK6PGNeR537yGHaZCdwd6501MZW5 X-Gm-Gg: AfdE7cnphL3NENV9d6cYe4+tM2sOimg9Y9Tzwr+VKUezkLrrmvAlWZOAsgFApcJyrL3 9EauAjRnoX9uzvw+Bn0fkNVPZd2rBhoN3C01reQ92PIBf/NVvofhgpeDWwQmKHUATgAiO6DOxMD n0Twfv/l1CBMveuW7GxuLfwcLYqIolfDj6K9NyhV8uIIcRSa+wIj0aGmw6JbIpxI/pK+cFa76L+ BCag8HRzVUotnSSlbF14vd+Xm1qBdI2kKJ5MZAgV6sbZkxdyqYz8qQrTCuj6BxcQF3qLCsBGq/L iBmhXTmF4CJS/xTc9OYH1xxv2YTnh3L6zIv37P8l0oT2oq1/ce/bHTcOLnj+QRGlA1+1TCfUv6n QeCVeVMpeTec6dLP4pbX4CkbOcJf6QlN9PWVkBmeNKettw7EUIj8ZQJMkhjmXAPncGB5c3b0ejD QjdTSmoWykwS/LjtDa6Oy44KlHNXXs1zKzGAd2t0aJ4g4Y3CS/SbApGBefpBM2jeEjLuSve3mo5 xhNzwdVTKQ9hg== X-Received: by 2002:a05:6512:1081:b0:5b1:54a3:d133 with SMTP id 2adb3069b0e04-5b154a3d1b7mr2946167e87.44.1784119840835; Wed, 15 Jul 2026 05:50:40 -0700 (PDT) Received: from archlinux ([94.180.44.28]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b022fac999sm3404042e87.55.2026.07.15.05.50.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2026 05:50:40 -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 32/61] staging: rtl8723bs: remove rtw_free_mlme_priv wrapper and rename helper Date: Wed, 15 Jul 2026 19:48:00 +0700 Message-ID: <20260715124829.90290-33-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: quoted-printable Content-Type: text/plain; charset="utf-8" Remove the redundant rtw_free_mlme_priv() wrapper function, which did nothing but call _rtw_free_mlme_priv(). Simplify the code by renaming the internal _rtw_free_mlme_priv() helper to rtw_free_mlme_priv() and using it everywhere directly. This eliminates the useless leading underscore naming and reduces call overhead. Clean up the old wrapper definition, update the function prototype in the header file, and adjust all call sites across the driver. Signed-off-by: Arsenii Pashchenko --- drivers/staging/rtl8723bs/core/rtw_mlme.c | 7 +------ drivers/staging/rtl8723bs/include/rtw_mlme.h | 1 - 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rt= l8723bs/core/rtw_mlme.c index b038233af..e86a4e83b 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -129,7 +129,7 @@ void rtw_free_mlme_priv_ie_data(struct mlme_priv *pmlme= priv) rtw_free_mlme_ie_data(&pmlmepriv->p2p_assoc_req_ie, &pmlmepriv->p2p_assoc= _req_ie_len); } =20 -void _rtw_free_mlme_priv(struct mlme_priv *pmlmepriv) +void rtw_free_mlme_priv(struct mlme_priv *pmlmepriv) { if (pmlmepriv) { rtw_free_mlme_priv_ie_data(pmlmepriv); @@ -302,11 +302,6 @@ u8 *rtw_get_beacon_interval_from_ie(u8 *ie) return ie + 8; } =20 -void rtw_free_mlme_priv(struct mlme_priv *pmlmepriv) -{ - _rtw_free_mlme_priv(pmlmepriv); -} - void rtw_free_network_nolock(struct adapter *padapter, struct wlan_network= *pnetwork); void rtw_free_network_nolock(struct adapter *padapter, struct wlan_network= *pnetwork) { diff --git a/drivers/staging/rtl8723bs/include/rtw_mlme.h b/drivers/staging= /rtl8723bs/include/rtw_mlme.h index 233bf98e2..8c924e35a 100644 --- a/drivers/staging/rtl8723bs/include/rtw_mlme.h +++ b/drivers/staging/rtl8723bs/include/rtw_mlme.h @@ -349,7 +349,6 @@ void rtw_set_scan_deny(struct adapter *adapter, u32 ms); =20 void rtw_free_mlme_priv_ie_data(struct mlme_priv *pmlmepriv); =20 -extern void _rtw_free_mlme_priv(struct mlme_priv *pmlmepriv); =20 /* extern struct wlan_network* _rtw_dequeue_network(struct __queue *queue)= ; */ =20 --=20 2.55.0 From nobody Sat Jul 25 17:33:43 2026 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 7A283481A94 for ; Wed, 15 Jul 2026 12:50:44 +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=1784119849; cv=none; b=nqBH9jzmQJBT1ApkLyy9tFZV66E72qdKE8rWJRpJ9C0WQtygo4giFCcBwOzJJ2WLNqDfFKTKe1cWRmdEEeYwhCGsMJMfghj18CYYl9TIzpFPaypbohcEqrAg9xos0bZCSQLtQ/qRoBELVK2LDDfnDqgCbFB87prVn0z4s81c36A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119849; c=relaxed/simple; bh=jaa4xZ8buzO1FgNdxtRxTtKV88KgOH4L50TBAJ0fgBI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jBce5mU1PHlWhG/Q8SbcqeQaYpvP8gPjXtneMqKvVR7QxEjBMzwyvmg986/7ZJlOa5OpNnSz6H28Yheq0EzRB+cGHTMTp590tBU/Z938yK2UC8KXVxwlfigjsVJJw9qv77AZeCkvW2xrVAxHDQh5Z3C4HAIr8q0pB38L13jkU48= 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=ckTZBZKl; 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="ckTZBZKl" Received: by mail-lf1-f43.google.com with SMTP id 2adb3069b0e04-5b14d1f9315so3760385e87.2 for ; Wed, 15 Jul 2026 05:50:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784119842; x=1784724642; 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=J4DZ1Y+35tqkPvEDsXNQFAF6mIcFObOEtgy3lw4FCmI=; b=ckTZBZKlpxCYV8/HFyvse4YT/NK1pTHvWwUrl95ZNLddEUt/9eRDtgiJq+21Hb79l0 tY1ogJWFS8BLFnqOP6ybGXe0zMuBifN0nsfPrIOrZtyaJdzyF6oqidoZceBBTmmzCpaH b4DRo2tg7LK0/NxmI3rhTBBV0yHvzTkqndKeF9p6Z3EDaH2SMxzoDGIq4mfQ1VxeyjOl IT1VerJKJsOIPzy9O5+ZuBVfin1Jhb5v+T1vQ9G0TAdk49LU0Dc1A72gNaZDb0DVUsLo h8Y7Ia98bQCzKO3zBPIkSB3EJjAhU5INalMR53EVKU14CBXxWXX8ZO3HA+v1ZG1iwn16 G8IA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784119842; x=1784724642; 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=J4DZ1Y+35tqkPvEDsXNQFAF6mIcFObOEtgy3lw4FCmI=; b=QiN30p5gf6LCOGfdWEabji8gj1CVdALrhhhVqgpDp99rGqG0FuNJyYno3nrWHzru1M oav3KNFR9Wu7DjiU5BTe2zleoNfunuEACJYxSedp6MQJ3TmL7+5c4uKS3wK9KUqdlpln jFrgP/Bo0MEWQGfZ5KTDTw/e/kBqb7sVydSOrGeyd/lraXc+XZ/ZaugyOFgLOc6uGbeq i3k8TUGITDZR4IQ7c9cEnIknm4ETLRSXwn1194wp4S/ewD0rHTnxCt/lbh+ynvqRVrq0 R0WykVe2Ct3giI0Lj9UFAmMkVtGO0y0SR4klprsgeActFLxYjSRD4j7ZsdKSgZOVQlIg O63w== X-Forwarded-Encrypted: i=1; AHgh+RoEWYMPVgqBD3YUM2AlKuyA+yju2EkhAMjv5+55p0cu0vHgRKz889nHPW4ZGcqIOoxRXsXYWDk7hzzRrZs=@vger.kernel.org X-Gm-Message-State: AOJu0YwT9dpfY7a6E1MUJZQJ6YTwmKvpBVsXSAwjm8OaFI4lMYBNkKQZ n1AWBV5zPLm8ohgkEgnm8Bx2VjlJTs/KT2UHEpnk4DPjw+paCwl0tAG0 X-Gm-Gg: AfdE7cnRKSaCQq9nkLKKT3k8VFZvnjTGggunkaeRC8tOdkxMlVjAHzZjkucQdaamxGs datU6SI6RrG3x7Im+T1C3bmAy3/oMyxS8TNXbKAjfU5kWR5LDmManJAK8grULGjEPI23BcuhpEg KyhX6065I44eJpLLrMaKt8S/w0clCLbNZnCVmq/SQoxsnWGyJ9jZvp9XVXXf7OGfvisSn5mfhPB dGInMxlluCdpbL0/N2ft1T7Z6ZpaVTrMggt/FA6qRDLs9QEzo2HeHj1pq7RaAqp/FYwku0nFjKl LoDxC/M9L8cBXs11+gmNOprtEU5nmRsMhNC6GmayhbhrUBxau+eYGxOPK82l9vAZCSLYw/4rUQW gK3nvK7qBoDjG8iKqjI0XZay6xJudlmhUXxoRgi4Yq195/UdILYtRFKqoveTPqzrswGtDbEcVKK Fy+vBUDkDdJEFbPAkUqP2vSoMW3/XWOqQBgWbtwgEsB5jDzHsJbzB91ms4V7tdABwHf0ailzPOF zUHfNxfMs0iGS1hD2BfYNPr X-Received: by 2002:a05:6512:3f3:b0:5b1:1b50:7232 with SMTP id 2adb3069b0e04-5b15825966fmr1325260e87.4.1784119841590; Wed, 15 Jul 2026 05:50:41 -0700 (PDT) Received: from archlinux ([94.180.44.28]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b022fac999sm3404042e87.55.2026.07.15.05.50.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2026 05:50:41 -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 33/61] staging: rtl8723bs: remove duplicate prototype of rtw_free_network_nolock Date: Wed, 15 Jul 2026 19:48:01 +0700 Message-ID: <20260715124829.90290-34-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: quoted-printable Content-Type: text/plain; charset="utf-8" Remove the redundant forward declaration of rtw_free_network_nolock() located directly above its actual definition in the source file. This duplicate prototype is unnecessary since the function body immediately follows it, and the proper declaration already exists in the corresponding header file. Clean this up to reduce code clutter. Signed-off-by: Arsenii Pashchenko --- drivers/staging/rtl8723bs/core/rtw_mlme.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rt= l8723bs/core/rtw_mlme.c index e86a4e83b..73b20a78d 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -302,7 +302,6 @@ u8 *rtw_get_beacon_interval_from_ie(u8 *ie) return ie + 8; } =20 -void rtw_free_network_nolock(struct adapter *padapter, struct wlan_network= *pnetwork); void rtw_free_network_nolock(struct adapter *padapter, struct wlan_network= *pnetwork) { _rtw_free_network_nolock(&padapter->mlmepriv, pnetwork); --=20 2.55.0 From nobody Sat Jul 25 17:33:43 2026 Received: from mail-lf1-f53.google.com (mail-lf1-f53.google.com [209.85.167.53]) (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 4D58148A2A5 for ; Wed, 15 Jul 2026 12:50:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119849; cv=none; b=bCC1DiLwzMVR4PSuviAYwp0DE5zsrcR9ofnQjJIcgc5014VcYVZge6FI0JyuRd1sXfgetwVBOuG5rvv0VGUpMfJkEhEN2jfkxP9VRVMxbw+NLZ7lwQF7qQ7GZOFm7e9FRaAg+EbmZfmxG5rknwTTFE0Drym/emufV03/Pk2Kx1k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119849; c=relaxed/simple; bh=suOcD4GnIG9Q0dfuzXo3cVA5IEVfC1ihCZKLRHWMTSE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IbvFjVusG02p3T8FvitVLhgeAg8U/r5qVG+6tgFY3EPpsW/rqBYdortKZMnC5uUsEp1nHDgXCBW8t8V7IzUuF4O/ALunwRisFte3yc70RYCymgNhf4NeELZP0hhDX6lVMmA7T4/+kqqf2NYPAqXH57EZAYedPKZRZpZUdnt8GSA= 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=aCqUn/08; arc=none smtp.client-ip=209.85.167.53 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="aCqUn/08" Received: by mail-lf1-f53.google.com with SMTP id 2adb3069b0e04-5b018fe8318so1768108e87.3 for ; Wed, 15 Jul 2026 05:50:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784119842; x=1784724642; 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=BEJdGz0celAuM4TSZcnzhC7Z/1ogmlDViKhkaxHG3VM=; b=aCqUn/08Wh/7jIvUnc5c4/uSH67PrOmImnifzYml9IQoOndw5TdfrvdD8XzZGGSfP8 wh1EsUDJb5norjW8SsfPOyLuZIiNDsAuHg7xSdTIwMkK6zoQ+VIZFWo5Pv5FOw+uLOyb X0UnmUHLT0D34wR/msMz7iD0iLJR6eQzJe07qb0xCctI9ZfxrIhNdqDJ7Gb6yYBxcWn9 //uZH21uOv77Evb6cjGMdubQ/sLmvJhHkF3d3D2Brcx4y4vCgt9PQQbjRRUroei7FxZQ 5RsNlDIvb6XV63fQEFEsrh1aNXeI+PCyHB3/4JBBZ2ffSWxV+qeXCjZEitf5gwxH0WQj P2uA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784119842; x=1784724642; 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=BEJdGz0celAuM4TSZcnzhC7Z/1ogmlDViKhkaxHG3VM=; b=SyJurTr4daYofqXLXTh7MW/x7RDsH/GOhg/8HYiz6kMATezP52XsuAMICCI9F3Flc8 xWaW6u/MCz4jma4QLl0x6I/DxXU405R4EFcDTPqOvMiedDK+dNVO1pPM2rvWT3dzoDZG 12E5hleRu7tn/bzldwBT1lcdwkEIgC2gmetUBU21WzvbeOTBvUsQPDrkkoL9ziqbw3AF bOGli/p++UQMwA46BvJ8B/O2PxJXadCG/gdhoEZ/rpd6/Boex1qwFCcSxR3GRy573A5s fyJ33CP58Vc4wLnbEj/VHVhpMorGY2ha4EWmgUyGVrk7+vz55b5ngUC2gFZ8UOot4V+j 9cEg== X-Forwarded-Encrypted: i=1; AHgh+Rr0oQMTMW60O2zzd+ML+XEe+kg+Bfq9YBO6yzOCzKXF7VMCjonRn4nZujzvCClM5xPQwWD3wZ4GqQsAVek=@vger.kernel.org X-Gm-Message-State: AOJu0YwzILGunRJ4IkMGmFXZErLGKyfcJkSGeCbXHI05ALdzUr8jddbc NxYCR40ZuoDQ1rjAFDJ2mnl4k3rjwhYRBBoxYRANOrA9nj0bs8vUCN6n X-Gm-Gg: AfdE7cnfidx/jXGhmA/bGwoKN8HdaY7brPhKLor+dL0TUNJksyOUY0IZyaP0TfxW9Tz sgh35m5KUR38jyO4RbBwN7U100wChOgX4GFzavdSxMTq/WGcbWtHfrPiWpcLSFcADipGdTJa93y BF11bxRqQOvPP6wJFLmNjyKs2Z21/TatjeyNPFcTbjP6ovEBoIT9IDMRiuA1h7HBoV7JI3II+Zk gxeYY5HJGBVE1uh6FoKt1se0z4a1guaHbpgLHeOpeEvH3XPNsWYJ/IqhMH7Qc3LfiwxBPyuc8iM PQPmzmkVFcEWJRiTe72BZxlQi1sWtotyVAmEGkcwXH29nV8Fig6tL2JiUMeHGus8017GtkbEv46 KFknCs2z0e2FklkXZIjerdMSwC+aqfCXdBFUsdi1iWfTRci0YPZt4QRdttP+YNTNc5CoZn7wYw5 VuJJQ8ARvwcB82F5iwsBaOFLCeea3plAsWYpk9z514qRgadL9IgSuQ8EDJyWT0T0Zp0uVULqhrm M2EEIvJTAdKBg== X-Received: by 2002:a05:6512:2509:b0:5b0:1ace:3bd8 with SMTP id 2adb3069b0e04-5b023668e92mr4105578e87.22.1784119842362; Wed, 15 Jul 2026 05:50:42 -0700 (PDT) Received: from archlinux ([94.180.44.28]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b022fac999sm3404042e87.55.2026.07.15.05.50.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2026 05:50:42 -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 34/61] staging: rtl8723bs: replace rtw_get_beacon_interval_from_ie with define Date: Wed, 15 Jul 2026 19:48:02 +0700 Message-ID: <20260715124829.90290-35-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: quoted-printable Content-Type: text/plain; charset="utf-8" Remove the redundant rtw_get_beacon_interval_from_ie() helper function and introduce a macro definition for the beacon interval offset. The original function performed a trivial pointer addition (ie + 8). Replacing it with a descriptive macro eliminates a useless function call layer while keeping the code self-documenting and free of magic numbers. Define RTW_BEACON_INTERVAL_IE_OFFSET in the header, clean up the function definition, and update all call sites to use direct pointer arithmetic. Signed-off-by: Arsenii Pashchenko --- drivers/staging/rtl8723bs/core/rtw_ap.c | 2 +- drivers/staging/rtl8723bs/core/rtw_mlme.c | 4 ---- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 8 ++++---- drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 2 +- drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 2 +- drivers/staging/rtl8723bs/include/rtw_mlme.h | 5 ++++- 6 files changed, 11 insertions(+), 12 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_ap.c b/drivers/staging/rtl8= 723bs/core/rtw_ap.c index 9ecf75ef4..ba45dd49c 100644 --- a/drivers/staging/rtl8723bs/core/rtw_ap.c +++ b/drivers/staging/rtl8723bs/core/rtw_ap.c @@ -791,7 +791,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 = *pbuf, int len) =20 /* beacon interval */ /* ie + 8; 8: TimeStamp, 2: Beacon Interval 2:Capability */ - p =3D rtw_get_beacon_interval_from_ie(ie); + p =3D ie+RTW_BEACON_INTERVAL_IE_OFFSET; pbss_network->configuration.beacon_period =3D get_unaligned_le16(p); =20 /* capability */ diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rt= l8723bs/core/rtw_mlme.c index 73b20a78d..0ec599383 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -297,10 +297,6 @@ u16 rtw_get_capability(struct wlan_bssid_ex *bss) return le16_to_cpu(val); } =20 -u8 *rtw_get_beacon_interval_from_ie(u8 *ie) -{ - return ie + 8; -} =20 void rtw_free_network_nolock(struct adapter *padapter, struct wlan_network= *pnetwork) { diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/stagin= g/rtl8723bs/core/rtw_mlme_ext.c index 9dfa31171..25dfb20f3 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c @@ -2113,7 +2113,7 @@ void issue_beacon(struct adapter *padapter, int timeo= ut_ms) =20 /* beacon interval: 2 bytes */ =20 - memcpy(pframe, (unsigned char *)(rtw_get_beacon_interval_from_ie(cur_netw= ork->ies)), 2); + memcpy(pframe, (unsigned char *)(cur_network->ies+RTW_BEACON_INTERVAL_IE_= OFFSET), 2); =20 pframe +=3D 2; pattrib->pktlen +=3D 2; @@ -2309,14 +2309,14 @@ void issue_probersp(struct adapter *padapter, unsig= ned char *da, u8 is_valid_p2p =20 /* beacon interval: 2 bytes */ =20 - memcpy(pframe, (unsigned char *)(rtw_get_beacon_interval_from_ie(cur_net= work->ies)), 2); + memcpy(pframe, (u8 *)(cur_network->ies+RTW_BEACON_INTERVAL_IE_OFFSET), 2= ); =20 pframe +=3D 2; pattrib->pktlen +=3D 2; =20 /* capability info: 2 bytes */ =20 - memcpy(pframe, (unsigned char *)(rtw_get_capability_from_ie(cur_network-= >ies)), 2); + memcpy(pframe, (u8 *)(rtw_get_capability_from_ie(cur_network->ies)), 2); =20 pframe +=3D 2; pattrib->pktlen +=3D 2; @@ -3881,7 +3881,7 @@ u8 collect_bss_info(struct adapter *padapter, union r= ecv_frame *precv_frame, str } } =20 - memcpy(&le32_tmp, rtw_get_beacon_interval_from_ie(bssid->ies), 2); + memcpy(&le32_tmp, bssid->ies+RTW_BEACON_INTERVAL_IE_OFFSET, 2); bssid->configuration.beacon_period =3D le32_to_cpu(le32_tmp); =20 val16 =3D rtw_get_capability((struct wlan_bssid_ex *)bssid); diff --git a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c b/drivers/stagi= ng/rtl8723bs/core/rtw_wlan_util.c index 03e047397..1597fc33a 100644 --- a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c +++ b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c @@ -324,7 +324,7 @@ u16 get_beacon_interval(struct wlan_bssid_ex *bss) { __le16 val; =20 - memcpy((unsigned char *)&val, rtw_get_beacon_interval_from_ie(bss->ies), = 2); + memcpy((unsigned char *)&val, bss->ies+RTW_BEACON_INTERVAL_IE_OFFSET, 2); =20 return le16_to_cpu(val); } diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c b/drivers/staging= /rtl8723bs/hal/rtl8723b_cmd.c index c35c7f1c3..826a20529 100644 --- a/drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c +++ b/drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c @@ -128,7 +128,7 @@ static void ConstructBeacon(struct adapter *padapter, u= 8 *pframe, u32 *pLength) pktlen +=3D 8; =20 /* beacon interval: 2 bytes */ - memcpy(pframe, (unsigned char *)(rtw_get_beacon_interval_from_ie(cur_netw= ork->ies)), 2); + memcpy(pframe, (unsigned char *)(cur_network->ies+RTW_BEACON_INTERVAL_IE_= OFFSET), 2); =20 pframe +=3D 2; pktlen +=3D 2; diff --git a/drivers/staging/rtl8723bs/include/rtw_mlme.h b/drivers/staging= /rtl8723bs/include/rtw_mlme.h index 8c924e35a..23c46df90 100644 --- a/drivers/staging/rtl8723bs/include/rtw_mlme.h +++ b/drivers/staging/rtl8723bs/include/rtw_mlme.h @@ -43,6 +43,10 @@ #define _FW_UNDER_SURVEY WIFI_SITE_MONITOR =20 =20 +#define RTW_BEACON_INTERVAL_IE_OFFSET 8 + + + enum { dot11AuthAlgrthm_Open =3D 0, dot11AuthAlgrthm_Shared, @@ -366,7 +370,6 @@ bool rtw_if_up(struct adapter *padapter); bool rtw_linked_check(struct adapter *padapter); =20 u8 *rtw_get_capability_from_ie(u8 *ie); -u8 *rtw_get_beacon_interval_from_ie(u8 *ie); =20 =20 void rtw_joinbss_reset(struct adapter *padapter); --=20 2.55.0 From nobody Sat Jul 25 17:33:43 2026 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 D856848A2B4 for ; Wed, 15 Jul 2026 12:50:46 +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=1784119850; cv=none; b=mFbuO1uCaBh1aLsxmLHohlZyMY5sMvTJHOoBPAGr51P83OH8Ov9tHL1uI3QvAmltuQEvOaiRaFyfBl/4qCArcPbRO7Xe9f9GUYXRqfdg4IwhkrqnLXjyL2skAyFRNdah7WsLcfUm1LfRdjxtirw/0q9jFxxsaL0MMH4u4Qd+wbc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119850; c=relaxed/simple; bh=MLDCAjhau4+N8EDZSJMo7maYPptWbIlQKd6yEnP5wYU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=E7GoxaiTxY6Mb+H/q3m9HRtXKcmkPkS32hxYJuoUUuok40SnXsf6vladAKEt4iJW3vholqIubiUOR+8IKh83mIBN2tFL2qJsV9uV/QYHur/DmzZbHqM9SUJq1laLawpXXhGWX1qQGKEEhP7pYxWnEVUhcMQBGb+qPIaMSRxVQgU= 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=OCpcSxAq; 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="OCpcSxAq" Received: by mail-lf1-f43.google.com with SMTP id 2adb3069b0e04-5aeb2bc82ccso2685743e87.2 for ; Wed, 15 Jul 2026 05:50:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784119843; x=1784724643; 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=DshzI76EE/QJT7xJTIgm81rXA61uLEsU1/ph4m1+q0M=; b=OCpcSxAq4hM31/KHyQ8m+MbCVy83sbT3uzFbwUOMGxtmY7Z5zaa8SYEPFIPof3+pje KZ3D4Ij62orJsZXN9G+5U6nAlIt4P9yFukHis92eU9nO2vZY4sfv0f5GYr+41g/TP5/n oVzu2vOHanfcVi8zIdTYj3T1DJTWgN8K+QCnGwK2MIVR5YhseBubfar3rQWPmTESkeNp 7d+3ie55JCzU7SnxcrQZSh5cfie3mZpsAzY2TRs2PdfVjKUqZ5oyhA5rgx0gi5xtWKxa 2T37mnx+sFJoUMOkhz1+Xt4RK/TS60l9ZG7EKw+F6KV8sYfCwqIygT9Fhom4CkVlve0r BT2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784119843; x=1784724643; 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=DshzI76EE/QJT7xJTIgm81rXA61uLEsU1/ph4m1+q0M=; b=p0+tUsqlLvqxnt6zGgaMrSXAz2PahnvKZa2LCWjvYOM7LTapM2pioik6bYPu53oc7N komMGASRB0fLR/6/YgmvkDerEmdcZPrAItCFud96so7v+CplQ9weepNdRzFY2lIYNT8O iEV6PxOL7vvGNCcS9ghiEa6GQ0nEYPAYv7aci53kX2qw26U4qLUvcxqTGIiVFnlWdf1R OlqM/j9B40g9Tp94YzMTTBL1MJaLrtQUXFBp966+wHNplmSUXheE8tossaNvznDHBwpe sOPYr+vXrB6iMPRy3B2OgmJuq+wakI7o+VYz9rgToV6SHemP/CRY6T4NgZ4UA/6XX3rt bhgA== X-Forwarded-Encrypted: i=1; AHgh+RowAZujYiCosJEXJqGdlUXsXN+64VDEPHgjJT5/HPEAUR441MzxBv93KFeXSAWo/svMEUTVUAi1TO7yG9U=@vger.kernel.org X-Gm-Message-State: AOJu0YwrBH4D2oJ3du+VyfOEkxqWcUVRq6zgsXDHyI5MLrgjAC8rorph hhSfge7Te+b9ldHGlaGvDl4XIsZviEErZBC07B0zQzYiHrxTYtmVzOboTCnZjIyM2GA= X-Gm-Gg: AfdE7cmyPv3I4Feyp/vs6S8eoC20QU0nDdWaWQXyoplqzGpmsdAn66W9/bylq6yZ2ug cAJA+37kptM3QC3Y4zggMcyvuR6lEg5UPmaVnxqiZrJ0IzZ3qkbp3TwXgXoisMiaGvhJZxAeBZM NCYKvP1OmkOH8zU0zaBPAZeeDhqfNEBJ+ML5Oh7x+9q8mwOV/vxIlDjiQ9Vc5HVfVwBPz4yrtyq SWY6NQwT6EDKRwNjfVwsgyHrVA5Hha9LaNdKZ7zom5Z93Lmmy5A2u47m0ow8bZdYERZ3wDEMKIo UL/19Has3G85duLeFdUb9eoS693TF3sSiV5e0+8Zx4MZwNlOiKdC9dpdPX/MLKZoSwhXdNhLKGa M1pNeXnt9XbcS6F8RtaVNbGfElpvRNbY3w4bV65U3+BrsXiveWQ0nORqBNKCzr+eRUoyiP1qaiW QEELVr4YyGofrlecjF8F6dBKHg8NJXjDpwlZKs0ASz8WR0lUzI8VhKqCz5cZNmFPthmsxME4PpK Wy5avbLXafKFA== X-Received: by 2002:ac2:5686:0:b0:5b0:161f:8fc6 with SMTP id 2adb3069b0e04-5b02369d941mr3891332e87.40.1784119843154; Wed, 15 Jul 2026 05:50:43 -0700 (PDT) Received: from archlinux ([94.180.44.28]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b022fac999sm3404042e87.55.2026.07.15.05.50.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2026 05:50:42 -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 35/61] staging: rtl8723bs: inline _rtw_free_network_nolock into wrapper Date: Wed, 15 Jul 2026 19:48:03 +0700 Message-ID: <20260715124829.90290-36-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: quoted-printable Content-Type: text/plain; charset="utf-8" Collapse the internal _rtw_free_network_nolock() helper function into its only external caller, rtw_free_network_nolock(). The separation between these two functions served no architectural purpose and only created unnecessary call overhead by extracting and passing the mlmepriv pointer. Inlining the logic simplifies the BSS network freeing path. Clean up the internal function definition, remove its prototype from the header file, and keep only the unified rtw_free_network_nolock() function. Signed-off-by: Arsenii Pashchenko --- drivers/staging/rtl8723bs/core/rtw_mlme.c | 26 +++++++++----------- drivers/staging/rtl8723bs/include/rtw_mlme.h | 2 +- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rt= l8723bs/core/rtw_mlme.c index 0ec599383..1450589aa 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -198,20 +198,6 @@ void _rtw_free_network(struct mlme_priv *pmlmepriv, st= ruct wlan_network *pnetwor spin_unlock_bh(&free_queue->lock); } =20 -void _rtw_free_network_nolock(struct mlme_priv *pmlmepriv, struct wlan_net= work *pnetwork) -{ - struct __queue *free_queue =3D &pmlmepriv->free_bss_pool; - - if (!pnetwork) - return; - - if (pnetwork->fixed) - return; - - list_del_init(&pnetwork->list); - - list_add_tail(&pnetwork->list, get_list_head(free_queue)); -} =20 /* * return the wlan_network with the matching addr @@ -300,7 +286,17 @@ u16 rtw_get_capability(struct wlan_bssid_ex *bss) =20 void rtw_free_network_nolock(struct adapter *padapter, struct wlan_network= *pnetwork) { - _rtw_free_network_nolock(&padapter->mlmepriv, pnetwork); + struct __queue *free_queue =3D &padapter->mlmepriv.free_bss_pool; + + if (!pnetwork) + return; + + if (pnetwork->fixed) + return; + + list_del_init(&pnetwork->list); + + list_add_tail(&pnetwork->list, get_list_head(free_queue)); rtw_cfg80211_unlink_bss(padapter, pnetwork); } =20 diff --git a/drivers/staging/rtl8723bs/include/rtw_mlme.h b/drivers/staging= /rtl8723bs/include/rtw_mlme.h index 23c46df90..f15dfcac0 100644 --- a/drivers/staging/rtl8723bs/include/rtw_mlme.h +++ b/drivers/staging/rtl8723bs/include/rtw_mlme.h @@ -360,7 +360,6 @@ extern struct wlan_network *rtw_alloc_network(struct ml= me_priv *pmlmepriv); =20 =20 extern void _rtw_free_network(struct mlme_priv *pmlmepriv, struct wlan_net= work *pnetwork, u8 isfreeall); -extern void _rtw_free_network_nolock(struct mlme_priv *pmlmepriv, struct w= lan_network *pnetwork); =20 =20 extern struct wlan_network *_rtw_find_network(struct __queue *scanned_queu= e, u8 *addr); @@ -395,4 +394,5 @@ int rtw_select_roaming_candidate(struct mlme_priv *pmlm= epriv); void rtw_sta_media_status_rpt(struct adapter *adapter, struct sta_info *ps= ta, u32 mstatus); void rtw_reset_securitypriv(struct adapter *adapter); =20 +void rtw_free_network_nolock(struct adapter *padapter, struct wlan_network= *pnetwork); #endif /* __RTL871X_MLME_H_ */ --=20 2.55.0 From nobody Sat Jul 25 17:33:43 2026 Received: from mail-lf1-f54.google.com (mail-lf1-f54.google.com [209.85.167.54]) (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 2AE8648A2D7 for ; Wed, 15 Jul 2026 12:50:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119850; cv=none; b=rnfVXTqg8pGeEKOWrvRLAyDNbkhP+DE4im3lI9A6hC847OHM2LMhSbU1eD/mgRq1oEj6zBf1UKM3uGNgr4lMmzaX1DyqwzCCdosiG9izop8efSDFuvF0jC9ey6HZyD3L/UOmab0FbxjLCOJzMwT39JaekKeNfoOlrDKBy4SIyK0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119850; c=relaxed/simple; bh=n6fe+naOVACowWy5NFQ1XJF2gzsEWNhJRUv7gG6UAXg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ENfvREkVevqLS6BVyznnyX3nlC4QwEWXooxS5kHZh31EjbOJ9tp6NDJONgC1hHpc8jGQKXDbJUeCXEzfhe/qX5XYgOtWY7/hzysie+0mi5W1e9zQwVHfapMrlKUjUKU5oQ7HHF4FbUNBuf8fOjDgPyJAk5xNbNQRyUNsFiVP7Pc= 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=jQxShrGm; arc=none smtp.client-ip=209.85.167.54 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="jQxShrGm" Received: by mail-lf1-f54.google.com with SMTP id 2adb3069b0e04-5b14d1f9315so3760411e87.2 for ; Wed, 15 Jul 2026 05:50:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784119844; x=1784724644; 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=UEcs5vvVq43qJQUckvqztaAgEygqZRuFTmokfHHDOMs=; b=jQxShrGm4FiAPLtv4t7FAJK8hlQpz3Ioz6ybSqO8Mzwt+JLiHw0hsyEfGQou6Z3Z4k V1zbKMYZqoL/sx8pX33s+UKbrDqHl2iz2TNZ52JbeyA+zF92PetR5lSsLewe6rY/8vrw eYSjczDT8uyeqYLE1x92RpWc7D+VtswuOr5XthOsjN+cEusp1lYyj5fqxqWSWUGGZU1l I+PBlx0Cw0mg04sfmQFwVwMCPIrJyXRRGskal6KCsG2xZdTenO/1+AbTND9YCxWqGLhH 5qfAwbe6jqFBGbBZv9yENkIX1cD43eDYWjmroIyqQkbudNgkCQxhYjq4UeROhu6TQF2c 9MpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784119844; x=1784724644; 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=UEcs5vvVq43qJQUckvqztaAgEygqZRuFTmokfHHDOMs=; b=bmFSqM1I7kVT43uSJ4ILu7fTZnbV0+UeqGqbxACJlyVXolT+OvCXyEh68NHw/OIxzS ImNWDcoN9Q+bCkJ4UTq+IBheBMhI+OsF0e+Mdsgc2yus5Zvce4VHsoNG9AtN30TO1PIp NF+rc60P19y/bujQcIXIcnT5Ronq4PykVk8Hn8xc4P8HONWobnIMDMSP6pf32RitraiD pTBNYVyjoUMaY5h3OuK7G/zg8P4FM4WiUXh7KxJuwF2ZplA/8T3i2ZYkZjzcRSqwMHsa j53Jj4mm1jU+7ehOqIzNO8NGWP6Je5vHAV84vuttFcKeUF0ulj1DBbR8uVbseonqFkjM Qzpg== X-Forwarded-Encrypted: i=1; AHgh+RrQILRnbGznjBBjYF2bf70IcrjcVx1sbUI2hnFwV0Feiwp23gC9UZQX+J4bOw97jVm5GPz2fRq3+A7Rl14=@vger.kernel.org X-Gm-Message-State: AOJu0YwJs2lxp56UqJr3TzFt6grmWAtCggXDM2gZxalGS8RxfX9dktj7 6QCAtAXUIMCnTpcqLtC8zX3Y2sLLaIHWXdfKNogVBl8WgtXLXiNnLdBi X-Gm-Gg: AfdE7cneuyGfKr2te4Lb3nE1E8Y2X6AYf1cM4LsAjT3jT3amu5rEhILqrI6oT9/rcTN 1nfct1zimjVmJh4RYfw4JwznHLkO8QX+QSkAd4Dc1kt1z+CE3OsxFQnm7UOiLvIweJi10OX9JVc DL3fAqUl5qn1l8TgNQjAaDPc+ovEe6BiiaraTVfylzLb7F+icfPKASRuIJ7yjO2Y9hbm40B8EDe 4I1Va+kGyHTcX9Mi8N2Oy408kmVMsMuOD9gKTm8IFD/LboXyqiUGUvCiOOD87/3jQXJfCyc0YaA xiX3t2WV5cPyKLS+KLs07HjcMr+/aZ6rU45D7+XvN9cSff7GAZjb8q9SHNtADIom7fqSVIvuee0 fUOKMjdR0EAoYEbvN0AhLx5gPr2Y/nNO5gtz+rqc5J7wZT4cdHndxmlZcVq5veb0n9MwTvHZ7ms Ez0c2RnN87LI7ZFgegiUcd8EXl52EcodF5uNuOIFWqktpHjFpBR1Uox6kBhShMvrHgKCNg2FZgL oZtf8s4+xdnng== X-Received: by 2002:ac2:59c8:0:b0:5b0:17f0:606 with SMTP id 2adb3069b0e04-5b1582a3631mr1154258e87.40.1784119843966; Wed, 15 Jul 2026 05:50:43 -0700 (PDT) Received: from archlinux ([94.180.44.28]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b022fac999sm3404042e87.55.2026.07.15.05.50.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2026 05:50:43 -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 36/61] staging: rtl8723bs: remove rtw_wmm_event_callback and update handler Date: Wed, 15 Jul 2026 19:48:04 +0700 Message-ID: <20260715124829.90290-37-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: quoted-printable Content-Type: text/plain; charset="utf-8" Completely eliminate the rtw_wmm_event_callback() wrapper function. Adapt the signature of WMMOnAssocRsp() to match the event dispatcher prototype by adding an unused buffer pointer argument. Update the other invocation site of WMMOnAssocRsp() to pass a NULL argument, and register the handler directly in the wlanevents table. This removes a useless indirection layer from the event handling path. Signed-off-by: Arsenii Pashchenko --- drivers/staging/rtl8723bs/core/rtw_mlme.c | 4 ---- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 4 ++-- drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 2 +- drivers/staging/rtl8723bs/include/rtw_mlme.h | 1 - drivers/staging/rtl8723bs/include/rtw_mlme_ext.h | 2 +- 5 files changed, 4 insertions(+), 9 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rt= l8723bs/core/rtw_mlme.c index 1450589aa..b57b665c2 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -1483,10 +1483,6 @@ void rtw_cpwm_event_callback(struct adapter *padapte= r, u8 *pbuf) cpwm_int_hdl(padapter, preportpwrstate); } =20 -void rtw_wmm_event_callback(struct adapter *padapter, u8 *pbuf) -{ - WMMOnAssocRsp(padapter); -} =20 /* * _rtw_join_timeout_handler - Timeout/failure handler for CMD JoinBss diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/stagin= g/rtl8723bs/core/rtw_mlme_ext.c index 25dfb20f3..62abfd896 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c @@ -4658,7 +4658,7 @@ void mlmeext_joinbss_event_callback(struct adapter *p= adapter, int join_res) update_capinfo(padapter, pmlmeinfo->capability); =20 /* WMM, Update EDCA param */ - WMMOnAssocRsp(padapter); + WMMOnAssocRsp(padapter, NULL); =20 /* HT */ HTOnAssocRsp(padapter); @@ -5614,7 +5614,7 @@ static struct fwevent wlanevents[] =3D { {0, NULL}, {0, &rtw_cpwm_event_callback}, {0, NULL}, - {0, &rtw_wmm_event_callback}, + {0, &WMMOnAssocRsp}, =20 }; =20 diff --git a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c b/drivers/stagi= ng/rtl8723bs/core/rtw_wlan_util.c index 1597fc33a..df5508ce5 100644 --- a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c +++ b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c @@ -683,7 +683,7 @@ static void sort_wmm_ac_params(u32 *inx, u32 *edca) } } =20 -void WMMOnAssocRsp(struct adapter *padapter) +void WMMOnAssocRsp(struct adapter *padapter, u8 *pbuf) { u8 ACI, ACM, AIFS, ECWMin, ECWMax, aSifsTime; u8 acm_mask; diff --git a/drivers/staging/rtl8723bs/include/rtw_mlme.h b/drivers/staging= /rtl8723bs/include/rtw_mlme.h index f15dfcac0..973688bef 100644 --- a/drivers/staging/rtl8723bs/include/rtw_mlme.h +++ b/drivers/staging/rtl8723bs/include/rtw_mlme.h @@ -264,7 +264,6 @@ extern void rtw_stassoc_event_callback(struct adapter *= adapter, u8 *pbuf); extern void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf); extern void rtw_atimdone_event_callback(struct adapter *adapter, u8 *pbuf); extern void rtw_cpwm_event_callback(struct adapter *adapter, u8 *pbuf); -extern void rtw_wmm_event_callback(struct adapter *padapter, u8 *pbuf); =20 extern void rtw_join_timeout_handler(struct timer_list *t); extern void _rtw_scan_timeout_handler(struct timer_list *t); diff --git a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h b/drivers/sta= ging/rtl8723bs/include/rtw_mlme_ext.h index b12128963..3d1126740 100644 --- a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h +++ b/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h @@ -478,7 +478,7 @@ int is_IBSS_empty(struct adapter *padapter); unsigned char check_assoc_AP(u8 *pframe, uint len); =20 int WMM_param_handler(struct adapter *padapter, struct ndis_80211_var_ie *= pIE); -void WMMOnAssocRsp(struct adapter *padapter); +void WMMOnAssocRsp(struct adapter *padapter, u8 *pbuf); =20 void HT_caps_handler(struct adapter *padapter, struct ndis_80211_var_ie *p= IE); void HT_info_handler(struct adapter *padapter, struct ndis_80211_var_ie *p= IE); --=20 2.55.0 From nobody Sat Jul 25 17:33:43 2026 Received: from mail-lj1-f171.google.com (mail-lj1-f171.google.com [209.85.208.171]) (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 0330947CC99 for ; Wed, 15 Jul 2026 12:50:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119853; cv=none; b=Moz97nPX6UmIIM9XxdulNTRocrpyBZ5QLeyQc4c+xJjGV70CtsFynwUW+JNNVfNkohDlZXK/Ifc0LMnKnzsWlwlFUbmG+8oZW9oDZ0euBueuFNT3m3mXq60H1lUOPL27SBBDJFZ8yQGVqitBOrK1mMjfpF5jVCZd5NookwugRZU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119853; c=relaxed/simple; bh=ugc1wl73gyCiFlC8VPNE08duIEs6oNaSxsOBFhWPaAw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NQ1G92VGSBanvOG9OX4fPGAr7lsFCwfM77iuGvrby7x9mxwEL5hSDuaxQ5wgcMIv/6+jzcjcka13wQ8Q/NAezxxXggAFlqLVEbX6e8WyogTocM9ShlVqZYx9Ucq79/ERm51IhHr2QY4UVvrgA7rjyOTf5k1tYgT9uHiGeq2X+d4= 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=amFXCtMQ; arc=none smtp.client-ip=209.85.208.171 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="amFXCtMQ" Received: by mail-lj1-f171.google.com with SMTP id 38308e7fff4ca-39c9107baa7so54296461fa.3 for ; Wed, 15 Jul 2026 05:50:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784119845; x=1784724645; 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=AMl0JK2aYeTwB6YV2v47Dym/vUmzgdvhjJIdnzT3agg=; b=amFXCtMQI14Ne4Bt5AD/8xL2igXHJptu0GJsa+LnSMJB51yr5A09yo4TDTpzdRNCjz 1cXaAmNmHLyQhmu1we/SBlyfumXnyHyuqeNr435rtuJ1zNGtRe1qVkQBqbD1h2eD9bmm 7WKkG9wElHqSV6W/7m99YcMaBaO0OpILAIXCD4jOJ3cCjllc2YgvB5niH4+6zkP81NkG BaoLvDZcKFN4V4+gPN8S350A8LhRBceqQiHtLGYgOu1i7zH0prrIN99BdgYXxcV1yrnG YXde9uabo7QI3I76d1HaTdI7DGtYMR5mLLdJUfFqNtPfarCHNpgvUgHN6qkm6z/Vj38r rEUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784119845; x=1784724645; 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=AMl0JK2aYeTwB6YV2v47Dym/vUmzgdvhjJIdnzT3agg=; b=VD4mee1GizeAEibNtppmXzAMHJtGokxSvD8x94aEThzfedLPbuPshlT9mkpI2LpvV3 TSnVOZx7ZuMxuS2h8ZXIDnN2R874C4pQkUvZaRDtQ6/hQjW7/slTQ5kZPZ5XNSMbD7su aczYwiqZp8hcaS0AObmY6dh3dJF8u8BE0s002r+t6ha6gza4q81HnVXqSxrwHLsjg3cW rfA5v3UQx1GbjIyoEDt8H5Lj7MihlJsbQdu12DH07jQMA+TzhPFne7n7a0Y6Itth5fWY J96Qtd17GQ+yWWlBsuJEChfYtsTtS510L25LoPE/sMxcPX7XgmfWwXejpDULHLNeWww4 TSVQ== X-Forwarded-Encrypted: i=1; AHgh+Rph+E6tL5rwBUQaOOSUbq92r7GFIDnMJ16Gngn88USl8NCkr3upllk0b49Cx3TJMDprmbUNYsKAj8RovWQ=@vger.kernel.org X-Gm-Message-State: AOJu0Yy3fe02lH0EzeUz7aH8uZc1L9WWtA+QME0qYvKJgGP0VUuxtTU2 IZM4SLawFx8w/1eYre6EyPQfXdHxBXQ0W8ysfL+ikngfPfZx17GT0689uXeCDQU5dtM= X-Gm-Gg: AfdE7ckDZwpQHl465MWuu83GAvH/bY3xQBtNzypz7YuKx3wwsdOkJVvXOQW+8WiAOtg 0KdmaxmdvSDLaz/ICtfmm8VKBwDjKD0HC53IMS92+O7qtmvIft1gqIOPJnVm3UqVgKUgx6soEov KKCrYTyPYVqTpWJjEKZMmUY0jFUrSFuGy/NY0+XW+AnOXKeVA4jVv2qAgUz2NbFbL7XKm7P4/+5 P+Xpe20NchTTYlsZefoT2hjdzg8rzJYvQUU13cLR/YY70FQrirGmlBaCx0Q5P/modKhuyoDEmHg VPzO4i0H6vCMqbbCq1JuDsNXsIOe33fHBDmAQL8d7OlesD7Q9FC7eh1qAiIt7OKhp8zt307qyI6 L68AcPtH6wk/epAE9p1K+Ol23RU0W2AS2lPPWMtUQrH5f3dksUyErH3OkSPEqwObkRtCG9s4/39 EoySms/t9CLBzGTX9HGkmNyzmeokdY4QomAMaexNQaGhG6Hk1Q6AhaXuW28YTqrf5bvuEAkZX57 iHCMSaYmCJjfg== X-Received: by 2002:a05:6512:6819:b0:5b0:15b1:3d5d with SMTP id 2adb3069b0e04-5b15d783560mr562863e87.22.1784119844729; Wed, 15 Jul 2026 05:50:44 -0700 (PDT) Received: from archlinux ([94.180.44.28]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b022fac999sm3404042e87.55.2026.07.15.05.50.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2026 05:50:44 -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 37/61] staging: rtl8723bs: replace halbtc8723b1ant_SwMechanism with direct call Date: Wed, 15 Jul 2026 19:48:05 +0700 Message-ID: <20260715124829.90290-38-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: quoted-printable Content-Type: text/plain; charset="utf-8" Remove the redundant halbtc8723b1ant_SwMechanism() wrapper function from the Bluetooth coexistence code. The helper provides no extra logic, serving only to pass the arguments along with a fixed NORMAL_EXEC state flag to the underlying function halbtc8723b1ant_LowPenaltyRa(). Removing it simplifies the driver's coexistence mechanism path and eliminates unnecessary indirection. Clean up the function definition, remove its prototype from the header file, and update all call sites to invoke halbtc8723b1ant_LowPenaltyRa directly. Signed-off-by: Arsenii Pashchenko --- .../staging/rtl8723bs/hal/HalBtc8723b1Ant.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c b/drivers/stag= ing/rtl8723bs/hal/HalBtc8723b1Ant.c index 0613beaa3..522e4dd4c 100644 --- a/drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c +++ b/drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c @@ -755,12 +755,6 @@ static void halbtc8723b1ant_LpsRpwm( pCoexDm->preRpwm =3D pCoexDm->curRpwm; } =20 -static void halbtc8723b1ant_SwMechanism( - struct btc_coexist *pBtCoexist, bool bLowPenaltyRA -) -{ - halbtc8723b1ant_LowPenaltyRa(pBtCoexist, NORMAL_EXEC, bLowPenaltyRA); -} =20 static void halbtc8723b1ant_SetAntPath( struct btc_coexist *pBtCoexist, u8 antPosType, bool bInitHwCfg, bool bWif= iOff @@ -1271,35 +1265,32 @@ static bool halbtc8723b1ant_IsCommonAction(struct b= tc_coexist *pBtCoexist) !bWifiConnected && pCoexDm->btStatus =3D=3D BT_8723B_1ANT_BT_STATUS_NON_CONNECTED_IDLE ) { - /* halbtc8723b1ant_SwMechanism(pBtCoexist, false); */ =20 bCommon =3D true; } else if ( bWifiConnected && (pCoexDm->btStatus =3D=3D BT_8723B_1ANT_BT_STATUS_NON_CONNECTED_IDLE) ) { - /* halbtc8723b1ant_SwMechanism(pBtCoexist, false); */ =20 bCommon =3D true; } else if ( !bWifiConnected && (pCoexDm->btStatus =3D=3D BT_8723B_1ANT_BT_STATUS_CONNECTED_IDLE) ) { - /* halbtc8723b1ant_SwMechanism(pBtCoexist, false); */ =20 bCommon =3D true; } else if ( bWifiConnected && (pCoexDm->btStatus =3D=3D BT_8723B_1ANT_BT_STATUS_CONNECTED_IDLE) ) { - /* halbtc8723b1ant_SwMechanism(pBtCoexist, false); */ + =20 bCommon =3D true; } else if ( !bWifiConnected && (pCoexDm->btStatus !=3D BT_8723B_1ANT_BT_STATUS_CONNECTED_IDLE) ) { - /* halbtc8723b1ant_SwMechanism(pBtCoexist, false); */ + =20 bCommon =3D true; } else { @@ -1975,14 +1966,14 @@ static void halbtc8723b1ant_RunCoexistMechanism(str= uct btc_coexist *pBtCoexist) else halbtc8723b1ant_LimitedRx(pBtCoexist, NORMAL_EXEC, false, true, 0x8); =20 - halbtc8723b1ant_SwMechanism(pBtCoexist, true); + halbtc8723b1ant_LowPenaltyRa(pBtCoexist, NORMAL_EXEC, true); halbtc8723b1ant_RunSwCoexistMechanism(pBtCoexist); /* just print debug = message */ } else { halbtc8723b1ant_LimitedTx(pBtCoexist, NORMAL_EXEC, 0, 0, 0, 0); =20 halbtc8723b1ant_LimitedRx(pBtCoexist, NORMAL_EXEC, false, false, 0x5); =20 - halbtc8723b1ant_SwMechanism(pBtCoexist, false); + halbtc8723b1ant_LowPenaltyRa(pBtCoexist, NORMAL_EXEC, false); halbtc8723b1ant_RunSwCoexistMechanism(pBtCoexist); /* just print debug m= essage */ } =20 @@ -2019,7 +2010,7 @@ static void halbtc8723b1ant_InitCoexDm(struct btc_coe= xist *pBtCoexist) /* force to reset coex mechanism */ =20 /* sw all off */ - halbtc8723b1ant_SwMechanism(pBtCoexist, false); + halbtc8723b1ant_LowPenaltyRa(pBtCoexist, NORMAL_EXEC, false); =20 /* halbtc8723b1ant_PsTdma(pBtCoexist, FORCE_EXEC, false, 8); */ halbtc8723b1ant_CoexTableWithType(pBtCoexist, FORCE_EXEC, 0); --=20 2.55.0 From nobody Sat Jul 25 17:33:43 2026 Received: from mail-lf1-f45.google.com (mail-lf1-f45.google.com [209.85.167.45]) (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 5B34547CC80 for ; Wed, 15 Jul 2026 12:50:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119854; cv=none; b=QOBBJBNKvWRmMZ/K3/aDdBuURooXVqb01fpTfRk9KI0PCeWvYKxsuJay/GzP35LVxrvpX32TH4GwlPN7piDHex2Cdu+n2OMiezzycexz/WRCOzsE/nodGSFdwLEyvyFX15h45f8ETV48KoXj/Z9ed/Afs3M4b/3vXKqy5UovQzw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119854; c=relaxed/simple; bh=YtJxF4Is0snuBMbeg+ChIlG/QhAqDBn18REtNAV4k2E=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=keNQLjor4u3qehhOijjiX+vp31O7VhvpBnLIkRMPQKhQ/TDhYYTr7ADdAw4o5f5Qb2PXxPCyUmY1WD/36rHbWHT0s3DqYcWWZjb+Lbt1wxp0ILqp59iW0m0NBbMlQXABh404BK32teqGTh5m1eX7tILWtq/PQJ51at/7tYQ7YV4= 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=qcLUY6WK; arc=none smtp.client-ip=209.85.167.45 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="qcLUY6WK" Received: by mail-lf1-f45.google.com with SMTP id 2adb3069b0e04-5b013084dc2so1756567e87.0 for ; Wed, 15 Jul 2026 05:50:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784119846; x=1784724646; 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=IRZKMKBLHzjrLUfnJ386Esme59XPCYH886UtCUem0Pc=; b=qcLUY6WKYr/ZGqg1bKpnmE+ORNUrfPLZDJ7vv1lpoQX1T7h8RWMyDcvAgaeo6XP2aj HsOx0f56lqL1jR6ZICVXnEOzmnVCLf8X4/3pvevwKa7VGXAGiQzah6rDr6fxej40nGCY GifK7EsT1kgqKUZ5RE+ooiym81ApyHLK9o0icuerfgL0bqydbrB8RfeMka7lSBJvpMnQ /Ss2WAX6CaxlsfDH9wI8hD9FYNFDKfMAECR3vOvTB0uIfAcVMeJ3NvtIoUiylzMHk3k5 S8/LTXc0t1ePhZFa15qlLbjc8PV6ztp8gKEkzi5GDo0y1Au1KxC+vWoWXjYVvDOVIWF2 bVBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784119846; x=1784724646; 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=IRZKMKBLHzjrLUfnJ386Esme59XPCYH886UtCUem0Pc=; b=LHU9yxbs+7RsYlO1BoAx2yIkWfyi6HzVjU8GU6TQRvLDvPeepFzRSrxkxr2LedbXDa olAgKGtTiUcXdOF9i1sUreSN/INerBaz5AxzXU+OSSreh6sDcLefHRzRrI5k61+l5W9O G1gkZZ1H/z2dDoF4dAjuWx3tqFBZNqxZo3r/rFRz2Md2zZKnFnyuUh02fVIWVBxp6JOH ObIybpEOlY5++v0W1fQgR+Ok4q9/FTGQRE23VmQsx583s6kTccVA5ytI0SqPr1kDGIRX QlH2JvkqhnTSvxGPoR6eo4dICtiWNABtDmKFaoNQAZGle+C+W8Dw04VaYZK9tKT5MHHs 7NuA== X-Forwarded-Encrypted: i=1; AHgh+Rqj8rnUwRma77UhhhBb7VqPKo/Gao85+gVPapxD0ljX4HjFEWn0g7raNinLOhTmSNQB36PM79qO5NRduTI=@vger.kernel.org X-Gm-Message-State: AOJu0YwTC/h4dyH1zZTf0XsUAWukyjXjTK8WSo5wQNrVsV4Cfl0o2icN d7qH4XdgMNo0c9JL9BdEX5fxRonm1Xe2sRnFWeOR6+xvkwSlhYiGXYOe X-Gm-Gg: AfdE7clSKR+Nxht/p+UWlgz5BHqTJpTu5ZyM7w2jI3+mDb4nM/DLz18MsN0clBO/OCu daRnPEiCTPdN2+nyH0YJNOA2BZMC2NSHcQft8nWlN0pg+fUW7p2fWIvKgcumT0xMbHq4Rs4YufD rg9P1OaW5gaDsTlkEsBQ2N7Fgt8o7dOMZPrVg+8vkqehozk12I4pZkJ55yyJLkggTe6gGuzP9LY NyGl3ofmfcG/mFZg96hsCIkf3Tnt5232E56CTz3SxjNGJ1UF9DPfsPLzA0y3ED3eSmtpshZUPAJ IEZ3koPEhf0Ki8x5T9t956IrmM+iFuzRw6TgGOcT+owsA8BhZMUyB0TJECl2yuuiWhHTGIioQ+R +4CyezNjeW6FzYtgnYOSOHig0kVi2UxG5TZ1s8ymoojbx6DIPWTOwaPSjeV04B61gSNhMAEysSz 1E5OqN9s5RyY41Sze4cjYvvM6REvvlK8xqoE28VFLwtuRL0g2W+aJdlx0FgHvJM2jEUHOUrZzu0 VeAT2ykhSMDGQ== X-Received: by 2002:a05:6512:8344:b0:5ae:c745:f39 with SMTP id 2adb3069b0e04-5b0236a66ccmr2897073e87.44.1784119845553; Wed, 15 Jul 2026 05:50:45 -0700 (PDT) Received: from archlinux ([94.180.44.28]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b022fac999sm3404042e87.55.2026.07.15.05.50.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2026 05:50:45 -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 38/61] staging: rtl8723bs: remove redundant ternary operators from bool returns Date: Wed, 15 Jul 2026 19:48:06 +0700 Message-ID: <20260715124829.90290-39-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: quoted-printable Content-Type: text/plain; charset="utf-8" Purge all implicit and redundant ternary operator expressions of the form '(condition) ? true : false' or comparisons with zero from logical return statements across the driver. Expressions like '(atomic_read(...) !=3D 0) ? true : false' add useless visual clutter and unnecessary branching, since the underlying comparison or atomic read already naturally evaluates to a boolean truth value in C. Replace these verbose patterns with direct return statements to streamline the code, maximize readability, and match standard kernel coding style. Signed-off-by: Arsenii Pashchenko --- drivers/staging/rtl8723bs/core/rtw_mlme.c | 6 +++--- drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 2 +- drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.h | 2 +- drivers/staging/rtl8723bs/hal/HalBtcOutSrc.h | 11 ++++++++--- drivers/staging/rtl8723bs/hal/hal_com.c | 2 +- drivers/staging/rtl8723bs/hal/odm_HWConfig.c | 2 +- drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 4 ++-- drivers/staging/rtl8723bs/hal/sdio_halinit.c | 4 ++-- drivers/staging/rtl8723bs/include/ieee80211.h | 6 +++--- drivers/staging/rtl8723bs/include/rtw_pwrctrl.h | 2 +- drivers/staging/rtl8723bs/os_dep/osdep_service.c | 4 ++-- 11 files changed, 25 insertions(+), 20 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rt= l8723bs/core/rtw_mlme.c index b57b665c2..7e5f73707 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -1629,7 +1629,7 @@ inline bool rtw_is_scan_deny(struct adapter *adapter) { struct mlme_priv *mlmepriv =3D &adapter->mlmepriv; =20 - return (atomic_read(&mlmepriv->set_scan_deny) !=3D 0) ? true : false; + return atomic_read(&mlmepriv->set_scan_deny); } =20 inline void rtw_clear_scan_deny(struct adapter *adapter) @@ -2197,8 +2197,8 @@ void rtw_ht_use_default_setting(struct adapter *padap= ter) else phtpriv->bss_coexist =3D 0; =20 - phtpriv->sgi_40m =3D TEST_FLAG(pregistrypriv->short_gi, BIT(1)) ? true : = false; - phtpriv->sgi_20m =3D TEST_FLAG(pregistrypriv->short_gi, BIT(0)) ? true : = false; + phtpriv->sgi_40m =3D TEST_FLAG(pregistrypriv->short_gi, BIT(1)); + phtpriv->sgi_20m =3D TEST_FLAG(pregistrypriv->short_gi, BIT(0)); =20 /* LDPC support */ rtw_hal_get_def_var(padapter, HAL_DEF_RX_LDPC, (u8 *)&bHwLDPCSupport); diff --git a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c b/drivers/stagi= ng/rtl8723bs/core/rtw_wlan_util.c index df5508ce5..d833c5e3a 100644 --- a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c +++ b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c @@ -476,7 +476,7 @@ static bool _rtw_camid_is_gk(struct adapter *adapter, u= 8 cam_id) if (!(cam_ctl->bitmap & BIT(cam_id))) goto exit; =20 - ret =3D (dvobj->cam_cache[cam_id].ctrl & BIT(6)) ? true : false; + ret =3D dvobj->cam_cache[cam_id].ctrl & BIT(6); =20 exit: return ret; diff --git a/drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.h b/drivers/stag= ing/rtl8723bs/hal/HalBtc8723b1Ant.h index 7a12d92da..f39c93ac7 100644 --- a/drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.h +++ b/drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.h @@ -15,7 +15,7 @@ #define BT_INFO_8723B_1ANT_B_CONNECTION BIT(0) =20 #define BT_INFO_8723B_1ANT_A2DP_BASIC_RATE(_BT_INFO_EXT_) \ - (((_BT_INFO_EXT_ & BIT(0))) ? true : false) + (((_BT_INFO_EXT_ & BIT(0)))) =20 #define BTC_RSSI_COEX_THRESH_TOL_8723B_1ANT 2 =20 diff --git a/drivers/staging/rtl8723bs/hal/HalBtcOutSrc.h b/drivers/staging= /rtl8723bs/hal/HalBtcOutSrc.h index 36b0f429d..0002b822a 100644 --- a/drivers/staging/rtl8723bs/hal/HalBtcOutSrc.h +++ b/drivers/staging/rtl8723bs/hal/HalBtcOutSrc.h @@ -93,9 +93,14 @@ enum { BTC_RSSI_STATE_STAY_LOW =3D 0x5, BTC_RSSI_MAX }; -#define BTC_RSSI_HIGH(_rssi_) ((_rssi_ =3D=3D BTC_RSSI_STATE_HIGH || _rssi= _ =3D=3D BTC_RSSI_STATE_STAY_HIGH) ? true : false) -#define BTC_RSSI_MEDIUM(_rssi_) ((_rssi_ =3D=3D BTC_RSSI_STATE_MEDIUM || _= rssi_ =3D=3D BTC_RSSI_STATE_STAY_MEDIUM) ? true : false) -#define BTC_RSSI_LOW(_rssi_) ((_rssi_ =3D=3D BTC_RSSI_STATE_LOW || _rssi_ = =3D=3D BTC_RSSI_STATE_STAY_LOW) ? true : false) +#define BTC_RSSI_HIGH(_rssi_) \ + ((_rssi_) =3D=3D BTC_RSSI_STATE_HIGH || (_rssi_) =3D=3D BTC_RSSI_STATE_ST= AY_HIGH) + +#define BTC_RSSI_MEDIUM(_rssi_) \ + ((_rssi_) =3D=3D BTC_RSSI_STATE_MEDIUM || (_rssi_) =3D=3D BTC_RSSI_STATE_= STAY_MEDIUM) + +#define BTC_RSSI_LOW(_rssi_) \ + ((_rssi_) =3D=3D BTC_RSSI_STATE_LOW || (_rssi_) =3D=3D BTC_RSSI_STATE_STA= Y_LOW) =20 enum { BTC_WIFI_BW_LEGACY =3D 0x0, diff --git a/drivers/staging/rtl8723bs/hal/hal_com.c b/drivers/staging/rtl8= 723bs/hal/hal_com.c index 634af4657..77b189efa 100644 --- a/drivers/staging/rtl8723bs/hal/hal_com.c +++ b/drivers/staging/rtl8723bs/hal/hal_com.c @@ -396,7 +396,7 @@ bool Hal_MappingOutPipe(struct adapter *padapter, u8 Nu= mOutPipe) { struct registry_priv *pregistrypriv =3D &padapter->registrypriv; =20 - bool bWIFICfg =3D (pregistrypriv->wifi_spec) ? true : false; + bool bWIFICfg =3D pregistrypriv->wifi_spec; =20 bool result =3D true; =20 diff --git a/drivers/staging/rtl8723bs/hal/odm_HWConfig.c b/drivers/staging= /rtl8723bs/hal/odm_HWConfig.c index c88d669cb..5b374eea0 100644 --- a/drivers/staging/rtl8723bs/hal/odm_HWConfig.c +++ b/drivers/staging/rtl8723bs/hal/odm_HWConfig.c @@ -268,7 +268,7 @@ static void odm_Process_RSSIForDM( if (pPktinfo->is_beacon) pDM_Odm->PhyDbgInfo.NumQryBeaconPkt++; =20 - isCCKrate =3D ((pPktinfo->data_rate <=3D DESC_RATE11M)) ? true : false; + isCCKrate =3D pPktinfo->data_rate <=3D DESC_RATE11M; pDM_Odm->RxRate =3D pPktinfo->data_rate; =20 /* Statistic for antenna/path diversity------------------ */ diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/st= aging/rtl8723bs/hal/rtl8723b_hal_init.c index 53f6cd708..7ddc75e65 100644 --- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c @@ -2751,7 +2751,7 @@ void GetHwReg8723B(struct adapter *padapter, u8 varia= ble, u8 *val) { /* BCN_VALID, BIT16 of REG_TDECTRL =3D BIT0 of REG_TDECTRL+2 */ val8 =3D rtw_read8(padapter, REG_TDECTRL+2); - *val =3D (BIT(0) & val8) ? true : false; + *val =3D BIT(0) & val8; } break; =20 @@ -2805,7 +2805,7 @@ void GetHwReg8723B(struct adapter *padapter, u8 varia= ble, u8 *val) break; case HW_VAR_CHK_HI_QUEUE_EMPTY: val16 =3D rtw_read16(padapter, REG_TXPKT_EMPTY); - *val =3D (val16 & BIT(10)) ? true : false; + *val =3D val16 & BIT(10); break; default: GetHwReg(padapter, variable, val); diff --git a/drivers/staging/rtl8723bs/hal/sdio_halinit.c b/drivers/staging= /rtl8723bs/hal/sdio_halinit.c index ed9b8fb07..767db342c 100644 --- a/drivers/staging/rtl8723bs/hal/sdio_halinit.c +++ b/drivers/staging/rtl8723bs/hal/sdio_halinit.c @@ -1032,8 +1032,8 @@ static void _ReadPROMContent(struct adapter *padapter) =20 eeValue =3D rtw_read8(padapter, REG_9346CR); /* To check system boot selection. */ - pEEPROM->EepromOrEfuse =3D (eeValue & BOOT_FROM_EEPROM) ? true : false; - pEEPROM->bautoload_fail_flag =3D (eeValue & EEPROM_EN) ? false : true; + pEEPROM->EepromOrEfuse =3D eeValue & BOOT_FROM_EEPROM; + pEEPROM->bautoload_fail_flag =3D eeValue & EEPROM_EN; =20 _ReadEfuseInfo8723BS(padapter); } diff --git a/drivers/staging/rtl8723bs/include/ieee80211.h b/drivers/stagin= g/rtl8723bs/include/ieee80211.h index 39ee139f1..3363c6496 100644 --- a/drivers/staging/rtl8723bs/include/ieee80211.h +++ b/drivers/staging/rtl8723bs/include/ieee80211.h @@ -155,10 +155,10 @@ enum network_type { =20 #define is_legacy_only(net_type) ((net_type) =3D=3D ((net_type) & (WIRELE= SS_11BG))) =20 -#define is_supported_24g(net_type) ((net_type) & SUPPORTED_24G_NETTYPE_MSK= ? true : false) +#define is_supported_24g(net_type) ((net_type) & SUPPORTED_24G_NETTYPE_MSK) =20 -#define is_supported_tx_cck(net_type) (((net_type) & (WIRELESS_11B)) ? tru= e : false) -#define is_supported_ht(net_type) (((net_type) & (WIRELESS_11_24N)) ? true= : false) +#define is_supported_tx_cck(net_type) (((net_type) & (WIRELESS_11B))) +#define is_supported_ht(net_type) (((net_type) & (WIRELESS_11_24N))) =20 struct ieee_param { u32 cmd; diff --git a/drivers/staging/rtl8723bs/include/rtw_pwrctrl.h b/drivers/stag= ing/rtl8723bs/include/rtw_pwrctrl.h index 9b6c42e4f..bcf141274 100644 --- a/drivers/staging/rtl8723bs/include/rtw_pwrctrl.h +++ b/drivers/staging/rtl8723bs/include/rtw_pwrctrl.h @@ -80,7 +80,7 @@ enum rt_rf_power_state { #define RT_RF_LPS_DISALBE_2R BIT(30) /* When LPS is on, disable 2R if n= o packet is received or transmitted. */ #define RT_RF_LPS_LEVEL_ASPM BIT(31) /* LPS with ASPM */ =20 -#define RT_IN_PS_LEVEL(ppsc, _PS_FLAG) ((ppsc->cur_ps_level & _PS_FLAG) ?= true : false) +#define RT_IN_PS_LEVEL(ppsc, _PS_FLAG) ((ppsc->cur_ps_level & _PS_FLAG)) #define RT_CLEAR_PS_LEVEL(ppsc, _PS_FLAG) (ppsc->cur_ps_level &=3D (~(_PS_= FLAG))) #define RT_SET_PS_LEVEL(ppsc, _PS_FLAG) (ppsc->cur_ps_level |=3D _PS_FLAG) =20 diff --git a/drivers/staging/rtl8723bs/os_dep/osdep_service.c b/drivers/sta= ging/rtl8723bs/os_dep/osdep_service.c index 4cfdf7c62..214c1fd9b 100644 --- a/drivers/staging/rtl8723bs/os_dep/osdep_service.c +++ b/drivers/staging/rtl8723bs/os_dep/osdep_service.c @@ -130,7 +130,7 @@ void rtw_buf_update(u8 **buf, u32 *buf_len, u8 *src, u3= 2 src_len) */ inline bool rtw_cbuf_full(struct rtw_cbuf *cbuf) { - return (cbuf->write =3D=3D cbuf->read - 1) ? true : false; + return cbuf->write =3D=3D cbuf->read - 1; } =20 /** @@ -141,7 +141,7 @@ inline bool rtw_cbuf_full(struct rtw_cbuf *cbuf) */ inline bool rtw_cbuf_empty(struct rtw_cbuf *cbuf) { - return (cbuf->write =3D=3D cbuf->read) ? true : false; + return cbuf->write =3D=3D cbuf->read; } =20 /** --=20 2.55.0 From nobody Sat Jul 25 17:33:43 2026 Received: from mail-lj1-f181.google.com (mail-lj1-f181.google.com [209.85.208.181]) (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 2657047CC9E for ; Wed, 15 Jul 2026 12:50:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119853; cv=none; b=YYTLR83e2BXdqKOgzjW2eT3qcJewBL1yJvAglNR23WtY2WGGQpwqtf7WJUoZHx16ld+/x0cMaRpIClUAFDq7O/zdrKORdVQoYSwneML1maoMd9zPaeXM5CKbcNyUZOn67yAlL7mWB4wKcItsxb7BaGAIQI1wcwPh1j31ItGaKb4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119853; c=relaxed/simple; bh=Y+mJVQsdOZhHspaLoCX+QJxQEN60zb+BQLiuQAAuisE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ljhe8CsTHhVjEWcUQXvLFGSzHqDRS5tHmNFqIAH5OEMzB3TJ5JUb+3nDChG9Piuq2c9jiC2aX1Ks2OuPmDdaqt1xOtv5PVY4soPplM9MFAqRGkdEIAPwuyg2MHsq8ViLOvQRhEoqGel23dDW3bOyxKAn/wQsI9y/9u1nF5VL6TE= 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=FgOpbL0P; arc=none smtp.client-ip=209.85.208.181 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="FgOpbL0P" Received: by mail-lj1-f181.google.com with SMTP id 38308e7fff4ca-39c9452244aso50336081fa.3 for ; Wed, 15 Jul 2026 05:50:49 -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=CFZ/4Gw2NifXMZ8Gb7PCOFhMD9zPHtXEzuF5ovYnS7E=; b=FgOpbL0PykuTjMLEiZZzFuJTLF2Q0icbFJ/ErwneYi6KZCIJzVRBMyj31f5URlmzH5 uPNxXaZafhuYtUqNDgcU8Q1DyQetFD7skgzwwUIM8azhJRDk/zp+8Lx4RqCpwRdolPBb y6kCzqD7DtWjQFS5dNBugJLR6kRrIpKYVAHID/p/SDs72UvgVvTitWxC3beDD4WNID/M vUndiR1vXCJBmbFTenh4jYQ8YumN35SwpSYEkhobF9yi/5N8fhTjS6+OKfqtxe4UKRux IqQf8uQuE3pCeTfC54zBti9ujzmVBfo0DOImmltk9/xQmXYxHQvLKrwHvS13QlGWvtCn Wmew== 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=CFZ/4Gw2NifXMZ8Gb7PCOFhMD9zPHtXEzuF5ovYnS7E=; b=go8qMlAnLm2xZs6NBO65hekMIcnDzeyzSpDVpELwBlIBZY0blOwCR0fhQ7cht4Hls/ b3x+K+jkqiHqbtGfgzXI0dXLJiQiv4yi3QZI9RcG7GS5lmaI00N0g6TllkFwpYRKi4I/ 9Vygjtvy5Ullsd48qy+pZqMhYmV0tktO/mrMl6jw5Q1lLkoTaxfx99BN5pcbXagqOYtX cf11pQ/lDLdx9eAG12XAD7iP1wYES2wyrfKp5aZzuJ7pX03vaUfVNCEocm4NPhLKJjsH SLaa1o4Y18kNoT+FpgPXll9p0LoSN7iec8Za0+KHnOYHJX8wEhvqTEV8ZxpVo3Rv4syZ uNAw== X-Forwarded-Encrypted: i=1; AHgh+RpTIyZqtCl4OWwzOgSu+Ksa0jE8b3357VqsrOnD6stXQrrt+EKZPieO20zh4wKo1m2Ai1+usCVIC9CjVaI=@vger.kernel.org X-Gm-Message-State: AOJu0Yxi3WjAEkd9cRxJbwzNmV7N4+CdjLmPMn84Mgfjuipt34WoaRzg ycYSbFE8K/VXYQdl4Dbqi27xIPYXtXdaZ3OEYqjGFkPSVi1a2MbeKH49 X-Gm-Gg: AfdE7cl12vDdzUFjoeLSDk2qh2S9cvqFFtVgufaEkELPhbpmEhUhEx+h5avHLzr9PN6 W+a6CeXoDoqyNEghG7bb0AuT5klgOp0lBXvi6Jv4agpuqrA0/BWRD4kpRa8VksPtXwFDfPEQsGF t7+sUMacWMZNpI2/p8GrWSdUYbqOw+9qfJWLq0XtY7r59wgTSE5nPAp2xqdu44iAOxh2cLumT5o rWUMeBuFA7wfjhmX74kw1FpJArlVDMq53Cj4mv8T3uTxg3FJ9Ad9vhUdXJ1LZQvt567pUhIRYFW svQGRRsV4VP/YujBEMYhzQTEhF+Thiwj9T2DDWwdLS0LkZFZR7WT5tsF5l6LM4hjGCq22vtyYCM 41zrmCx6YZXUt+SdfVi0tzR9OGiXpook+0deY+uSgq74hIGrfdAF6Biljl7bIq7deVf4ovIjypc zgQIRGecx1iaSB0qwU79aVqBQgTpPNKV2+gzgjgiRZ13ZjPeViCCABe13SScusZpS229AtEGO6O tgYa+ECQFprRP27kVfCNeq6 X-Received: by 2002:a05:6512:690:b0:5ae:bd4d:68c8 with SMTP id 2adb3069b0e04-5b159b874bemr1279318e87.46.1784119846371; Wed, 15 Jul 2026 05:50:46 -0700 (PDT) Received: from archlinux ([94.180.44.28]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b022fac999sm3404042e87.55.2026.07.15.05.50.45 (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 39/61] staging: rtl8723bs: remove redundant DM wrapper Date: Wed, 15 Jul 2026 19:48:07 +0700 Message-ID: <20260715124829.90290-40-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: quoted-printable Content-Type: text/plain; charset="utf-8" Remove the useless external wrapper function EXhalbtc8723b2ant_InitCoexDm and call the internal halbtc8723b2ant_InitCoexDm directly. This cleans up the driver code and cuts down on redundant layer calls. Signed-off-by: Arsenii Pashchenko --- drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c | 5 +---- drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.h | 1 - drivers/staging/rtl8723bs/hal/hal_btcoex.c | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c b/drivers/stag= ing/rtl8723bs/hal/HalBtc8723b2Ant.c index 6da6940c9..f1d8e01bb 100644 --- a/drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c +++ b/drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c @@ -2378,10 +2378,7 @@ void EXhalbtc8723b2ant_InitHwConfig(struct btc_coexi= st *pBtCoexist, bool bWifiOn halbtc8723b2ant_InitHwConfig(pBtCoexist, true); } =20 -void EXhalbtc8723b2ant_InitCoexDm(struct btc_coexist *pBtCoexist) -{ - halbtc8723b2ant_InitCoexDm(pBtCoexist); -} + =20 void EXhalbtc8723b2ant_IpsNotify(struct btc_coexist *pBtCoexist, u8 type) { diff --git a/drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.h b/drivers/stag= ing/rtl8723bs/hal/HalBtc8723b2Ant.h index ebc47f65e..b0e24c69d 100644 --- a/drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.h +++ b/drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.h @@ -131,7 +131,6 @@ struct coex_sta_8723b_2ant { /* */ void EXhalbtc8723b2ant_PowerOnSetting(struct btc_coexist *pBtCoexist); void EXhalbtc8723b2ant_InitHwConfig(struct btc_coexist *pBtCoexist, bool b= WifiOnly); -void EXhalbtc8723b2ant_InitCoexDm(struct btc_coexist *pBtCoexist); 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); diff --git a/drivers/staging/rtl8723bs/hal/hal_btcoex.c b/drivers/staging/r= tl8723bs/hal/hal_btcoex.c index c66ca6f73..a975e3393 100644 --- a/drivers/staging/rtl8723bs/hal/hal_btcoex.c +++ b/drivers/staging/rtl8723bs/hal/hal_btcoex.c @@ -846,7 +846,7 @@ void EXhalbtcoutsrc_InitCoexDm(struct btc_coexist *pBtC= oexist) pBtCoexist->statistics.cntInitCoexDm++; =20 if (pBtCoexist->boardInfo.btdmAntNum =3D=3D 2) - EXhalbtc8723b2ant_InitCoexDm(pBtCoexist); + halbtc8723b2ant_InitCoexDm(pBtCoexist); else if (pBtCoexist->boardInfo.btdmAntNum =3D=3D 1) EXhalbtc8723b1ant_InitCoexDm(pBtCoexist); =20 --=20 2.55.0 From nobody Sat Jul 25 17:33:43 2026 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: quoted-printable Content-Type: text/plain; charset="utf-8" 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/stag= ing/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_c= oexist *pBtCoexist) pBtCoexist->fBtcWrite1ByteBitMask(pBtCoexist, 0x67, 0x20, 0x1); /* BT se= lect s0/s1 is controlled by WiFi */ } =20 -static void halbtc8723b2ant_InitHwConfig(struct btc_coexist *pBtCoexist, b= ool bBackUp) +void halbtc8723b2ant_InitHwConfig(struct btc_coexist *pBtCoexist) { u8 u1Tmp =3D 0; =20 @@ -2373,10 +2373,7 @@ void EXhalbtc8723b2ant_PowerOnSetting(struct btc_coe= xist *pBtCoexist) } } =20 -void EXhalbtc8723b2ant_InitHwConfig(struct btc_coexist *pBtCoexist, bool b= WifiOnly) -{ - halbtc8723b2ant_InitHwConfig(pBtCoexist, true); -} + =20 =20 =20 @@ -2389,7 +2386,7 @@ void EXhalbtc8723b2ant_IpsNotify(struct btc_coexist *= pBtCoexist, u8 type) halbtc8723b2ant_CoexAllOff(pBtCoexist); } else if (type =3D=3D BTC_IPS_LEAVE) { pCoexSta->bUnderIps =3D 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 =3D=3D BTC_WIFI_PNP_SLEEP) { } else if (pnpState =3D=3D 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/stag= ing/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 b= WifiOnly); 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 pnpSta= te); 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/r= tl8723bs/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 *pB= tCoexist, u8 bWifiOnly) pBtCoexist->statistics.cntInitHwConfig++; =20 if (pBtCoexist->boardInfo.btdmAntNum =3D=3D 2) - EXhalbtc8723b2ant_InitHwConfig(pBtCoexist, bWifiOnly); + halbtc8723b2ant_InitHwConfig(pBtCoexist); else if (pBtCoexist->boardInfo.btdmAntNum =3D=3D 1) EXhalbtc8723b1ant_InitHwConfig(pBtCoexist, bWifiOnly); } --=20 2.55.0 From nobody Sat Jul 25 17:33:43 2026 Received: from mail-lj1-f179.google.com (mail-lj1-f179.google.com [209.85.208.179]) (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 E28F048C40C for ; Wed, 15 Jul 2026 12:50:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119859; cv=none; b=R2LMndVVtlmDbaNhLeCSOjlbAuMdLbYH3o8eqmyreqT1W9BN6SUM5bdRX5UjuEKNwqFdsifOizgHnuUdsDHYvFaUSxC3UpA6PXDe8qthy9xh3/DgPRbKnYgFLISwyAEjYGOAAqwsXizk2ZSd1vprXxxXNGLURn9i6EE5sUyLGMk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119859; c=relaxed/simple; bh=wtfrGOSbYySqm4h0oIWWSq7cMn7fwHq4h1Zh+gzcI6c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bz1C02jBP2IwLMPrNqb2NujeQAfcUZLv9vMXK7zsYsEKtdIfZdAhbQTMhD7uJ0SOSEE944PCQNlaiOLeYla+y2O6ryFMh9AEDeOQtl0pcF0/jl4botWUYS4Ps815AmtUVeXbWIUsabnyGLZqFXFyZtLlcJV6gJ5pCtJvbhpUPXw= 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=sM6GOygN; arc=none smtp.client-ip=209.85.208.179 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="sM6GOygN" Received: by mail-lj1-f179.google.com with SMTP id 38308e7fff4ca-39c9452243cso21030011fa.3 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=1784119848; x=1784724648; 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=fjto6yW0lhXk7pSEPdKcvcJzxoNat2gyFFa/JjfwEhA=; b=sM6GOygN2tNQNfeNab2Y7jTZzytLgDz+1WUnFB4pTfeAtGmLVAneZ3LyGHuHjWTTly jlZK9ofbDPW+ZI6ppiXYDRN3YBXqbejA4Qzrog/t+8jG8JLS5zVvL2mSl/zprJgODgu6 Gv521O+5OTJRUk0NXEyuJzCj020o+hUC/IXuv3eukL12TVTnCwc1So5icyoQb0gVFMcV xDyTzj0ZoagXZFMmqNWdc58tNYJ+ONHZDPn8GfumOFGJErPQif5RDK4kkj3GNa+46FoS WM3vaOAB2U++YuO65vqjZ6cUJFVkHTJzw5vKH5RCbE5dgjMBQlROqEL/iG+unpox9aik XSdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784119848; x=1784724648; 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=fjto6yW0lhXk7pSEPdKcvcJzxoNat2gyFFa/JjfwEhA=; b=i2IfP6fOdqp8vKc5LEZ+V7IYpD17Eg31Mf6GgOtr1DtBzWmqP9p3oClzPIg5GNaZbV QjV5oM3kUMDHGe/rESil61yDluq+XDN6DIVP5p4CsGkqKfyeULHwgy5Ps+FEnHn28zYU 3pfFiSlgKp8ZRb8Cdfjx9EPhT57he65HjYS6FChB4aXBABxzkCPX/U989fXkLgf77Za2 vTxzMOMxPnQdnwaxwgtZtoIWT4KFtNb+fvfxEGcPDqcbF72uV8b5yZ0dzPzFyaJk3fya kmOSDXu2Y/KY73mW9qq1fcjZfqpmlE4cd2lxxmBb0FNnwpjlUWh8CD+yTJSF8WpzRgVt CInw== X-Forwarded-Encrypted: i=1; AHgh+RrHMJ6lqSG0N8B9JowQsrx1hn2ZbshuCYtm16xlQpuZmutyyBekdp1t1RZ6bXcnroiZmRcFLReNZXENEZE=@vger.kernel.org X-Gm-Message-State: AOJu0YzXmtk4lMu5uKeopeFhJxLhpmuLGt/nb5FsxSwiSn42a0ElusB6 UfZDQaVpEFsduySTCF1nwITSLMbPzbWWHltO77f2aATa5yDdzHKoWEPL X-Gm-Gg: AfdE7cm2h4BBMaYxgQEEWujL8lvmeavTVLf4KW4MBgscAjJFWh10QQAv3b8HCmtB700 EHYKzaJLEV1jcAGBLfQUOnQM/LcUnJCrQ34ld1ekJYgsNtxx7x6q7k4PZ1eGigykNSNGRl7MkQY z0OHE46THHbBvlUTXHjo4LOiY0PtzIfA12q9UPX6+B4y0xBDbAmZUHD2p57142LxpO5AXFctiLi 9sZMgcL+Bd5YLnDkomkvNPRbuQfS0nBw9gjMkGk3kJURyd8WB10UhyVSMaAnIFNdu16RZaW0tOR cEtY7N6ZLJCRjJ/2PTLl0YUWkc8vemfeWcoewVO/mKUJhADnHtdX/qpCDjT2RSYqCQ0H9K6o6/Z Zk26iA2jOL5coV8EmZQNt2Ok6oG353881U5Gr2EL329KT+J0ylPX6h3TQfyEtTzHIo+DLwULy8o BM/kKswGQq1vR1h21usiCj2mtDpeeDUlngtB+gGS/eB+T4IeKMaNdp3coIquUZ4jyd9TdoFTFpR hXbLVIJyHN6jXaFS68ru63r X-Received: by 2002:a05:6512:2390:b0:5b1:5dab:4640 with SMTP id 2adb3069b0e04-5b15dab4eeemr757981e87.57.1784119848012; Wed, 15 Jul 2026 05:50:48 -0700 (PDT) Received: from archlinux ([94.180.44.28]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b022fac999sm3404042e87.55.2026.07.15.05.50.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2026 05:50:47 -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 41/61] staging: rtl8723bs: remove EXhalbtc8723b1ant_InitHwConfig Date: Wed, 15 Jul 2026 19:48:09 +0700 Message-ID: <20260715124829.90290-42-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: quoted-printable Content-Type: text/plain; charset="utf-8" Remove the useless external wrapper function EXhalbtc8723b1ant_InitHwConfig. Call the internal function halbtc8723b1ant_InitHwConfig directly, passing true as the second argument to preserve the original behavior and clean up the code. Signed-off-by: Arsenii Pashchenko --- drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c | 6 +----- drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.h | 3 ++- drivers/staging/rtl8723bs/hal/hal_btcoex.c | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c b/drivers/stag= ing/rtl8723bs/hal/HalBtc8723b1Ant.c index 522e4dd4c..0fde1654a 100644 --- a/drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c +++ b/drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c @@ -2018,7 +2018,7 @@ static void halbtc8723b1ant_InitCoexDm(struct btc_coe= xist *pBtCoexist) pCoexSta->popEventCnt =3D 0; } =20 -static void halbtc8723b1ant_InitHwConfig( +void halbtc8723b1ant_InitHwConfig( struct btc_coexist *pBtCoexist, bool bBackUp, bool bWifiOnly @@ -2107,10 +2107,6 @@ void EXhalbtc8723b1ant_PowerOnSetting(struct btc_coe= xist *pBtCoexist) } } =20 -void EXhalbtc8723b1ant_InitHwConfig(struct btc_coexist *pBtCoexist, bool b= WifiOnly) -{ - halbtc8723b1ant_InitHwConfig(pBtCoexist, true, bWifiOnly); -} =20 void EXhalbtc8723b1ant_InitCoexDm(struct btc_coexist *pBtCoexist) { diff --git a/drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.h b/drivers/stag= ing/rtl8723bs/hal/HalBtc8723b1Ant.h index f39c93ac7..8180b6071 100644 --- a/drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.h +++ b/drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.h @@ -168,7 +168,6 @@ struct coex_sta_8723b_1ant { /* The following is interface which will notify coex module. */ /* */ void EXhalbtc8723b1ant_PowerOnSetting(struct btc_coexist *pBtCoexist); -void EXhalbtc8723b1ant_InitHwConfig(struct btc_coexist *pBtCoexist, bool b= WifiOnly); void EXhalbtc8723b1ant_InitCoexDm(struct btc_coexist *pBtCoexist); void EXhalbtc8723b1ant_IpsNotify(struct btc_coexist *pBtCoexist, u8 type); void EXhalbtc8723b1ant_LpsNotify(struct btc_coexist *pBtCoexist, u8 type); @@ -182,3 +181,5 @@ void EXhalbtc8723b1ant_BtInfoNotify( void EXhalbtc8723b1ant_HaltNotify(struct btc_coexist *pBtCoexist); void EXhalbtc8723b1ant_PnpNotify(struct btc_coexist *pBtCoexist, u8 pnpSta= te); void EXhalbtc8723b1ant_Periodical(struct btc_coexist *pBtCoexist); + +void halbtc8723b1ant_InitHwConfig(struct btc_coexist *pBtCoexist, bool bBa= ckUp, bool bWifiOnly); diff --git a/drivers/staging/rtl8723bs/hal/hal_btcoex.c b/drivers/staging/r= tl8723bs/hal/hal_btcoex.c index c2d355ef1..5a3aa9b16 100644 --- a/drivers/staging/rtl8723bs/hal/hal_btcoex.c +++ b/drivers/staging/rtl8723bs/hal/hal_btcoex.c @@ -835,7 +835,7 @@ void EXhalbtcoutsrc_InitHwConfig(struct btc_coexist *pB= tCoexist, u8 bWifiOnly) if (pBtCoexist->boardInfo.btdmAntNum =3D=3D 2) halbtc8723b2ant_InitHwConfig(pBtCoexist); else if (pBtCoexist->boardInfo.btdmAntNum =3D=3D 1) - EXhalbtc8723b1ant_InitHwConfig(pBtCoexist, bWifiOnly); + halbtc8723b1ant_InitHwConfig(pBtCoexist, true, bWifiOnly); } =20 void EXhalbtcoutsrc_InitCoexDm(struct btc_coexist *pBtCoexist) --=20 2.55.0 From nobody Sat Jul 25 17:33:43 2026 Received: from mail-lf1-f46.google.com (mail-lf1-f46.google.com [209.85.167.46]) (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 E1F6348C40B for ; Wed, 15 Jul 2026 12:50:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119866; cv=none; b=aSmz+Dh66E1nLDF+eVyS3Gi179a0NU/9vcZHuiE2Kl9dO1GM/BA5pFq1n3Lvp4vNUHR9jntlQKHgvsmQh3Zt8Nky7t1Xm1KJ729idtwlFeS2SHsfHKw97bz6Sq9J1VrvqXmfUq2/uCVbCOV6vvcUyopxVfatQsqcO4V7qGo5iBE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119866; c=relaxed/simple; bh=xlFC6HLoV2n1vFY6zAXQKisCqIRVD1f4N5Bs+wu8YGA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Fu6nhYxDI6NxUsPP9xPj86f3Mg+SrAPT7mbP8XJGj78Gsbz058+2BKxzgFTICKiae0HqDxA2rqMZmHwQ4mdPB4JZtcvaFsuU2MIOtPmAeOIfUsIjp+nEkI4q+aBZJH5wmuQQ53Tul4qs+kYl5WreMrEt0QxRCFtHDoWIoaHbNTA= 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=E9LA1kMl; arc=none smtp.client-ip=209.85.167.46 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="E9LA1kMl" Received: by mail-lf1-f46.google.com with SMTP id 2adb3069b0e04-5b0117d49dcso5087024e87.3 for ; Wed, 15 Jul 2026 05:50:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784119849; x=1784724649; 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=dr2lce3rXypZeYHhFi4dr63szYheMvNYAGHnVpT1kRQ=; b=E9LA1kMlYmPRw84FHeGZyssOcEJGbQAexJ+il5eIhfi0yuUG8nR1Z5bZAUttaw80QE 0tdz0wkADUtvMd1iPEBz21gE2zBxe4SByVLVCkXvdVRBsxpJVR+N9F7CHoirI+1+NQ1B BnjtRPf2P9O3rYLmP/odpHLG+o8k1WwN70j3XfRRN63IkjuWa9hOAC9zYedAwm0l3QDt VQMfTPWA84EbKDIZRXbsmOGC393u/X0gRCyx3a/z3hKwG5w8aBOJDFHqhHUrlBIZ0n4S dYVWw2nYuFqDa5EPQBTB13DFA6q2metfXk0vZlkiZeDpIX49LR8GUpNsV5+soesPQa5v n0ig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784119849; x=1784724649; 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=dr2lce3rXypZeYHhFi4dr63szYheMvNYAGHnVpT1kRQ=; b=Y6u4wiVGghlCS4EppHu+FNVAlWojbFwhobOYyZ/dLxz7pkcz46w00lOJUdol2VkrbB HsPKTJz87iaYoZPPewXIMrRHuhzJTv4tqpvPyC3cOm8QNqxi7s8VnKHfF7+m3Gk0Osow gMa/mhXZaCBl0hFM70SyFhchfw5vh0dsxOgraRxl/bc87uy4bQPrzrLqXZne19luVG84 0GP9opDEZa+0AVPwb4QWmD9vxR7obNkZdLLns6ybbq0Whbpd7WuvaLLLWWDVaAjCge1x H+oZ7kvhpWHyuPrrKzH65hV2uQxVu3CXsl8wIMFSnxcsBntbKTmDZ4YKJTzN9vh/XF0h 4LYQ== X-Forwarded-Encrypted: i=1; AHgh+RpHrferr/gALQSd3Poa/PmRTIOZVRg5nya4Ai/682i28nLG6FoEv0BAG17MELNSKts+UWtahLH0CoFBoxo=@vger.kernel.org X-Gm-Message-State: AOJu0Yzci6QfhV574iNR9/M4Nav/nP9WmBxA2CY9R/btiniiD365fcd8 0cT8xHYSUEk7bgNF16y3aKNzmZML7nz0UOCD30F+NiBrTThK4uTKWPyB X-Gm-Gg: AfdE7ckPGgG54DIXB940jm67y+5BUi1+FbQIr8isxBKz1aCruLAnxECfDcsmWwKdt6L Jk4CT/+c8KKDy9rOmRN4gZwBi0mTAxmt4rgN+x8/vOMwkuPs1JJxS56BmwKbjyMZG10UlXET70t XtZrwpKbhmXfg80o5PMsaq2bvDY3HG8LOg96/bNrzhhCLXPooEYlBf9nxJMHFcRVM5is0j9KfVG 1QMutkMgZaYcTQwEJzBnTp+/6mtzH7v41n/juXXyNTC+ITNJuK7GvQ7aPFfwkLbxiKO3ac71USv M3SkRncmC+Sz61SLH6BGohyhmBDFrRZBONPQnSucONtQvjwH84TmfD/ZIol2feR3VGc5D3F0aEU qxgwVCoZWLLSc/xt5uwVNojilOqdRkqVS1qQp289cna2vz6d/xEQA3qCw5E/7QLldXUF5QYKiFs BeOT/FM2gZn4+KXlo3zt+sGq5q7SqAFOt0ZT56yQBa3auUxecaIa5J5/+1XOmJQ4TltvaBq15IN KiVhZNlGHedz3Tx5gtb/vCD X-Received: by 2002:a05:6512:4016:b0:5b0:13b4:6079 with SMTP id 2adb3069b0e04-5b159b8919cmr1426425e87.53.1784119848808; Wed, 15 Jul 2026 05:50:48 -0700 (PDT) Received: from archlinux ([94.180.44.28]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b022fac999sm3404042e87.55.2026.07.15.05.50.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2026 05:50:48 -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 42/61] staging: rtl8723bs: remove ConfigureTxpowerTrack wrapper Date: Wed, 15 Jul 2026 19:48:10 +0700 Message-ID: <20260715124829.90290-43-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: quoted-printable Content-Type: text/plain; charset="utf-8" Remove the useless external wrapper function ConfigureTxpowerTrack. Call ConfigureTxpowerTrack_8723B directly instead. This eliminates the unused pDM_Odm argument and cleans up the driver code Signed-off-by: Arsenii Pashchenko --- drivers/staging/rtl8723bs/hal/HalPhyRf.c | 7 ++----- drivers/staging/rtl8723bs/hal/HalPhyRf.h | 1 - 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/staging/rtl8723bs/hal/HalPhyRf.c b/drivers/staging/rtl= 8723bs/hal/HalPhyRf.c index 9e4d42e3a..14b4ac979 100644 --- a/drivers/staging/rtl8723bs/hal/HalPhyRf.c +++ b/drivers/staging/rtl8723bs/hal/HalPhyRf.c @@ -8,10 +8,7 @@ /* include "Mp_Precomp.h" */ #include "odm_precomp.h" =20 -void ConfigureTxpowerTrack(struct dm_odm_t *pDM_Odm, struct txpwrtrack_cfg= *pConfig) -{ - ConfigureTxpowerTrack_8723B(pConfig); -} + =20 /* */ /* <20121113, Kordan> This function should be called when TxAGC changed. = */ @@ -78,7 +75,7 @@ void ODM_TXPowerTrackingCallback_ThermalMeter(struct adap= ter *Adapter) =20 /* 4 2. Initialization (7 steps in total) */ =20 - ConfigureTxpowerTrack(pDM_Odm, &c); + ConfigureTxpowerTrack_8723B(&c); =20 (*c.GetDeltaSwingTable)( pDM_Odm, diff --git a/drivers/staging/rtl8723bs/hal/HalPhyRf.h b/drivers/staging/rtl= 8723bs/hal/HalPhyRf.h index bd9430db9..3d098ce34 100644 --- a/drivers/staging/rtl8723bs/hal/HalPhyRf.h +++ b/drivers/staging/rtl8723bs/hal/HalPhyRf.h @@ -30,7 +30,6 @@ struct txpwrtrack_cfg { FuncSwing GetDeltaSwingTable; }; =20 -void ConfigureTxpowerTrack(struct dm_odm_t *pDM_Odm, struct txpwrtrack_cfg= *pConfig); =20 void ODM_ClearTxPowerTrackingState(struct dm_odm_t *pDM_Odm); =20 --=20 2.55.0 From nobody Sat Jul 25 17:33:43 2026 Received: from mail-lf1-f45.google.com (mail-lf1-f45.google.com [209.85.167.45]) (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 CB25448C3E9 for ; Wed, 15 Jul 2026 12:50:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119859; cv=none; b=c2i+b1xyku8Brp6MKYCcpAXDL4KKpGFXMj6gRd4YQywxve1nBi0ym1quRydjtMyRycgEfZ9SdR7qtZx6uRnM8cANwEE3fTjcpO4FL2vyXbDpbSKQ3SzhN90UZMpD2qaBd8Lsa02KY9C/yvzE7StMaMfsdHZ0sN9tyAkoGNje+7c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119859; c=relaxed/simple; bh=cwXX7ms4/umUkHjUjsP25YrhWlK607b1FhhyvAawXiE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FXX/ArRFIbf0KD8JZZD3ZYa6t015VjMMTbr0Z9GwKbI3HPQdH78OtSgD9BLmPM+42SkMYpsLn3JMBnshDPTit8q2Ad3E/RXETghu39qOVFz7r4kM1XleUmQGOVdA4vzl3odZbzbnQ+NNUTAJk2VStB257aLjWC6HiRmstmnRme0= 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=nzmDdtRm; arc=none smtp.client-ip=209.85.167.45 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="nzmDdtRm" Received: by mail-lf1-f45.google.com with SMTP id 2adb3069b0e04-5b0f19bea2fso2003033e87.1 for ; Wed, 15 Jul 2026 05:50:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784119850; x=1784724650; 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=S1IQxcNYl0l/efRSdGK8pGbUYPf2b4AIC2rBtAFJvUI=; b=nzmDdtRmGdbhTXfUyecEjc5Bh/kigvICx626NF+ymYhQMlMaPmeEMlpxu9cCM3fLvD u/d4LAAFOXIkko/Bbkvl8CqilVt6iSrC6lIPc7IiUabF/emDxcSfTosiWApsWUsEyZiy GOF6f1HpeNFPWJoXjR1goLwsM3GIR0UXpWx/GfAEfzRt2LwXjhIXQg6T7AFm0nQIsus1 WQS5mFsKhY8QkQObCIWfYm9aGJmfdemrtdGMR/466g5lsS3e2A3fdfwD1SoMQ5UX96iB dX6fm8FmYXmnGIHFChvOORTlDIu6VdZ5H+DaVWx7EFgRycTGV/yShhNuXby1JPjTkZSK IgGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784119850; x=1784724650; 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=S1IQxcNYl0l/efRSdGK8pGbUYPf2b4AIC2rBtAFJvUI=; b=jAGa9PiMeqqXEQZetd+Q8c6km4WbC6iE+b8wuhHASyJCi57KskE6nz6z75QX/a4Z2S h489F7v0uD2AiswolB8CpkJXsBp/yWgNZdtR+kdNyHbTU88nFA8zlHqZvMLlvTfDb0Gi Ezw6cxcCok3jbgoVAuKyy95mQnWsj68O5ZO5DJh0WHFTHtqbX35PUrJqQQX1n4C7o81Y 7e+3ApR78EwbaNyWDmfv4V3GTGGNT4dYNsa9V9XR4FusuQ7mJVsW/YsT0QGrUqjHXe47 sVpEVAT079Q7qdrdcM7Ai9pbUwOWA/ywJAfr5fhqc+N+/ywuHHi5d+zXm0uFuFd1QwyB D1KQ== X-Forwarded-Encrypted: i=1; AHgh+RptaKsnOYS9JMfVNfH+1DfTs8hSHG2TnfO1Mk46xAegpFij10QXk4xq0DL7ID6yTWplEcI1rwvYS51gAY4=@vger.kernel.org X-Gm-Message-State: AOJu0Yz9go2DmDM0UAjWqbpRrpZJgmOk5TZVaxbqIRQEb0a03Gb+3mMx MXF4Qp+7CyZ9keJhlfrAcdYPO66rfiUuiAOQy3giQAjAkg4vlDp43nPX2QPGc5iKE5E= X-Gm-Gg: AfdE7clPMn6tff4GQFwtkiFu1SWwvDtJ376XF8vgiUrQ75fW0aCs+u0q7vPmx4BV8Ft DGdeuSItgR9cSGr6MC+n2JT2068ifzyY8I21fiNHCKTckxgrFabIk60togcBMbyPpWTLHl4i/cV OBn4roeu5RFCP92lVjeell6Kf0VUrwGv7DoMXqfNpl/Io3OZXjJK3vDWwWWn8Z6Y4NN7waVSWMn S2MPIzrX2Qw8Mw9kuEZp86TH5EQ+8O/hytBwQgy/TBghxiSSj2FlS80MDsRxubpgGsXi1EoUMEa V6/y/11s1h5RH63Yhy7jykKJnWk7rBvNnksxQmpXIwh1+LTPaUPCKnSbPq/6KlVUF1c4udfaXag dvKjJbkdj3VxIFkbX8tF2fpiRs7NsR9ddBDlDbnfsbfCDbXGK+TpGTkLpWjJ078ekmgK2l+fjYB jCfOdQYJLmv/xBPZrNnxAF4nYOqTRnl4/bmGdlWpR9YOpdNDo8KzNBtww6FUTiiDutBbZ/M3h4o r1ZBrtx9aaBbg== X-Received: by 2002:a05:6512:6404:b0:5ae:c8da:6254 with SMTP id 2adb3069b0e04-5b02366709cmr3674216e87.22.1784119849563; Wed, 15 Jul 2026 05:50:49 -0700 (PDT) Received: from archlinux ([94.180.44.28]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b022fac999sm3404042e87.55.2026.07.15.05.50.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2026 05:50:49 -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 43/61] staging: rtl8723bs: remove hal_init_macaddr wrapper Date: Wed, 15 Jul 2026 19:48:11 +0700 Message-ID: <20260715124829.90290-44-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: quoted-printable Content-Type: text/plain; charset="utf-8" Remove the thin wrapper function hal_init_macaddr. Call the underlying rtw_hal_set_hwreg function directly with the HW_VAR_MAC_ADDR register argument to eliminate an unnecessary call layer. Signed-off-by: Arsenii Pashchenko --- drivers/staging/rtl8723bs/hal/hal_com.c | 4 ---- drivers/staging/rtl8723bs/hal/sdio_halinit.c | 2 +- drivers/staging/rtl8723bs/include/hal_com.h | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/staging/rtl8723bs/hal/hal_com.c b/drivers/staging/rtl8= 723bs/hal/hal_com.c index 77b189efa..ca0f7d7ec 100644 --- a/drivers/staging/rtl8723bs/hal/hal_com.c +++ b/drivers/staging/rtl8723bs/hal/hal_com.c @@ -420,10 +420,6 @@ bool Hal_MappingOutPipe(struct adapter *padapter, u8 N= umOutPipe) =20 } =20 -void hal_init_macaddr(struct adapter *adapter) -{ - rtw_hal_set_hwreg(adapter, HW_VAR_MAC_ADDR, adapter->eeprompriv.mac_addr); -} =20 void rtw_init_hal_com_default_value(struct adapter *Adapter) { diff --git a/drivers/staging/rtl8723bs/hal/sdio_halinit.c b/drivers/staging= /rtl8723bs/hal/sdio_halinit.c index 767db342c..731ca9276 100644 --- a/drivers/staging/rtl8723bs/hal/sdio_halinit.c +++ b/drivers/staging/rtl8723bs/hal/sdio_halinit.c @@ -688,7 +688,7 @@ u32 rtl8723bs_hal_init(struct adapter *padapter) =20 /* Get Rx PHY status in order to report RSSI and others. */ _InitDriverInfoSize(padapter, DRVINFO_SZ); - hal_init_macaddr(padapter); + rtw_hal_set_hwreg(padapter, HW_VAR_MAC_ADDR, padapter->eeprompriv.mac_add= r); _InitNetworkType(padapter); _InitWMACSetting(padapter); _InitAdaptiveCtrl(padapter); diff --git a/drivers/staging/rtl8723bs/include/hal_com.h b/drivers/staging/= rtl8723bs/include/hal_com.h index 7bbf62cfd..a52d8318d 100644 --- a/drivers/staging/rtl8723bs/include/hal_com.h +++ b/drivers/staging/rtl8723bs/include/hal_com.h @@ -121,7 +121,7 @@ struct adapter *padapter, u8 NumOutPipe ); =20 -void hal_init_macaddr(struct adapter *adapter); + =20 void rtw_init_hal_com_default_value(struct adapter *Adapter); =20 --=20 2.55.0 From nobody Sat Jul 25 17:33:43 2026 Received: from mail-lj1-f172.google.com (mail-lj1-f172.google.com [209.85.208.172]) (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 8F27747D94F for ; Wed, 15 Jul 2026 12:50:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119859; cv=none; b=X++kyyRlWQvuVhe4XBv4GJLyJyolOrxqLiQN+p4BNkKxITgxrUgFZSblp5KDBcyfyPc9Sdr3Mqs94/DXvE1Of/OeDRCb83I+NVzSSDLaraTbJ3GltqtThkANbKBem2tvtSZZYHz6zpZ/5qmS+B2q0kAIDDnMO7VVQT5I81ATBbg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119859; c=relaxed/simple; bh=MgwMfJEReFvN72328jtvIskPGt3bR6CiNueYu5D+8PQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kmC+RqWgY3NKVj6aO9dZo68iyl3D0p4ZKevTeIMdlyJ/Pje10mersWz6vdyY252YW/lAo4hsai5dV2U/ubGUdcgreysNgpAJNGm4GDLALrI+f6FTJ1BOMAXlvlG/rk0hL0nGeVL7Ca50g2eTDxFbD+ky+G/d3i9wXGl8mMwnh2g= 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=VOwRafiM; arc=none smtp.client-ip=209.85.208.172 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="VOwRafiM" Received: by mail-lj1-f172.google.com with SMTP id 38308e7fff4ca-39c908d6cb6so47694801fa.1 for ; Wed, 15 Jul 2026 05:50:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784119851; x=1784724651; 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=lChfMGSwq/R5r+MODZabX6LrPsAs/T7BI6oVqUDf/sI=; b=VOwRafiM19S2r8kHVCGT489b8zfKsFqmnIRXfbTjlpEqpfQ5/g2JUa0BhUV+RNxPuj BuTNIUpW7MwH+XsUK+qCjrNpGu686+b8gSaLZLL4ADAR/wQb3q/NvfasRGxbPjuYOH7g K93y2iPJgz4nOyZNvnuMuvhgaYbva4oInTrF9c4Wfc006Jesz2xAfj6+id5RPuihbu3M x1McakCE9Gkc6PP/qXmlyadkMo9GHqV3dISDo5KfBRk/CZoWhit+ETrQij9DlRwzvwQq SGs6gYZ41EbW09mUmCnz2njiI6pnev/JyuMsxL/jxycqy3gX3bzuj7aHgJhrfa7T9naJ i0uA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784119851; x=1784724651; 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=lChfMGSwq/R5r+MODZabX6LrPsAs/T7BI6oVqUDf/sI=; b=c3RW1FC8DjiWsriFbC76ObbUoJAppO81ZQDk14mWV9SaGM3f6/LiGQWkf0IKWh8MCN uC6tOceIEb+8UWVxM/ld40zcAYJO57kPd0WIADQV9mez9cNGOqp0IsDpatHPB2eEw7bV 5SRs0OGQET9u6tnXBA/23oPpWfE6C2N/bUZcMPw7eFQE+L/lxTedIbCj27TGegyB986R c9jIKytRPsXTzJW0fbpU1ZpwVDSJ7VrpWXU5uvfhjmvf8yMoZbdg6E0Ozs+Ll/Ru/prQ l+AvAutrOnrsPxWrLhmPjLQWtyyXVAhFsPmar+DxFkzNQt9AlnC9iUSQQUSFnsSB5UB6 pKQQ== X-Forwarded-Encrypted: i=1; AHgh+RqFiv3wyfwLl0oFlaUSJXA0T6xmw1SV0MiFDW++D5TIzFIfgMqv5LBrfcaOaYXcUO23ICPZVvItVz/P16U=@vger.kernel.org X-Gm-Message-State: AOJu0YxTtbPZvgx3SlHL9A7etYbThA6eBAnDg4H1SuVDpo6n4sRGu6P/ nVlRrvvfuBVslTu0NedyNJDwPwdzo6AmzopB1w8zkw5+2YGBDg7qyiF7 X-Gm-Gg: AfdE7ckfD0RlYuhHYyX1lzNg7RWFOePmrVWw1lWjEsKMB2d8BTNWlqxxZgz/kLJb6jn ecm2Fq18iWHJ/nwtSq4d0HkgcqfAsVPLEtLz75yKedS7w9sHzyO29ayHEnKb8UeqNbChe2vHh9N poExQiQcIjxrcB3SOPHGzO8rz/n0EYk+/5rFVwXUG6dMrcH3relE7C91vbea0+WvNy1xdrpHtsS gk9DT6Gmq3alz5Rg5wNKy8y5DE+z8H8KwPlRJmoQ4mpRixCxI17IsRR22KMezXQq8no+YuCEyuQ zlrkqt6hcVwD7rqjQK4B+CRtW2nRqqpzCEAOMm4EcdhA1dwmQsmyBYGYLHvRG0aFH1jzl6z1oyy PGUtLLI4zZHItaNKmPOknnjwrx0fYrLrhk6hCfbQG/cvhA7XauiCGfxwAbOEDiUZcuogtZuL63g FL7J4AnraSWXtjbk4tT/jpe+OCS0myssuOReoVpNc5UU7wacICTmAfj8nwMRvvlvkiClfOsEhf1 kKKs3Cx5vWznA== X-Received: by 2002:a05:6512:4045:20b0:5b0:2176:69f6 with SMTP id 2adb3069b0e04-5b15d7a50b0mr461132e87.37.1784119850645; Wed, 15 Jul 2026 05:50:50 -0700 (PDT) Received: from archlinux ([94.180.44.28]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b022fac999sm3404042e87.55.2026.07.15.05.50.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2026 05:50:50 -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 44/61] staging: rtl8723bs: remove rtw_init_hal_com_default_value Date: Wed, 15 Jul 2026 19:48:12 +0700 Message-ID: <20260715124829.90290-45-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: quoted-printable Content-Type: text/plain; charset="utf-8" Remove the single-line function rtw_init_hal_com_default_value. Move the AntDetection initialization directly to the main HAL setup phase to avoid an unnecessary function call layer. Signed-off-by: Arsenii Pashchenko --- drivers/staging/rtl8723bs/hal/hal_com.c | 8 -------- drivers/staging/rtl8723bs/include/hal_com.h | 1 - drivers/staging/rtl8723bs/os_dep/os_intfs.c | 7 +++++-- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/drivers/staging/rtl8723bs/hal/hal_com.c b/drivers/staging/rtl8= 723bs/hal/hal_com.c index ca0f7d7ec..638d598e4 100644 --- a/drivers/staging/rtl8723bs/hal/hal_com.c +++ b/drivers/staging/rtl8723bs/hal/hal_com.c @@ -420,14 +420,6 @@ bool Hal_MappingOutPipe(struct adapter *padapter, u8 N= umOutPipe) =20 } =20 - -void rtw_init_hal_com_default_value(struct adapter *Adapter) -{ - struct hal_com_data *pHalData =3D GET_HAL_DATA(Adapter); - - pHalData->AntDetection =3D 1; -} - /* * C2H event format: * Field TRIGGER CONTENT CMD_SEQ CMD_LEN CMD_ID diff --git a/drivers/staging/rtl8723bs/include/hal_com.h b/drivers/staging/= rtl8723bs/include/hal_com.h index a52d8318d..e6d32cf53 100644 --- a/drivers/staging/rtl8723bs/include/hal_com.h +++ b/drivers/staging/rtl8723bs/include/hal_com.h @@ -123,7 +123,6 @@ u8 NumOutPipe =20 =20 =20 -void rtw_init_hal_com_default_value(struct adapter *Adapter); =20 void c2h_evt_clear(struct adapter *adapter); s32 c2h_evt_read_88xx(struct adapter *adapter, u8 *buf); diff --git a/drivers/staging/rtl8723bs/os_dep/os_intfs.c b/drivers/staging/= rtl8723bs/os_dep/os_intfs.c index f31196f54..295da8c23 100644 --- a/drivers/staging/rtl8723bs/os_dep/os_intfs.c +++ b/drivers/staging/rtl8723bs/os_dep/os_intfs.c @@ -640,7 +640,10 @@ u8 rtw_init_drv_sw(struct adapter *padapter) =20 rtw_init_default_value(padapter); =20 - rtw_init_hal_com_default_value(padapter); + struct hal_com_data *pHalData =3D GET_HAL_DATA(padapter); + + pHalData->AntDetection =3D 1; + =20 if (rtw_init_cmd_priv(&padapter->cmdpriv)) return _FAIL; @@ -665,7 +668,7 @@ u8 rtw_init_drv_sw(struct adapter *padapter) spin_lock_init(&padapter->security_key_mutex); =20 /* We don't need to memset padapter->XXX to zero, because adapter is all= ocated by vzalloc(). */ - /* memset((unsigned char *)&padapter->securitypriv, 0, sizeof (struct sec= urity_priv)); */ + /* memset((u8 *)&padapter->securitypriv, 0, sizeof (struct security_priv)= ); */ =20 if (_rtw_init_sta_priv(&padapter->stapriv) =3D=3D _FAIL) goto free_recv_priv; --=20 2.55.0 From nobody Sat Jul 25 17:33:43 2026 Received: from mail-lj1-f176.google.com (mail-lj1-f176.google.com [209.85.208.176]) (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 288CD494A1E for ; Wed, 15 Jul 2026 12:50:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119861; cv=none; b=I6rD082uGwrfVZaRLf7q72fKDbfFONRY2AzvXLt/KUbNpXCu8rpEbCgPXtfvvMmtbjmhEUqJDOeMO0RMIbJI3j6O0QQkIVa/NO6+5uDJEeBBdw2dIfH4BQ2d4EEo4Q5qODA+l8UeL+y75j3d0jDAaH2/eKN1Uf6Rl+VIZ3tezoU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119861; c=relaxed/simple; bh=liJqa2gKzGBuo6lpJB3X0tG+AmpdAvgJqYlmJgVVIn0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qad4gr5GizhBb3s7blEwiFTchhEau/Bx8jbfY6gOgOOpx1sczhsiEKuWV+Gv8GaWL2PFhJ7k2ZpTobdkl3XaqJf70wJQ44dhrH2yxoLlHt6Z7oTXaerd8Zu7sTFTSjfcUPuO4Xbc/JSGW+RglIbsJ8YE4iGXFc728hEXmfabDfs= 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=JC3K+n2Z; arc=none smtp.client-ip=209.85.208.176 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="JC3K+n2Z" Received: by mail-lj1-f176.google.com with SMTP id 38308e7fff4ca-39c7ac9b8c3so19183611fa.0 for ; Wed, 15 Jul 2026 05:50:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784119852; x=1784724652; 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=u0Mk5tzrjHYYy4SGPBdnNN8CoOej7gvf7wUIp89O/Vs=; b=JC3K+n2Z6NerqkcJZUnigjwyj5xCPFx3uqwcMWAhkMwAp4qoV1b2AoNVsa3pvCDEp1 eAvbjOeRvnUwWGMH3h0Oq/OK0zzIQ8+FL1tRIG5CvRN5wwX0lFgll0KzoKmyqr0viENn UXggEp3u8L9gGq7g2yuJancELp/AEXq2w9OA8U2lQDpdLUs31HotJkn3Hr181HvuWY2e Nf1tsyGV9qLA3Yzcg8qqVHwBGNFjIPW1L5wcQqEiqYKYRb8QZU8E6NKsS82y+xEcl/dm qlSKv545S4n0s11BP1Bq9RqtQK/f7p/RaUP7yRQI1bWUi517EeIKKqp1+8RdL4/jLN0h PsvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784119852; x=1784724652; 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=u0Mk5tzrjHYYy4SGPBdnNN8CoOej7gvf7wUIp89O/Vs=; b=bRITKo8A8r0rRQ0La5+EpMJtpBNlN9RbZimEP76dwQTYN6HJzg40s9M9rQdbvBpgBS OR/I+kuz2oAELr0S5i+62NLsXkLnrm7EEkmNedQioAY+FhBSIprXmbugWhLZNl09rpAa zoesH5NP9HwZIWsLFPyMbjQ1ILVJ75CNG1pltIZAlWI04Da/AdB8XOtaE48Sh3WIWRDO 33xwv3L8jv0PESD1+tLZ8HoCezx9n/mJ7tPlaj7cJGjo5OPB9MAR5mb+pKqmVj+RbdkR JbXRyRBgor+Eon1+QEXXxk326+m0GI5iPoxrJnYxAoyymXNrYQY4F6Hixr6IGxcWP2oL X1mw== X-Forwarded-Encrypted: i=1; AHgh+RrFrzId71mWpJvHapbGBD/s60krVUOclkvY+bfYawuWl+eoMr2F9ziU72xKKLLzxgOslZDkmUX9OIAtL5M=@vger.kernel.org X-Gm-Message-State: AOJu0YyvgZbuDq/JSF99gFxqG45KYrAAZyzj8VNfuevE4YjKQOU6dj03 bYmCpzMImv4DkDaMQppgGxqkuTW7xUIo2N3B9zANwEbRU2BSVwYHMdWY X-Gm-Gg: AfdE7cmNA+PtTNJZZ7k37VvthLj+GgOFXK5OaCB+w0iZ9n8z6AqZFa01ImQWUUxx6Ao jHoHI0AelLAQ61aX/pdAAs+vLz9OUepL6jPYMq0/RRHkIt8SmfrBn6YEXrX4VUNmIDw8nJ17rOz H5Slgv5E36d5lk+OO6HyReR1UVdhy1qZKUO4mv/AjpcQf26MoRpvu6/6Zd9HC4vin2+LWNChrmT UKh7Dw5/jjPiJ+26ORlj6HTZHrnCpTAXfD/brvGDy/MfzM9vyDAWfA+nKUUwdOB0w1pCcwVRRZ/ FoJAmbbEzKPIHL6djS94wfHGVfVqhvzbnWUel1zfOMVuhJ+jwx8uiU+oyQtdm0n14Jdao1VdhIX 5CzorbfGJm6mkYi5C0k50XNh7hAW2cwFuGeWYK1WSRLQCKNe6LQ4m0JDlM1CGBi0d0rW0yNRRLd g7XUFax/raGhY3YDXybEPiBc+QJJXXlAKuG983ixE4ldZspj5mcbVDVJQ7MJ1q04B+KuuEdnhsI UVvxcPEA4wE6w== X-Received: by 2002:ac2:51ce:0:b0:5ae:c22e:a12 with SMTP id 2adb3069b0e04-5b0236be738mr4149530e87.65.1784119851479; Wed, 15 Jul 2026 05:50:51 -0700 (PDT) Received: from archlinux ([94.180.44.28]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b022fac999sm3404042e87.55.2026.07.15.05.50.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2026 05:50:51 -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 45/61] staging: rtl8723bs: remove c2h_evt_clear wrapper Date: Wed, 15 Jul 2026 19:48:13 +0700 Message-ID: <20260715124829.90290-46-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: quoted-printable Content-Type: text/plain; charset="utf-8" Remove the single-line helper function c2h_evt_clear. Call rtw_write8 directly with REG_C2HEVT_CLEAR and C2H_EVT_HOST_CLOSE arguments instead to eliminate an unnecessary function call layer. Signed-off-by: Arsenii Pashchenko --- drivers/staging/rtl8723bs/core/rtw_cmd.c | 2 +- drivers/staging/rtl8723bs/hal/hal_com.c | 12 +----------- drivers/staging/rtl8723bs/include/hal_com.h | 1 - 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_cmd.c b/drivers/staging/rtl= 8723bs/core/rtw_cmd.c index 01f8b378e..c2944a1c7 100644 --- a/drivers/staging/rtl8723bs/core/rtw_cmd.c +++ b/drivers/staging/rtl8723bs/core/rtw_cmd.c @@ -1694,7 +1694,7 @@ static void c2h_wk_callback(struct work_struct *work) c2h_evt =3D (u8 *)rtw_cbuf_pop(evtpriv->c2h_queue); if (c2h_evt) { /* This C2H event is read, clear it */ - c2h_evt_clear(adapter); + rtw_write8(adapter, REG_C2HEVT_CLEAR, C2H_EVT_HOST_CLOSE); } else { c2h_evt =3D kmalloc(16, GFP_ATOMIC); if (c2h_evt) { diff --git a/drivers/staging/rtl8723bs/hal/hal_com.c b/drivers/staging/rtl8= 723bs/hal/hal_com.c index 638d598e4..b357c5145 100644 --- a/drivers/staging/rtl8723bs/hal/hal_com.c +++ b/drivers/staging/rtl8723bs/hal/hal_com.c @@ -420,16 +420,6 @@ bool Hal_MappingOutPipe(struct adapter *padapter, u8 N= umOutPipe) =20 } =20 -/* - * C2H event format: - * Field TRIGGER CONTENT CMD_SEQ CMD_LEN CMD_ID - * BITS [127:120] [119:16] [15:8] [7:4] [3:0] - */ - -void c2h_evt_clear(struct adapter *adapter) -{ - rtw_write8(adapter, REG_C2HEVT_CLEAR, C2H_EVT_HOST_CLOSE); -} =20 /* * C2H event format: @@ -472,7 +462,7 @@ s32 c2h_evt_read_88xx(struct adapter *adapter, u8 *buf) * Clear event to notify FW we have read the command. * If this field isn't clear, the FW won't update the next command messag= e. */ - c2h_evt_clear(adapter); + rtw_write8(adapter, REG_C2HEVT_CLEAR, C2H_EVT_HOST_CLOSE); exit: return ret; } diff --git a/drivers/staging/rtl8723bs/include/hal_com.h b/drivers/staging/= rtl8723bs/include/hal_com.h index e6d32cf53..0a43655f7 100644 --- a/drivers/staging/rtl8723bs/include/hal_com.h +++ b/drivers/staging/rtl8723bs/include/hal_com.h @@ -124,7 +124,6 @@ u8 NumOutPipe =20 =20 =20 -void c2h_evt_clear(struct adapter *adapter); s32 c2h_evt_read_88xx(struct adapter *adapter, u8 *buf); =20 u8 rtw_get_mgntframe_raid(struct adapter *adapter, unsigned char network_t= ype); --=20 2.55.0 From nobody Sat Jul 25 17:33:43 2026 Received: from mail-lf1-f42.google.com (mail-lf1-f42.google.com [209.85.167.42]) (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 E8E3D495525 for ; Wed, 15 Jul 2026 12:50:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119871; cv=none; b=Aoej0EWP4VG6NlPFgnYVQ5O1+SeFzozqlos1pk0/RoHrM2UuXX+9X8OdLe9X02kXoNihxEJ8EMrLpMyWbQq2pAPdgZQfYxE1lF6RDRlhuq/9Je9o6a3aTTWDEtz3uswqOx3/BkGJA9qB9y6FiMicOLWb47L3GKoaMz8h++KY2W4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119871; c=relaxed/simple; bh=4vReyokegtoDdnzUCaFF1FRWkBMX2s/84JinAlpGIDo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GiOqWuGZItrGDY94iBzsgUmE3HX8BLuqk4KnolsmA8FvzagRFsZUef59NcFz1Z3a2yQOaG4mSF8Ff6Pala+ijFlrqP2Z9/N+gCj6rsNjd8X6vnhLaqn2yod6HtGZT3tJ2paHH/l9Xz1GEG36pusfDCMXKkytHjoGvPlqujnZyhE= 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=NA9iBLNW; arc=none smtp.client-ip=209.85.167.42 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="NA9iBLNW" Received: by mail-lf1-f42.google.com with SMTP id 2adb3069b0e04-5b018fe8318so1768291e87.3 for ; Wed, 15 Jul 2026 05:50:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784119852; x=1784724652; 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=47CI7mo8Wjc0LIH72n9ZJUdZDiMq/SPSI3cwI67agh0=; b=NA9iBLNWD3QGCWQCwhnHVfk5XRW39VPyxY7IghQkxFy7eNN7ZKH0o0MSiGEISfA64B rfinhVgLXWjUm0sjxPRlWYryDKX5SRDmNg6R0wEL2KC2kym/3sYGzbMMj+NrFJAXKPQV wcHiKR8KvX9nq1mFkqSlIqUlRCNb6PGjKcZ9Rz5avcH8dqv2mB2pY9d5lwpiELQEbGb4 3phK55ZRe2GyQTBxrP/OUEfeFBbyAWnVYUeauEuH+IwgNpK8CmJ9ZUyi84Tn08Dtve7F dRSsdFk8rZA5hpL5+x9rl5l6Qdc/6Bu71lFUz3Sl6a1ZSOKn0OsAUC1i62/ozIVpFFie MzFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784119852; x=1784724652; 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=47CI7mo8Wjc0LIH72n9ZJUdZDiMq/SPSI3cwI67agh0=; b=em/57XioKs8eTYpMoBf1YuYwoSAK2Wgtjeewi2/HXTfZT323P+SjN15tSkwgbYMJRN cfsOlJa+3+ee0i7BZIJ0++fHsCCl8xR2JXRGQ6o1c6STgw80dj+5meuco+5g2+3mjw/i /WwgFL0dz4qNNyajL2yd0xirYpr2zw3qwOrUeRdtB/17gIEBn5eK1/tLwXouIPIHBNOa ao07eZKw9YP1ChxjcOGVay6eQTJHX2XTQgY7/DFbqwQmj1vD5UWDdUBsBf/Nw5JOQpoj Gz09sJFEhO4LZ0sZfeGN/d9HALE+KTo0jN7H2uuUWwPpsnmNvK4jzPW7dT+ZJwq6HBIz ex+w== X-Forwarded-Encrypted: i=1; AHgh+Rrq1BTk5Bh3Gl7IFvbMZiYcnOnTj819XO5UnrJiOjKUKxubR+qm0RTw5GSsbf3+90XSCSvetAKtlrGn/5I=@vger.kernel.org X-Gm-Message-State: AOJu0YyoL4dmN3ArrWf4L/Rj0p9SD6Li1wOQ865I3me7U0G4BVHbxJwN lmeyn2Fcq8b9JV8hz9kDn+Xe5YvWYHZYdseK58PZ+Lm5fNPGc3/1KKqk X-Gm-Gg: AfdE7ckQo0o1OAhNjzqzlA8bvl6Tv+HNS2q2btZc7gYmzkzHs+psBqu+OgEDqeVxKIs ZIRS7K+XAhHxQutTaUg8NHq54hdchTQkHRzt0GuN1uA81uW0UDT+Dd49o8m5CoR/oN4gimekFyu QP0GM/LQX1i/wA3btZ8wvpnRldT2jkuc4N1QfbuWaHgxl41ErKkvk6RUeVRSVszPaP9pjmd8aaZ ta5sNrU6/XBdGV6+lt1Cw2yICwEh1fRXuKQTNBRfE9VDYtpEDOI8562+DHNky9QTFjmGyIiteJZ j9Y8o8r2arVQTMyz6nCNlzThQ/izZoW0jIgf987re6geccAygrLB9hCHUiJPn4sTV10dpveaPhT eu9Gx60VpUd1KK33ImD903SWqp0c73HlqJL3FpUJsvtQbqlrr+FwoPHvupHu/D1IxPcwaGtGlF9 X0dlOSXsAfYrEHB0nFbsrx6uEHbZpZp28kiRyRvdHfhfTyViYKqRV5W3u4v9K9H01v/waZkJfPy F/S41xGjKaSuuh/uNCKaWH7 X-Received: by 2002:a05:6512:12c3:b0:5b0:5306:210e with SMTP id 2adb3069b0e04-5b0531567femr3904899e87.37.1784119852381; Wed, 15 Jul 2026 05:50:52 -0700 (PDT) Received: from archlinux ([94.180.44.28]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b022fac999sm3404042e87.55.2026.07.15.05.50.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2026 05:50:52 -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 46/61] staging: rtl8723bs: remove rtw_get_mgntframe_raid helper Date: Wed, 15 Jul 2026 19:48:14 +0700 Message-ID: <20260715124829.90290-47-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: quoted-printable Content-Type: text/plain; charset="utf-8" Remove the tiny helper function rtw_get_mgntframe_raid. Inline the ternary operator check directly into the callers to simplify the driver architecture and avoid unnecessary call overhead. Signed-off-by: Arsenii Pashchenko --- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 2 +- drivers/staging/rtl8723bs/hal/hal_com.c | 4 ---- drivers/staging/rtl8723bs/include/hal_com.h | 1 - 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/stagin= g/rtl8723bs/core/rtw_mlme_ext.c index 62abfd896..0cc6887bb 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c @@ -1897,7 +1897,7 @@ void update_mgntframe_attrib(struct adapter *padapter= , struct pkt_attrib *pattri wireless_mode =3D WIRELESS_11B; else wireless_mode =3D WIRELESS_11G; - pattrib->raid =3D rtw_get_mgntframe_raid(padapter, wireless_mode); + pattrib->raid =3D (wireless_mode & WIRELESS_11B) ? RATEID_IDX_B : RATEID_= IDX_G; pattrib->rate =3D pmlmeext->tx_rate; =20 pattrib->encrypt =3D _NO_PRIVACY_; diff --git a/drivers/staging/rtl8723bs/hal/hal_com.c b/drivers/staging/rtl8= 723bs/hal/hal_com.c index b357c5145..0a0b41ebe 100644 --- a/drivers/staging/rtl8723bs/hal/hal_com.c +++ b/drivers/staging/rtl8723bs/hal/hal_com.c @@ -467,10 +467,6 @@ s32 c2h_evt_read_88xx(struct adapter *adapter, u8 *buf) return ret; } =20 -u8 rtw_get_mgntframe_raid(struct adapter *adapter, unsigned char network_t= ype) -{ - return (network_type & WIRELESS_11B) ? RATEID_IDX_B : RATEID_IDX_G; -} =20 void rtw_hal_update_sta_rate_mask(struct adapter *padapter, struct sta_inf= o *psta) { diff --git a/drivers/staging/rtl8723bs/include/hal_com.h b/drivers/staging/= rtl8723bs/include/hal_com.h index 0a43655f7..962ba3aaa 100644 --- a/drivers/staging/rtl8723bs/include/hal_com.h +++ b/drivers/staging/rtl8723bs/include/hal_com.h @@ -126,7 +126,6 @@ u8 NumOutPipe =20 s32 c2h_evt_read_88xx(struct adapter *adapter, u8 *buf); =20 -u8 rtw_get_mgntframe_raid(struct adapter *adapter, unsigned char network_t= ype); void rtw_hal_update_sta_rate_mask(struct adapter *padapter, struct sta_inf= o *psta); =20 void SetHwReg(struct adapter *padapter, u8 variable, u8 *val); --=20 2.55.0 From nobody Sat Jul 25 17:33:43 2026 Received: from mail-lf1-f42.google.com (mail-lf1-f42.google.com [209.85.167.42]) (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 A41514963CF for ; Wed, 15 Jul 2026 12:50:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119873; cv=none; b=QMUx6TuTaD0Cc662Ke468Wnd0PuH3995hLQLZcdak2OWNlWmDIZ5xa9dAUIFwMMfc9g8AgE8Me2p+YhBHlfKrXLgrLx6FbtRIrDan5fEujfCNfgm3vSfQwm9vMfiLjORvMxVf+lvzRTIKdDJ9f9RxmpIUeGx6gHlaGn0rJhH8+M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119873; c=relaxed/simple; bh=gajIVJhvyxOd3jK9xKBFrH9cfJIesTrBKvna6qH/ajU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=EbsSbY/exXfmt+krY05gu66WIwvhk023IkmENCDNEJsgPue842h31IaEmRM4hQOCIVPipuAeRZKjPKQu6atVf4htte2wSOt8v3iXOC6XPdHN/rZmG1dEyemZYqWMd0rWxNzXXHoD0BZofCuNeIJoQByqSk+rKurtIP3yh8el1Ng= 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=qPx6d4eR; arc=none smtp.client-ip=209.85.167.42 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="qPx6d4eR" Received: by mail-lf1-f42.google.com with SMTP id 2adb3069b0e04-5aeb5e85378so5766273e87.1 for ; Wed, 15 Jul 2026 05:50:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784119853; x=1784724653; 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=uFhJ92cLJkPbY1FDZB5mX70JJ8UHmLfGf6JbembV44w=; b=qPx6d4eR/4vESFOnnQGpxW/nRq0SZdfjtQX3Nq4FiJAoW0hWFENEUxKWE1tBfocPA8 lcxZhlWKbB1f977WxjarNIwmCtBDkhvK49zBvkAEOaZLbM6KK/9SKUzYrMy4TeVkB/Wg H6pdHQiBs0dJX+GVSNML2TCyr5I27yL7/CWd5YJKSKACAEH3EWziZa1BZi3mw6lroHSa DnD9XhSKI5LG+LSpmoQ7kpAgYTf60GMHraVuaQeWK1ylyvTCtAscYbjxF/6CKnrR2DNf jEpwM9AZ6SSeuyZSJ5x+BU6zQWpQbhrueyACvdxUS7rqvK6sBGJLd0AA4hB/eTM2dcMf i8uw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784119853; x=1784724653; 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=uFhJ92cLJkPbY1FDZB5mX70JJ8UHmLfGf6JbembV44w=; b=of8Krft+89R1EHgV+c57ptrS1QKXewtLnod3uDJfixbCJmVutu3F6grg1+P/FsfRt2 y/IVW3yYHTJSMqq1reXux/U6MRYyrkx7Gj1MG1obrkgmulvSuSHU2z/3c6sBdKEPiVXA zzGCVZN7wnwRmsYkAWsiw4pKwVzfK0qftkaErvIOXuLoAeCmsImVv03fDF9RnlixAYod idBIcriDExG3c4HzLv2+KTE4/Bpxojq8XkoPom4BR2AP8ZJVCPj6RKKrm9q4JZAkKc/C y3RUkDF/vPei3X+2mG2eeFNmuc8RFR9iyROB8CYAx5hpY/+lTs5d7+8X4ULvpXvoV3x1 zedA== X-Forwarded-Encrypted: i=1; AHgh+Rohdhh0XeLVvsdPf3myqtxOFSfh98fxRunUq0M3oDdCc5mDuox0aCMlbJDdy9S79MqM1El+qWhWUAQ68g8=@vger.kernel.org X-Gm-Message-State: AOJu0YzWbE8XsFNpbddY+lvhPGzcYcwOZPZhunjRQgkloc9I7UALFOfc 6w7j+WzS8n21sG1znpXXS8HOTRJovtUyt3g5pZWRZ54CjbawnKkukJaj X-Gm-Gg: AfdE7cnPKiyBgUzB0SCEKrdvsLr+H7rCOyJOt8NTSc7jeOTgtOf9mw9YL/HlgGgIl0u 2GD0E+U0TQ5Pcc6CY3U2IKnxPlr7+PSJCm1U/xnM6TT+fCNuQEXU014vDZijXtbxgIwa72cpWMl uKEi18Sz90rFkRdcADHbs+wxi+kHgpaiy+YUkKW+WeMhdWIKmudu4BKjiv3DmuMCi8bA8qkLQkj AgT8lYggyaw5534xTJCWV6wFWAsPd7FF1D32HIu4C11IGBran2imbDEQDhsXn39GqT+FvR0eJOB B8qEpOuAp1U0PzuAmRdAGkdzpuRq6Cw1T3VWKHDE7HMbqd7yuU595WojzKr7bjv4ORo+EdN7ZwC B8yiTkaD0KIeFiZyOwBGGY0J8F4F5hbGcxlyhodyeeusjIcWqyaUT4fHyiK1J2JatOOOBJuapH5 tOAoPl6nzpglhnaMjl00JZOGvuZI2n5U0QDXbffwmN2mMIZlHrldPBp7JBzFkfuUXQCDA58FSPP vNb8zXvQs2WHQ== X-Received: by 2002:ac2:5692:0:b0:5b0:1df9:2aee with SMTP id 2adb3069b0e04-5b159b6b3fbmr1478662e87.22.1784119853140; Wed, 15 Jul 2026 05:50:53 -0700 (PDT) Received: from archlinux ([94.180.44.28]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b022fac999sm3404042e87.55.2026.07.15.05.50.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2026 05:50:52 -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 47/61] staging: rtl8723bs: clean up phy power conversion function Date: Wed, 15 Jul 2026 19:48:15 +0700 Message-ID: <20260715124829.90290-48-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: quoted-printable Content-Type: text/plain; charset="utf-8" Fix indentation, function signature placement, and variable declarations in phy_ConvertTxPowerByRateInDbmToRelativeValues. Replace sizeof() loops with ARRAY_SIZE() for better safety and consistency with kernel style. Signed-off-by: Arsenii Pashchenko --- .../staging/rtl8723bs/hal/hal_com_phycfg.c | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c b/drivers/stagi= ng/rtl8723bs/hal/hal_com_phycfg.c index b16456d5b..21b9d1c82 100644 --- a/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c +++ b/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c @@ -367,20 +367,22 @@ void PHY_StoreTxPowerByRate( } } =20 -static void -phy_ConvertTxPowerByRateInDbmToRelativeValues( -struct adapter *padapter - ) +static void phy_ConvertTxPowerByRateInDbmToRelativeValues(struct adapter *= padapter) { - u8 base =3D 0, i =3D 0, value =3D 0, path =3D 0; + u8 base =3D 0; + u8 i =3D 0; + u8 value =3D 0; + u8 path =3D 0; u8 cckRates[4] =3D { MGN_1M, MGN_2M, MGN_5_5M, MGN_11M }; u8 ofdmRates[8] =3D { - MGN_6M, MGN_9M, MGN_12M, MGN_18M, MGN_24M, MGN_36M, MGN_48M, MGN_54M + MGN_6M, MGN_9M, MGN_12M, MGN_18M, + MGN_24M, MGN_36M, MGN_48M, MGN_54M }; u8 mcs0_7Rates[8] =3D { - MGN_MCS0, MGN_MCS1, MGN_MCS2, MGN_MCS3, MGN_MCS4, MGN_MCS5, MGN_MCS6, MG= N_MCS7 + MGN_MCS0, MGN_MCS1, MGN_MCS2, MGN_MCS3, + MGN_MCS4, MGN_MCS5, MGN_MCS6, MGN_MCS7 }; for (path =3D RF_PATH_A; path < RF_PATH_MAX; ++path) { /* CCK */ @@ -392,14 +394,14 @@ struct adapter *padapter =20 /* OFDM */ base =3D PHY_GetTxPowerByRate(padapter, path, MGN_54M); - for (i =3D 0; i < sizeof(ofdmRates); ++i) { + for (i =3D 0; i < ARRAY_SIZE(ofdmRates); ++i) { value =3D PHY_GetTxPowerByRate(padapter, path, ofdmRates[i]); PHY_SetTxPowerByRate(padapter, path, ofdmRates[i], value - base); } =20 /* HT MCS0~7 */ base =3D PHY_GetTxPowerByRate(padapter, path, MGN_MCS7); - for (i =3D 0; i < sizeof(mcs0_7Rates); ++i) { + for (i =3D 0; i < ARRAY_SIZE(mcs0_7Rates); ++i) { value =3D PHY_GetTxPowerByRate(padapter, path, mcs0_7Rates[i]); PHY_SetTxPowerByRate(padapter, path, mcs0_7Rates[i], value - base); } --=20 2.55.0 From nobody Sat Jul 25 17:33:43 2026 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: quoted-printable Content-Type: text/plain; charset="utf-8" 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/stagi= ng/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 RfPa= th, } } =20 -static void phy_StoreTxPowerByRateBase(struct adapter *padapter) +void phy_StoreTxPowerByRateBase(struct adapter *padapter) { u8 path, base; =20 @@ -367,7 +367,7 @@ void PHY_StoreTxPowerByRate( } } =20 -static void phy_ConvertTxPowerByRateInDbmToRelativeValues(struct adapter *= padapter) +void phy_ConvertTxPowerByRateInDbmToRelativeValues(struct adapter *padapte= r) { u8 base =3D 0; u8 i =3D 0; @@ -408,15 +408,6 @@ static void phy_ConvertTxPowerByRateInDbmToRelativeVal= ues(struct adapter *padapt } } =20 -/* - * This function must be called if the value in the PHY_REG_PG.txt(or head= er) - * is exact dBm values - */ -void PHY_TxPowerByRateConfiguration(struct adapter *padapter) -{ - phy_StoreTxPowerByRateBase(padapter); - phy_ConvertTxPowerByRateInDbmToRelativeValues(padapter); -} =20 void PHY_SetTxPowerIndexByRateSection( struct adapter *padapter, u8 RFPath, u8 Channel, u8 RateSection diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c b/drivers/stag= ing/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 !=3D 2)) { ODM_ConfigBBWithHeaderFile(&pHalData->odmpriv, CONFIG_BB_PHY_REG_PG); =20 - if (pHalData->odmpriv.PhyRegPgValueType =3D=3D PHY_REG_PG_EXACT_VALUE) - PHY_TxPowerByRateConfiguration(Adapter); - + if (pHalData->odmpriv.PhyRegPgValueType =3D=3D PHY_REG_PG_EXACT_VALUE) { + phy_StoreTxPowerByRateBase(Adapter); + phy_ConvertTxPowerByRateInDbmToRelativeValues(Adapter); + } if (Adapter->registrypriv.reg_enable_tx_power_limit =3D=3D 1 || (Adapter->registrypriv.reg_enable_tx_power_limit =3D=3D 2 && pHalData->EEPROMRegulatory =3D=3D 1)) diff --git a/drivers/staging/rtl8723bs/include/hal_com_phycfg.h b/drivers/s= taging/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); =20 -void PHY_TxPowerByRateConfiguration(struct adapter *padapter); =20 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/sta= ging/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 *pC2= hEvent); void Hal_ReadRFGainOffset(struct adapter *padapter, u8 *hwinfo, bool AutoLoadFail); =20 + +void phy_StoreTxPowerByRateBase(struct adapter *padapter); +void phy_ConvertTxPowerByRateInDbmToRelativeValues(struct adapter *padapte= r); + #endif --=20 2.55.0 From nobody Sat Jul 25 17:33:43 2026 Received: from mail-lf1-f41.google.com (mail-lf1-f41.google.com [209.85.167.41]) (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 24C5948C403 for ; Wed, 15 Jul 2026 12:50:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119864; cv=none; b=Q6rAc5bKdpudFcif0UIdupls1mX+XeQMDRzLwKJL2QG+pAQYrHIW/T9mLdfjvBeCsK9Rp2ASBZHBdfG9kWq06DOiC8xxWN5pFn3QYRWxoJRZHu7wzAXMROvN+QWtiVNDsW6LlbK0CefTQ5Wx6H4QqIrfC/PcA78CO/UxNa4ybks= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119864; c=relaxed/simple; bh=2Q6d8WyT9DBrXtGDiScoAlgfUG4yEAeG9nXn7SKHrnM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lmG3zAG+g8PUTwwyFR8KaCI6aEQoFy2SfXOlkO6j5XYZ+er0M+pSVu1Q3c97/WNe5uboNgX17Pfksok10WkgvnchxLr1YCHH4IeFaQkrIdfi2eNB33W96+uAKJBCLoYTEheQCB/Otod64xmvdiQTp39M7hLiGd2i8WKtNT8bpJ4= 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=Ht/xMw1H; arc=none smtp.client-ip=209.85.167.41 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="Ht/xMw1H" Received: by mail-lf1-f41.google.com with SMTP id 2adb3069b0e04-5aeb59d54b1so1775876e87.1 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=1784119855; x=1784724655; 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=4TMzq3sqLE2mIsEbqNFBEWHJwoVqep7wjRLvzGXoJzE=; b=Ht/xMw1HHq/LbKWu4fysfvuZsGJqVUxzvTMWdg+0CTUACf3fLuPEyKv5q+uge/mJrs Y4zqRSYIgc6bXOty4qkkWRJXGyA8YgZFI5wH6eUlJQCWZnYQYjVrEpyVuQhADWdHd0DA 3C/TS5KSPnXdBm7KERAZSh82yYWYZDnkKaPSnU15d9krMR4+AfjDv11FIkHf4WA/Sl5L rn4Gra8Q2a0hfovH5r/kA10DRZFqws2qxVKb1d+MbNv2amHQ1kzABQPmuXRxux6kwMXl 9Lo1JK7vEZHZv26SNERlStdkyT6OeIjqVda6p01thmg6i89zw2d+7bMNJp/3Ocb8fTTo glWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784119855; x=1784724655; 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=4TMzq3sqLE2mIsEbqNFBEWHJwoVqep7wjRLvzGXoJzE=; b=P9sECNT3VYWwhuxR48yEr4G7685syOXmzRnVkMW/N7ahwWIv8K8D074I956BPY1Nv4 w6XqSaE3ZI2kK06GF/yOmX1MQrQoREJ3TCfwOCa4g1sUngpeqr2Hs/oCFPJwq+A239MU DScpVDDMmZTQJxqYeP1N6PxcVjICL5ZnU5uDjGGKcmHar6+e7hLagAX8oLWVQ0aS77ze gKpjAIyOA1RsCTE8e/7eLMSvkxZPWbfC7aGFkmrQyT446IEsSVWvzievtj8spL9yKgsi TnVhcdgbbulKGInA0o6h3H7Tm7Sygh/iPYABfoGskqzqTIhbD+UOfcdyWy+Ynb+5EUTy p3aw== X-Forwarded-Encrypted: i=1; AHgh+RqqS3D7tptUw2AAcjEqgmeq3cUchOQ8iIw9QAvlPW1Y0tX4Ufwjo5uPWVy8qxU4753FFYkWRLl8H6cYPQ8=@vger.kernel.org X-Gm-Message-State: AOJu0YzvdU70uAXEpoHCaByQCjpwD5TOZ6FpKj10rceaF24R8NwAV/T9 FnoyHj2oaLB+e4yDleZk9m7ptWOpogTa4VzggswIojgRy87ja827O86r X-Gm-Gg: AfdE7cmnQxCDmqwNchC4/UAGD15g3E6gRUpBG3W1+1z5qvEELVejukZiaVQArmwpUIs wmI7OZvzbt/S5W8fx2w7d9DYuHvLYE19KahpeA7P9ZOIlGhVyzeDi6U5XHpSS1ndIL4KS5OhkB1 GTxYgLJbJVy03vqBRxk6ND5478SVh4OMULUjGscC+smP7fn2/cgiBAvTQvhq3Li1e0b2iaEb3xo CZQIRf33TrnlMnKay3/TQkOSOtGz8qJ8JyHwn6XUAzXAZShCFz6yd4fj/37dBz7hWSoYLz0y9oz k8vZovyOBfZrbvMjrkdTy5BUArQPi+0H1vtK3/ntDfAjpxHlgi4aivxLpUWVorW3Bx//cYhS1g4 Vyg887BazUJuEgJfieOi+CFnGD7n+8FaCviJYY9b5xkvhp5pvLJXD6QKt7hTgtYdhhj3rtEn3Tt E8QfTg/GN0u6ObLTPOT296Y4lcA0Va1YOQZlc9OpqWRSPat6J0ytxUbh8WCj6doB0g90qGPctVY 14aOuDxlyqR9g== X-Received: by 2002:ac2:508c:0:b0:5b0:e70:c6e8 with SMTP id 2adb3069b0e04-5b0236c0babmr3009824e87.59.1784119854817; 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.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2026 05:50:54 -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 49/61] staging: rtl8723bs: remove phy_GetChannelIndexOfTxPowerLimit helper Date: Wed, 15 Jul 2026 19:48:17 +0700 Message-ID: <20260715124829.90290-50-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: quoted-printable Content-Type: text/plain; charset="utf-8" Remove the tiny single-line helper function phy_GetChannelIndexOfTxPowerLimit. Inline the arithmetic index calculation directly into the callers to simplify the code and reduce runtime call overhead. Signed-off-by: Arsenii Pashchenko --- drivers/staging/rtl8723bs/hal/hal_com_phycfg.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c b/drivers/stagi= ng/rtl8723bs/hal/hal_com_phycfg.c index 32b69ba3b..7ad04aa85 100644 --- a/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c +++ b/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c @@ -643,10 +643,7 @@ static s8 phy_GetWorldWideLimit(s8 *LimitTable) return min; } =20 -static s8 phy_GetChannelIndexOfTxPowerLimit(u8 Channel) -{ - return Channel - 1; -} + =20 static s16 get_bandwidth_idx(const enum channel_width bandwidth) { @@ -721,7 +718,7 @@ s8 phy_get_tx_pwr_lmt(struct adapter *adapter, u32 reg_= pwr_tbl_sel, if (idx_rate_sctn =3D=3D 0 || idx_rate_sctn =3D=3D 1) idx_bandwidth =3D 0; =20 - channel =3D phy_GetChannelIndexOfTxPowerLimit(channel); + channel--; =20 if (idx_regulation =3D=3D -1 || idx_bandwidth =3D=3D -1 || idx_rate_sctn =3D=3D -1 || idx_channel =3D=3D -1) @@ -838,7 +835,7 @@ void PHY_SetTxPowerLimit( else if (strcmp(Bandwidth, "40M") =3D=3D 0) bandwidth =3D 1; =20 - channelIndex =3D phy_GetChannelIndexOfTxPowerLimit(channel); + channelIndex =3D channel-1; =20 if (channelIndex =3D=3D -1) return; --=20 2.55.0 From nobody Sat Jul 25 17:33:43 2026 Received: from mail-lf1-f41.google.com (mail-lf1-f41.google.com [209.85.167.41]) (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 5C8D14A1399 for ; Wed, 15 Jul 2026 12:51:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119873; cv=none; b=aYCYZTTMD+F8+WHo5L/haq/7yaB2JKaa/IkSrBPnj01Tf/O2Hx8IqSXE7cJUitixIctYd1sz5x4ibUUcytPh/lgioMmrC73DXymRVNeE8k9YgTHmIhwAWGkkCsF0R6nOgoUQjiASb3ovPr0vaz3wClUbw3FjWgLyLo6a8jF64hs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119873; c=relaxed/simple; bh=u1jBMXa16A7v++4qMutiXWlJdKAbcPe3g/LhjZ9tVHY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cVTsKHy1Tsy3JbavFwGxhPC2EVYTzzImNifrt1w0X96d1lWuYEVkvTAlj1F1bkNyg3jz6/BQsVsx0nZ4WRfMRCZWgYK9xcsgAJFBkc+cVSmfYCfSX2YpzYGQzPOb7JKpzpmm3hIDFpz28HOPXBX8jA2viLarPd0aUuBt3hRPi8Q= 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=Io+dYint; arc=none smtp.client-ip=209.85.167.41 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="Io+dYint" Received: by mail-lf1-f41.google.com with SMTP id 2adb3069b0e04-5b0f19bea2fso2003118e87.1 for ; Wed, 15 Jul 2026 05:51:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784119858; x=1784724658; 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=HGQst0oyHOMRM9hMxtCvVXC1/fk2wJSMXeEKR5JD+kU=; b=Io+dYinteCFb0A9XhkwhH1DnVfUGmNrEzMdWGVSvYZgWc5+c6egE5pxKzTGq2pd0XD lFEQZ1L6iXQhRDXGcZLkQ04GTuo/NnzOMcqerNtoTpj1Q0ZDzyY1KNE4exVYA4CtbvG4 UjzcoJ41ZPOZGvolG9JEfCuEftXmiW5M4wmAS8tycPVa4BThA5oWuYcfMGEIRbYwLIpT Asg7mEcnh9d/OiW4+rpOx4HSe/JWo/5PjcAB0XB3jMlm/IpZiQEX78dlV/Jneb4+wR3L 6qy6iODIEIrsZdEzck1ovrWN1ag7Cv3WqXa4I+owJVTOnYBZn3mDl468hlSM8W3Sqnm7 vetg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784119858; x=1784724658; 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=HGQst0oyHOMRM9hMxtCvVXC1/fk2wJSMXeEKR5JD+kU=; b=K/LFUCYcdTSkoBVByCrrYCAmR4rHKx8TqTSCPKBnmySLFiwxcbc2pbJlUx4j5eS4GP RXaScAkImYSMDJ67Z1OAX9/x/sXDD0mfQk959c3GfdWe/cx9q1rRL1afXcf9V5I5n6bM y5mq90xx2Bk4YbbevgVL4kXhMsEH+DsTLzlvOCzEpS0blqqwasYb4MCcB98SAFwchZEh E+ugKP4mqVyqffb6G0Txy4DOWNQyTBGGnmfWXcBTEhkN6BL57sSM9+i07yfAJSPlCf4g x5McSZrplRIS9B57aYkXHnuvU8Mi0KkfDAIwW1DkUhzE8wkL1THH1pKl3wvt2fkWrY08 pGbg== X-Forwarded-Encrypted: i=1; AHgh+RqsP1kKzHyD1tdl2PXCQo8+F/FfotMshLqtUyQQYJGAYts7OHMvqtR6vSRG0H4L6ZbLzuRImn/uPDO+9cA=@vger.kernel.org X-Gm-Message-State: AOJu0YykEoBvDZLZ0KMjs+WM0UzmSTSddkAIUZukxWftwnGETmSvGIPa O3pCevgGQJ/77poMby6BwIzeUoPwwPVTJTB1yyHpLUgEQXiw3scjb2jC X-Gm-Gg: AfdE7cnslhOW366psyjmNqFgrlspXxOR4hNVMEGgnjmkFoQdMRzQhWrBp+1gKW2r9Ia HfMZ6PgDwaQVSNac0PlvmAgtIb0dtiPMYYHg/vO7s70MyhPn2rtaQXrEXJSbfl2ybgv9qPca0dX f0n5nfftZmw04IpyV5dgrU8WGvfiB0yqftkmGjRKnoiGcO3TYJ2cKvrlAfrofj5+BiZZ4/e/goP 1NEvJMnoSyP92ukY7QgUif8ISSa5oiNxbw0sGFgg2vdQOXxD/zpIJlhtaxqr/V1Pw/RQPCqAqA9 5IkS+EZb8QWYnoS0Teg84fKLaBzTCEiCoKKhu4YC8ue41BdH3wBfp41y543HLM03wOJQv0z4hIu mPosvwsO1VR507JwPp1UDqhVY12esJp74wJZIe62P8wTvNMXlbcigh5BBjIALsqh5cmaAW6mXg8 bQq0aCqXvyVhz8r2nzoW1v4geQkLX9YZoBviOkxw3teoiuLqJxHkKO5qBeuj4vADRzqwvnMDJ4D 2a0BehCHHXLSQ== X-Received: by 2002:a05:6512:3e1e:b0:5ae:a9ec:bb31 with SMTP id 2adb3069b0e04-5b0236bb3cemr4161121e87.57.1784119857536; Wed, 15 Jul 2026 05:50:57 -0700 (PDT) Received: from archlinux ([94.180.44.28]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b022fac999sm3404042e87.55.2026.07.15.05.50.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2026 05:50:55 -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 50/61] staging: rtl8723bs: inline SetHwReg8723BS into rtw_hal_set_hwreg Date: Wed, 15 Jul 2026 19:48:18 +0700 Message-ID: <20260715124829.90290-51-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: quoted-printable Content-Type: text/plain; charset="utf-8" Inline the hardware register configuration logic from SetHwReg8723BS directly into rtw_hal_set_hwreg. This eliminates the intermediate CamelCase call layer for SDIO-specific registers and cleans up the driver entry point. Signed-off-by: Arsenii Pashchenko --- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 2 +- .../staging/rtl8723bs/core/rtw_wlan_util.c | 4 +- drivers/staging/rtl8723bs/hal/hal_intf.c | 35 ++++++++++++++- drivers/staging/rtl8723bs/hal/sdio_halinit.c | 43 ------------------- drivers/staging/rtl8723bs/include/hal_intf.h | 1 - 5 files changed, 37 insertions(+), 48 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/stagin= g/rtl8723bs/core/rtw_mlme_ext.c index 0cc6887bb..1fab3e829 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c @@ -5449,7 +5449,7 @@ u8 setkey_hdl(struct adapter *padapter, u8 *pbuf) rtw_hal_set_hwreg(padapter, HW_VAR_SEC_DK_CFG, (u8 *)true); =20 /* allow multicast packets to driver */ - SetHwReg8723BS(padapter, HW_VAR_ON_RCR_AM, null_addr); + rtw_hal_set_hwreg(padapter, HW_VAR_ON_RCR_AM, null_addr); =20 return H2C_SUCCESS; } diff --git a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c b/drivers/stagi= ng/rtl8723bs/core/rtw_wlan_util.c index d833c5e3a..3ac04c8b0 100644 --- a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c +++ b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c @@ -1515,9 +1515,9 @@ void update_wireless_mode(struct adapter *padapter) SIFS_Timer =3D 0x0a0a0808; /* 0x0808 -> for CCK, 0x0a0a -> for OFDM */ /* change this value if having IOT issues. */ =20 - SetHwReg8723BS(padapter, HW_VAR_RESP_SIFS, (u8 *)&SIFS_Timer); + rtw_hal_set_hwreg(padapter, HW_VAR_RESP_SIFS, (u8 *)&SIFS_Timer); =20 - SetHwReg8723BS(padapter, HW_VAR_WIRELESS_MODE, (u8 *)&(pmlmeext->cur_wir= eless_mode)); + rtw_hal_set_hwreg(padapter, HW_VAR_WIRELESS_MODE, (u8 *)&(pmlmeext->cur_= wireless_mode)); =20 if (pmlmeext->cur_wireless_mode & WIRELESS_11B) update_mgnt_tx_rate(padapter, IEEE80211_CCK_RATE_1MB); diff --git a/drivers/staging/rtl8723bs/hal/hal_intf.c b/drivers/staging/rtl= 8723bs/hal/hal_intf.c index 9a3ebad35..bbf987ace 100644 --- a/drivers/staging/rtl8723bs/hal/hal_intf.c +++ b/drivers/staging/rtl8723bs/hal/hal_intf.c @@ -71,7 +71,40 @@ uint rtw_hal_deinit(struct adapter *padapter) =20 void rtw_hal_set_hwreg(struct adapter *padapter, u8 variable, u8 *val) { - SetHwReg8723BS(padapter, variable, val); + u8 val8; + + switch (variable) { + case HW_VAR_SET_RPWM: + /* rpwm value only use BIT0(clock bit) , BIT6(Ack bit), and BIT7(Toggle= bit) */ + /* BIT0 value - 1: 32k, 0:40MHz. */ + /* BIT6 value - 1: report cpwm value after success set, 0:do not report= . */ + /* BIT7 value - Toggle bit change. */ + { + val8 =3D *val; + val8 &=3D 0xC1; + rtw_write8(padapter, SDIO_LOCAL_BASE | SDIO_REG_HRPWM1, val8); + } + break; + case HW_VAR_SET_REQ_FW_PS: + { + u8 req_fw_ps =3D 0; + + req_fw_ps =3D rtw_read8(padapter, 0x8f); + req_fw_ps |=3D 0x10; + rtw_write8(padapter, 0x8f, req_fw_ps); + } + break; + case HW_VAR_RXDMA_AGG_PG_TH: + val8 =3D *val; + break; + + case HW_VAR_DM_IN_LPS: + rtl8723b_hal_dm_in_lps(padapter); + break; + default: + SetHwReg8723B(padapter, variable, val); + break; + } } =20 void rtw_hal_get_hwreg(struct adapter *padapter, u8 variable, u8 *val) diff --git a/drivers/staging/rtl8723bs/hal/sdio_halinit.c b/drivers/staging= /rtl8723bs/hal/sdio_halinit.c index 731ca9276..775fd5138 100644 --- a/drivers/staging/rtl8723bs/hal/sdio_halinit.c +++ b/drivers/staging/rtl8723bs/hal/sdio_halinit.c @@ -1077,49 +1077,6 @@ void rtw_read_adapter_info(struct adapter *padapter) =20 _ReadAdapterInfo8723BS(padapter); } - -/* - * If variable not handled here, - * some variables will be processed in SetHwReg8723B() - */ -void SetHwReg8723BS(struct adapter *padapter, u8 variable, u8 *val) -{ - u8 val8; - - switch (variable) { - case HW_VAR_SET_RPWM: - /* rpwm value only use BIT0(clock bit) , BIT6(Ack bit), and BIT7(Toggle= bit) */ - /* BIT0 value - 1: 32k, 0:40MHz. */ - /* BIT6 value - 1: report cpwm value after success set, 0:do not report= . */ - /* BIT7 value - Toggle bit change. */ - { - val8 =3D *val; - val8 &=3D 0xC1; - rtw_write8(padapter, SDIO_LOCAL_BASE | SDIO_REG_HRPWM1, val8); - } - break; - case HW_VAR_SET_REQ_FW_PS: - { - u8 req_fw_ps =3D 0; - - req_fw_ps =3D rtw_read8(padapter, 0x8f); - req_fw_ps |=3D 0x10; - rtw_write8(padapter, 0x8f, req_fw_ps); - } - break; - case HW_VAR_RXDMA_AGG_PG_TH: - val8 =3D *val; - break; - - case HW_VAR_DM_IN_LPS: - rtl8723b_hal_dm_in_lps(padapter); - break; - default: - SetHwReg8723B(padapter, variable, val); - break; - } -} - /* * If variable not handled here, * some variables will be processed in GetHwReg8723B() diff --git a/drivers/staging/rtl8723bs/include/hal_intf.h b/drivers/staging= /rtl8723bs/include/hal_intf.h index ee8ad2632..51fdbf9fe 100644 --- a/drivers/staging/rtl8723bs/include/hal_intf.h +++ b/drivers/staging/rtl8723bs/include/hal_intf.h @@ -241,7 +241,6 @@ s32 rtw_hal_macid_wakeup(struct adapter *padapter, u32 = macid); =20 s32 rtw_hal_fill_h2c_cmd(struct adapter *, u8 ElementID, u32 CmdLen, u8 *p= CmdBuffer); =20 -void SetHwReg8723BS(struct adapter *padapter, u8 variable, u8 *val); void GetHwReg8723BS(struct adapter *padapter, u8 variable, u8 *val); void SetHwRegWithBuf8723B(struct adapter *padapter, u8 variable, u8 *pbuf,= int len); u8 GetHalDefVar8723BSDIO(struct adapter *Adapter, enum hal_def_variable eV= ariable, void *pValue); --=20 2.55.0 From nobody Sat Jul 25 17:33:43 2026 Received: from mail-lf1-f47.google.com (mail-lf1-f47.google.com [209.85.167.47]) (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 13FC747DF8B for ; Wed, 15 Jul 2026 12:51:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119872; cv=none; b=ABtky8mvJ5c917aJbmDKsLOoEUJbadEtx9YNoN4OJL06TLgPXpY7jTKjUZKWb6DxSV2UoXKB9AZgec2VvYJHE6RzZbjlKDkzjBjZ7IvOAa7XiOFSs6aW/mEIg2eQ6nqVFaD1Yq26VHI7hIX+42LdTgjqsXWboXaPpXclff+FWyg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119872; c=relaxed/simple; bh=HZ0zRdItiR8WpGFkFya4oqOg6EPC1u9XQZB0V+DLwOw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hE0KPOgeqQwdQ7NjBZeMS69Jv1XEldclTIw9YMpmhtLjXHb2WwA+aNcfx6YXc0VH0aa9hAhzMbkcjZn5o6FN/2DSkgoTKuQSX2wdw0QUyLu+N3Id91MjGrsBo3m2/rVeI8zULMGFXO88/HOJz2S1qmx2j8u6bQtilf3sRHC76+8= 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=YJevnseJ; arc=none smtp.client-ip=209.85.167.47 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="YJevnseJ" Received: by mail-lf1-f47.google.com with SMTP id 2adb3069b0e04-5b0117d49dcso5087230e87.3 for ; Wed, 15 Jul 2026 05:51:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784119858; x=1784724658; 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=KE8cqmEWFDwhs9+uHCZ9XurXdXQwWEdGM0MtE4jhXF4=; b=YJevnseJFkhQEsbtGCWaJI6C8cIGST1H2Jn73uCTI2ZII8dyyTOuKT6jj8N0OYiWtG 6fTFthOdhx30+3ULQauQ1UUObx0QJOxNHHWS4r2+I5BuiW9ZC9yJw04LbJW8TQ+0i/wN dh1wr/p6SWDrtXb1F3tIGZpcUHN5M0aGviy/zqi+Lf6EF3WPL0GsOZ4qtg6/j56Bn0UG UO97tV91UiD0TrDJ3z68hryUybw6gN0C9AivEBCXV7b7zhswxHCFINlCtt48LeWD1qnn qyAu5PuPgDw8x0bFDsgLB3E4ID6MKvz7WYLAeU2f14QYJEKivfVDVtXScd0qJgyvqd18 zkTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784119858; x=1784724658; 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=KE8cqmEWFDwhs9+uHCZ9XurXdXQwWEdGM0MtE4jhXF4=; b=LPUbJwwQAP5sF1YVRU3tyCOOUDrTDKaBvWuN0tT+bMCdfUkXSyrMTaFBaYm+iHnNXZ rly1tEsgKMqy7QJ36kBgbPBbm0+Y0RA7y8T93THD3JDK8HlpgnE8hjcn651UF5MshjkC uwU4Op3m6S3KIvk6Wj/mSCR8pBkEVAwpBhyctuXeZlpb03z9RY2vVJkmN/6RdLkBblsO imYTIznA4q/ghMABipupj8fVeAJdrzu6NiwiIbsAQfCNzX0m4WmyGxvAK3Z6iEmjXbsR kZpapUCsJi+J6HCv8k13Vb9BgQ57RKn1z5/vDQybA4hF/V8tvbn9KWyR6NR+5Q1DGVk1 WkDw== X-Forwarded-Encrypted: i=1; AHgh+Rp7X3c+On/10asQNhzQB6frqV51zv9QlxC7VLmhwDprEn9Mdn2MFFrhqhKu1HQ0cnfUVx22svEOUliP/Xc=@vger.kernel.org X-Gm-Message-State: AOJu0YzgWUKCDPsi+h6v+j2IVt3JSyfFnafNyGQIyWqvqJQfdkC8lx23 We0roRsiNDPXVd7UMODYWzwirgwkv51V/CpD/XXSaLpdHOYOE3bNSMMy X-Gm-Gg: AfdE7cmDxiDSUnpjbfakwN0GFyJMxROXQWtfDRVmaPkRyLBa4PMoRpKxG3nuv+uOmF/ o4O7gMkQKOZTw61c/JMC63ROIBmsJRjCX39hfRGt0ni8q3t2V1wqro443WGWt7rSQ6ihCQgkKpV SQhNOLUQWcq6+QBwrDvkpfD2JQF5iFp0Zh5/GSpuCR9tbsJ27U8wBKZte+mOTuzWHZddYqzA9Ul WkrFAYt8bRU2M5aZK38QY9GwOG9XX+GvXxcxhqBdYyOrToQxxO/K72Eh13wpPHFy+b+fTaii3vc lZUdEE5NF8TM6JLEeKCj6gq4O+JwxoMh2krSoDLoQh7LFPDJwjPhHUWD3nW3z6jHF5uiYtEQr+U 9TZER/EoQ25d7EnB/AxESnYp+FoQyb4kPNAFvCfJGuop/Ma3kolwpuL5UweH/vaD2F5w1kMsOJn lezXLtFfOGTNmPHbcnt/QPheT9KIrwAaQD7AHLLty+BGhUp06e7gJKwQDWnvHW1DsL7X4OBabVg 7ZM+jY8YkZcK7BcwI/vK873 X-Received: by 2002:a05:6512:3c8d:b0:5ae:c561:3ace with SMTP id 2adb3069b0e04-5b159b8bb5emr1608577e87.57.1784119858312; Wed, 15 Jul 2026 05:50:58 -0700 (PDT) Received: from archlinux ([94.180.44.28]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b022fac999sm3404042e87.55.2026.07.15.05.50.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2026 05:50:58 -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 51/61] staging: rtl8723bs: inline GetHwReg8723BS into rtw_hal_get_hwreg Date: Wed, 15 Jul 2026 19:48:19 +0700 Message-ID: <20260715124829.90290-52-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: quoted-printable Content-Type: text/plain; charset="utf-8" Inline the hardware register reading logic from GetHwReg8723BS directly into rtw_hal_get_hwreg. This removes the redundant CamelCase wrapper layer for reading SDIO-specific registers and simplifies the flow. Signed-off-by: Arsenii Pashchenko --- drivers/staging/rtl8723bs/hal/hal_intf.c | 16 ++++++++++++++- drivers/staging/rtl8723bs/hal/sdio_halinit.c | 21 -------------------- drivers/staging/rtl8723bs/include/hal_intf.h | 1 - 3 files changed, 15 insertions(+), 23 deletions(-) diff --git a/drivers/staging/rtl8723bs/hal/hal_intf.c b/drivers/staging/rtl= 8723bs/hal/hal_intf.c index bbf987ace..92e4605fa 100644 --- a/drivers/staging/rtl8723bs/hal/hal_intf.c +++ b/drivers/staging/rtl8723bs/hal/hal_intf.c @@ -109,7 +109,21 @@ void rtw_hal_set_hwreg(struct adapter *padapter, u8 va= riable, u8 *val) =20 void rtw_hal_get_hwreg(struct adapter *padapter, u8 variable, u8 *val) { - GetHwReg8723BS(padapter, variable, val); + switch (variable) { + case HW_VAR_CPWM: + *val =3D rtw_read8(padapter, SDIO_LOCAL_BASE | SDIO_REG_HCPWM1_8723B); + break; + + case HW_VAR_FW_PS_STATE: + { + /* 3. read dword 0x88 driver read fw ps state */ + *((u16 *)val) =3D rtw_read16(padapter, 0x88); + } + break; + default: + GetHwReg8723B(padapter, variable, val); + break; + } } =20 void rtw_hal_set_hwreg_with_buf(struct adapter *padapter, u8 variable, u8 = *pbuf, int len) diff --git a/drivers/staging/rtl8723bs/hal/sdio_halinit.c b/drivers/staging= /rtl8723bs/hal/sdio_halinit.c index 775fd5138..22d6180f1 100644 --- a/drivers/staging/rtl8723bs/hal/sdio_halinit.c +++ b/drivers/staging/rtl8723bs/hal/sdio_halinit.c @@ -1077,28 +1077,7 @@ void rtw_read_adapter_info(struct adapter *padapter) =20 _ReadAdapterInfo8723BS(padapter); } -/* - * If variable not handled here, - * some variables will be processed in GetHwReg8723B() - */ -void GetHwReg8723BS(struct adapter *padapter, u8 variable, u8 *val) -{ - switch (variable) { - case HW_VAR_CPWM: - *val =3D rtw_read8(padapter, SDIO_LOCAL_BASE | SDIO_REG_HCPWM1_8723B); - break; =20 - case HW_VAR_FW_PS_STATE: - { - /* 3. read dword 0x88 driver read fw ps state */ - *((u16 *)val) =3D rtw_read16(padapter, 0x88); - } - break; - default: - GetHwReg8723B(padapter, variable, val); - break; - } -} =20 void SetHwRegWithBuf8723B(struct adapter *padapter, u8 variable, u8 *pbuf,= int len) { diff --git a/drivers/staging/rtl8723bs/include/hal_intf.h b/drivers/staging= /rtl8723bs/include/hal_intf.h index 51fdbf9fe..b6ceea02a 100644 --- a/drivers/staging/rtl8723bs/include/hal_intf.h +++ b/drivers/staging/rtl8723bs/include/hal_intf.h @@ -241,7 +241,6 @@ s32 rtw_hal_macid_wakeup(struct adapter *padapter, u32 = macid); =20 s32 rtw_hal_fill_h2c_cmd(struct adapter *, u8 ElementID, u32 CmdLen, u8 *p= CmdBuffer); =20 -void GetHwReg8723BS(struct adapter *padapter, u8 variable, u8 *val); void SetHwRegWithBuf8723B(struct adapter *padapter, u8 variable, u8 *pbuf,= int len); u8 GetHalDefVar8723BSDIO(struct adapter *Adapter, enum hal_def_variable eV= ariable, void *pValue); void UpdateHalRAMask8723B(struct adapter *padapter, u32 mac_id, u8 rssi_le= vel); --=20 2.55.0 From nobody Sat Jul 25 17:33:43 2026 Received: from mail-lj1-f182.google.com (mail-lj1-f182.google.com [209.85.208.182]) (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 67DCC4ADD88 for ; Wed, 15 Jul 2026 12:51:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119872; cv=none; b=aq4LFDjWKgYgO9/Ya/dqiaDSz93NyjY2p2NGneaaLRDgabhKc+fuMzjgUdXWnUM7t/jMrQvgK/vo7NTqeTJLbtqcRWe7NwdyIpWcZSKCanhGrHMb19oMEBpCbNOTj0nXTI7yRB47nqs+3t3H/ThTyc4xwf+icGlUKIXed7+PUZ4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119872; c=relaxed/simple; bh=meFM+m3+QXLv46H2Nga/34GDbnkXJvTqjgu2sz1WhSs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cpfqtJ3omPO+yC0DwA7pOhYvaxhSjXsflbdI7JGP9/cGzX20L8Q7OL6p1p+9dx8X8ccjp7gOybqdpN7pLyq6GcOqDuZKYbVJJUu52919itL+LerPH7fBUYyuEhVZStHBhyDPbQIYk3HBIoLJSJlXlh6Cc7DkNBxsN0lI5csBxo4= 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=e+QojYoK; arc=none smtp.client-ip=209.85.208.182 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="e+QojYoK" Received: by mail-lj1-f182.google.com with SMTP id 38308e7fff4ca-39c83acb86eso19095141fa.1 for ; Wed, 15 Jul 2026 05:51:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784119859; x=1784724659; 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=9jk3XKktcIbFuEFIN65sHF6Ly+ytHzoWCdAncm6Hg7g=; b=e+QojYoKBBwM+HPAUNkOg0g0aEc34TYfdmr3qzAvzJRcZxaN98Xrow4DSLbgYJfPbt edzneiPzsdSLZmH51tKZP0ffnc4VKiIN62WI6g6CTVA8NPShQlWqC9xD8W5EecDdfP3w zLG6/fETmYPs6l6eC0pwViBT1sFp8eEm+IrujOxL1zVKGC9jiwusCnPf+kTfrrh16tMV aLdKEmYe63SP2yjWlRC1Lw5ZHqOTmxhIUL5DhmNGlBtbzE4g7MWq1EjlvWqh+GuI8OLQ OgdKT/6YJc5hH7tSTACfjQhREI48vv/y20dlQQPwVC/1NYIxj9ewzODoy3wLexbuB4// wdSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784119859; x=1784724659; 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=9jk3XKktcIbFuEFIN65sHF6Ly+ytHzoWCdAncm6Hg7g=; b=JAEIRMdXBldKX2Uimplx7Pjt9UvTDjoYUuSFO1X1NIJwlDjC72limfPODQLCuTSLKt HW6ujD1UMIg6EdgYbSoP/cTFf1AZVE0ayNcA//naVFoCf/zgftwd2YkSzHfC7WTZEFty xULwzWHjLyyjzHC7TDanwGXUtEhdZsLaXe5JoP2R64TX5PTrz6qjc9nuKaI4vpeHCuNi 8IudHT/WtzTc8xMtmIg9+utWsMKZYsp2U8oa5MlRmHZJVTKhrzSEtBcMWFvdV9GXbvnE juOFO0udYy/G2Cw1IGqkDwgn3+QTMUWfQkpU2ZllwBsuqh8o6lb4XiI3GynPnWi/9hYA eY/g== X-Forwarded-Encrypted: i=1; AHgh+RpkMkvMbMhnCQ0DrayyZ3NA1x+/GQxPgRtokzvFRmmzH2qJTh/hgc2t/MX4EfrtDAIMse9kMEEoC49q74w=@vger.kernel.org X-Gm-Message-State: AOJu0YxUEccWUx41F5ANvvUSG1ipz+6PkHGS2nqM1ihq0yZ2YpL8/Ekq lacycY61uiNmX0PhG6/ebU9V8IFS9w4veZ8mLWuus27yeR2RmfVbihlT X-Gm-Gg: AfdE7cl6+Q8aAHVueav6fJrDpZxoPAzqTkXDNEbI3wZ/8kACa0XupojucNBWPm91URs 8eM4bhx+9/hkC9cNu+1FSCdC+EPPLZE3hGa0y2JnPejVm1tGT5Va1+JxQhZgPjoLdkymRxVWfKs iQDR29pX9KIXrnhM/ibwlOBL+Igl28Vn75t5dIbFPvRiNfOjGC6f5q/Kaw3z+0S5SWsxTARQu+D CEyV53C5pX2iUsmdWDXezdx20OWGrFZS6NCYu0/CsI36oPISBILHwTSENKkztIx2BI6080akYLf QGs0tP5Pa6qRLa/8DsnStSxzbxrRt7GLNuUuHugDDXfIvdXAjF27MAGWfe7F1WYoDZsR0E/L+1+ emlUZcgWe1HXPlETc4iqP6sMfEJBPl5+kQYlGLb1xWUZo3uK92Fg0gopdexTtJkC0ynBzbs2/2p FzqsJy3WmkincJPB5LJ42wFLHti52Mgi/CzP8OqqQNMWshFLQzYVPqTp2fTo1aMFx7+WWlQ9r/d mjw4c+hVruWOA== X-Received: by 2002:a05:6512:61ac:b0:5a8:88f8:9ed4 with SMTP id 2adb3069b0e04-5b02369dae3mr4198488e87.30.1784119859340; Wed, 15 Jul 2026 05:50:59 -0700 (PDT) Received: from archlinux ([94.180.44.28]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b022fac999sm3404042e87.55.2026.07.15.05.50.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2026 05:50:58 -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 52/61] staging: rtl8723bs: inline SetHwRegWithBuf8723B into helper Date: Wed, 15 Jul 2026 19:48:20 +0700 Message-ID: <20260715124829.90290-53-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: quoted-printable Content-Type: text/plain; charset="utf-8" Inline the hardware register configuration logic from SetHwRegWithBuf8723B directly into rtw_hal_set_hwreg_with_buf. This removes a redundant CamelCase layer for C2H packet handling. Signed-off-by: Arsenii Pashchenko --- drivers/staging/rtl8723bs/hal/hal_intf.c | 8 +++++++- drivers/staging/rtl8723bs/hal/sdio_halinit.c | 11 ----------- drivers/staging/rtl8723bs/include/hal_intf.h | 1 - 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/drivers/staging/rtl8723bs/hal/hal_intf.c b/drivers/staging/rtl= 8723bs/hal/hal_intf.c index 92e4605fa..e58fc1405 100644 --- a/drivers/staging/rtl8723bs/hal/hal_intf.c +++ b/drivers/staging/rtl8723bs/hal/hal_intf.c @@ -128,7 +128,13 @@ void rtw_hal_get_hwreg(struct adapter *padapter, u8 va= riable, u8 *val) =20 void rtw_hal_set_hwreg_with_buf(struct adapter *padapter, u8 variable, u8 = *pbuf, int len) { - SetHwRegWithBuf8723B(padapter, variable, pbuf, len); + switch (variable) { + case HW_VAR_C2H_HANDLE: + C2HPacketHandler_8723B(padapter, pbuf, len); + break; + default: + break; + } } =20 u8 rtw_hal_get_def_var(struct adapter *padapter, enum hal_def_variable eVa= riable, void *pValue) diff --git a/drivers/staging/rtl8723bs/hal/sdio_halinit.c b/drivers/staging= /rtl8723bs/hal/sdio_halinit.c index 22d6180f1..0155c523e 100644 --- a/drivers/staging/rtl8723bs/hal/sdio_halinit.c +++ b/drivers/staging/rtl8723bs/hal/sdio_halinit.c @@ -1079,17 +1079,6 @@ void rtw_read_adapter_info(struct adapter *padapter) } =20 =20 -void SetHwRegWithBuf8723B(struct adapter *padapter, u8 variable, u8 *pbuf,= int len) -{ - switch (variable) { - case HW_VAR_C2H_HANDLE: - C2HPacketHandler_8723B(padapter, pbuf, len); - break; - default: - break; - } -} - /* */ /* Description: */ /* Query setting of specified variable. */ diff --git a/drivers/staging/rtl8723bs/include/hal_intf.h b/drivers/staging= /rtl8723bs/include/hal_intf.h index b6ceea02a..1d5c0b7bb 100644 --- a/drivers/staging/rtl8723bs/include/hal_intf.h +++ b/drivers/staging/rtl8723bs/include/hal_intf.h @@ -241,7 +241,6 @@ s32 rtw_hal_macid_wakeup(struct adapter *padapter, u32 = macid); =20 s32 rtw_hal_fill_h2c_cmd(struct adapter *, u8 ElementID, u32 CmdLen, u8 *p= CmdBuffer); =20 -void SetHwRegWithBuf8723B(struct adapter *padapter, u8 variable, u8 *pbuf,= int len); u8 GetHalDefVar8723BSDIO(struct adapter *Adapter, enum hal_def_variable eV= ariable, void *pValue); void UpdateHalRAMask8723B(struct adapter *padapter, u32 mac_id, u8 rssi_le= vel); void rtl8723b_SetBeaconRelatedRegisters(struct adapter *padapter); --=20 2.55.0 From nobody Sat Jul 25 17:33:43 2026 Received: from mail-lf1-f41.google.com (mail-lf1-f41.google.com [209.85.167.41]) (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 162C14A3413 for ; Wed, 15 Jul 2026 12:51:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119874; cv=none; b=ZBe5X3VwYPkkDn3M8EAABTumr3zhoORXwYA7mZgZ2SkcyBm/2I48c0PS0oU7U/BkqFT7kuZ1ZpnG/O2glekRCSUxhGoXRtE6l1rbzyj5DW9aTxYgOe1QzIgqo5ttJLTchBVj92qwpJgOIKepxGTuRiztkV5tqTdvw7/rCTM9Mq0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119874; c=relaxed/simple; bh=pFunXZrBhf7NK4fRGePFDQAQX+8b95iTFBR1q8CfDFE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=g3GY9ZCWX+cAPKlW97RTs76SkL+p1E9Iz7D5A9DgNDo89vA8ICb5UHnAx5LisL5jDnvd0xrbxW/AVl5LUl/4tpqhrBvc7NuIIJmOmWFFsUaEc5aMLhtvcBchu7CFI+rNgkBKeW0oNfPJUDJqdaF6kD5ylisZfKEz9vE2F5MiiE8= 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=Va6ZIxis; arc=none smtp.client-ip=209.85.167.41 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="Va6ZIxis" Received: by mail-lf1-f41.google.com with SMTP id 2adb3069b0e04-5b013aa02b2so870635e87.0 for ; Wed, 15 Jul 2026 05:51:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784119860; x=1784724660; 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=8JETEU48vJ4M9RulsQq/a27kzuvnyM7fUNkUWTEviYM=; b=Va6ZIxisbedemg6hypMTRCCmVudHqnPC74euw0z7uFORCgOuBbTw0Lx7wPpb2jp9Zc NOilZRnrs0Eh+tW1I8kCLHSL/6oKh1IoeqLpWEqOWKnpcHRn97KxyJVsVOQcB08zgbH7 nlYqoX3kxnIjNTEHHCEBUS0ZOYD8l/r37KAsNOG7X7RD0+xojhexAGK1i9VoJn01fGWc fgeAolFcgBMvCpxecA+qAB2hvPyeF7J/kBlRHejVlh/mtQ/l6wC+fhKP7lJ9KbzSMOTv ZltS2B8sU0LTff67SHkGmPgvssyBpIkWRwotnOcpxaKK4myVDDvbhY89XxUtpvSCu6Jf evKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784119860; x=1784724660; 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=8JETEU48vJ4M9RulsQq/a27kzuvnyM7fUNkUWTEviYM=; b=QIgobGn/a2vwMs6sCkkcmfi53A5APMui3v1N8pDOmWb91fmWrKAai1n9eZ/42iXmXU IC7LazYea5Civ7APKEZDKq9oashLPrTCLidsCkEJPa70o+viUvwoUNqTb1QlRyKYHJcK QuSsUp00xkXgJdPLcMonZP4l3Dt414XeG5iN9hj5y9z+wfTIOYaSzxjgjEuREeFYm685 ItbUYGEEPBUP4lFUjALfU2u0kPDTVjTaBcQd3XzIGTMTx+EEb4POAek6ilfeUcYra1+a JYNvITwIyj8AbKppEw8QD6a1SsWnszDya5jtZPvy8/SKrhz4+t0MpQc0WPCGMvYbnBcS 53Gw== X-Forwarded-Encrypted: i=1; AHgh+Rp4ncaIZ0oJgaD0QoT/evpW6KPotp3edkw7tdQeX0sfXRATlb0oNy7ML3SImQNParL+R8QQR7UOFZm/7RY=@vger.kernel.org X-Gm-Message-State: AOJu0YyDtnBkjbVHcSghoE4CfHbYQR9W+aUaKc9NoGBZ1q7Q2OX4Vpb1 EbisydnX+SrGvrmS3PQelW10S2jyh04o2Km11+fEAodoYMZXkd0Mnhce X-Gm-Gg: AfdE7cmYgL/vALBBz/PiP+G5/H+6pJemtRn2zRELf0rfCybT2fyfN76fja/lO8ORdfH nzDoRnAWXehnXbIvBbSFPNavO3Jb69HlbwdihAsI1/d+E+OrNDFkVDU+CWmO/L74P9A2o6/VoWW UjG/ay5Xkhs4NJl1PwVzd2pDNotR1hHhXYJwOZ3te5Xjn3kyOzgbvLN2taEXh7CSLng4LjS2Oer YGw6T4+pP2B0PNRpdrSWMKItW/cEqvtoa16yxUNV54hb7bddgo8HC7JvO7+uT6e4o2VQ5lfVKUe u/rkkZiAKZSO9W02XuZElvUc3XsI2kR5bffjZOP4ayCKqzliFCj5Kah7Z4VBhi6p089UjyLsMtB JwnCB3Q+4zSWopT70hC5RyYSzate6HYUqydSMD+xzFzqlN384P8F/egTyhjjFWEQTDvHOGUa+mS Qn5VlWeCQj1s1U+lhDNJOvdHi/E9IHajBqNsON//hGX8z+1loOEOOqnBhWJCOWTGh6gzUStPfAJ UjD4LqlHKxKkA== X-Received: by 2002:a05:6512:108a:b0:5ae:b6cf:c745 with SMTP id 2adb3069b0e04-5b02ba1e99cmr3890919e87.17.1784119860154; Wed, 15 Jul 2026 05:51:00 -0700 (PDT) Received: from archlinux ([94.180.44.28]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b022fac999sm3404042e87.55.2026.07.15.05.50.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2026 05:50:59 -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 53/61] staging: rtl8723bs: inline GetHalDefVar8723BSDIO into helper Date: Wed, 15 Jul 2026 19:48:21 +0700 Message-ID: <20260715124829.90290-54-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: quoted-printable Content-Type: text/plain; charset="utf-8" Inline the hardware configuration logic from GetHalDefVar8723BSDIO directly into rtw_hal_get_def_var. This eliminates a redundant CamelCase layer and cleans up default variable handling for SDIO. Signed-off-by: Arsenii Pashchenko --- drivers/staging/rtl8723bs/hal/hal_intf.c | 19 ++++++++++++- drivers/staging/rtl8723bs/hal/sdio_halinit.c | 29 -------------------- drivers/staging/rtl8723bs/include/hal_intf.h | 1 - 3 files changed, 18 insertions(+), 31 deletions(-) diff --git a/drivers/staging/rtl8723bs/hal/hal_intf.c b/drivers/staging/rtl= 8723bs/hal/hal_intf.c index e58fc1405..2c50fa5c0 100644 --- a/drivers/staging/rtl8723bs/hal/hal_intf.c +++ b/drivers/staging/rtl8723bs/hal/hal_intf.c @@ -139,7 +139,24 @@ void rtw_hal_set_hwreg_with_buf(struct adapter *padapt= er, u8 variable, u8 *pbuf, =20 u8 rtw_hal_get_def_var(struct adapter *padapter, enum hal_def_variable eVa= riable, void *pValue) { - return GetHalDefVar8723BSDIO(padapter, eVariable, pValue); + u8 bResult =3D _SUCCESS; + + switch (eVariable) { + case HAL_DEF_IS_SUPPORT_ANT_DIV: + break; + case HAL_DEF_CURRENT_ANTENNA: + break; + case HW_VAR_MAX_RX_AMPDU_FACTOR: + /* Stanley@BB.SD3 suggests 16K can get stable performance */ + /* coding by Lucas@20130730 */ + *(u32 *)pValue =3D IEEE80211_HT_MAX_AMPDU_16K; + break; + default: + bResult =3D GetHalDefVar8723B(padapter, eVariable, pValue); + break; + } + + return bResult; } =20 void rtw_hal_set_odm_var(struct adapter *padapter, enum hal_odm_variable e= Variable, void *pValue1, bool bSet) diff --git a/drivers/staging/rtl8723bs/hal/sdio_halinit.c b/drivers/staging= /rtl8723bs/hal/sdio_halinit.c index 0155c523e..395a2b3ee 100644 --- a/drivers/staging/rtl8723bs/hal/sdio_halinit.c +++ b/drivers/staging/rtl8723bs/hal/sdio_halinit.c @@ -1077,32 +1077,3 @@ void rtw_read_adapter_info(struct adapter *padapter) =20 _ReadAdapterInfo8723BS(padapter); } - - -/* */ -/* Description: */ -/* Query setting of specified variable. */ -/* */ -u8 GetHalDefVar8723BSDIO( - struct adapter *Adapter, enum hal_def_variable eVariable, void *pValue -) -{ - u8 bResult =3D _SUCCESS; - - switch (eVariable) { - case HAL_DEF_IS_SUPPORT_ANT_DIV: - break; - case HAL_DEF_CURRENT_ANTENNA: - break; - case HW_VAR_MAX_RX_AMPDU_FACTOR: - /* Stanley@BB.SD3 suggests 16K can get stable performance */ - /* coding by Lucas@20130730 */ - *(u32 *)pValue =3D IEEE80211_HT_MAX_AMPDU_16K; - break; - default: - bResult =3D GetHalDefVar8723B(Adapter, eVariable, pValue); - break; - } - - return bResult; -} diff --git a/drivers/staging/rtl8723bs/include/hal_intf.h b/drivers/staging= /rtl8723bs/include/hal_intf.h index 1d5c0b7bb..206388fc5 100644 --- a/drivers/staging/rtl8723bs/include/hal_intf.h +++ b/drivers/staging/rtl8723bs/include/hal_intf.h @@ -241,7 +241,6 @@ s32 rtw_hal_macid_wakeup(struct adapter *padapter, u32 = macid); =20 s32 rtw_hal_fill_h2c_cmd(struct adapter *, u8 ElementID, u32 CmdLen, u8 *p= CmdBuffer); =20 -u8 GetHalDefVar8723BSDIO(struct adapter *Adapter, enum hal_def_variable eV= ariable, void *pValue); void UpdateHalRAMask8723B(struct adapter *padapter, u32 mac_id, u8 rssi_le= vel); void rtl8723b_SetBeaconRelatedRegisters(struct adapter *padapter); void Hal_EfusePowerSwitch(struct adapter *padapter, u8 PwrState); --=20 2.55.0 From nobody Sat Jul 25 17:33:43 2026 Received: from mail-lf1-f49.google.com (mail-lf1-f49.google.com [209.85.167.49]) (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 02EE84BCABE for ; Wed, 15 Jul 2026 12:51:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119890; cv=none; b=o0cJan8ppa2kItRwsrhiaWdwVQwg82U2DnTWOub7fRVRt1LVLW31A8OMkmmmq+czsGdx3E7SXT7Xl2PtrcMCqmr5SNW3LuPMPYmlNdk0IkZlejGLTBn+v2vB+OOswWw5sBG+7RSy4BToOXSXrYwpCfZ8qyPyPDlCe+B69mt5tyI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119890; c=relaxed/simple; bh=2K3uMd0qj4h5cWvgljLvyufuFwQ8Xol5kia+7tNtQ+4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qHMOW1uJGt/sd47O6I3CwFAN5IphcL3IPj3VQVRJlALfwqST/rTY/Kb/J0HPKh2jqm/G3I9H/MmPDVPGYij50cxwK/Y/2ccYbEJJNd+1GRt8elSxy2PyT80g8O35zYLi8FTbwqW4SP8wyGRJZ8T3zleRDztDU+PYFW/iG8PFR0U= 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=B5ax2wEm; arc=none smtp.client-ip=209.85.167.49 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="B5ax2wEm" Received: by mail-lf1-f49.google.com with SMTP id 2adb3069b0e04-5b0117dda13so1898937e87.0 for ; Wed, 15 Jul 2026 05:51:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784119861; x=1784724661; 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=/giKKJOlrJZmyyc0tV7j+6GkAzOJxcx9dQZUh/VbNdM=; b=B5ax2wEmWrv4eNy0M7oP7LITCl7WiobFXgN9HAj9poWEVaFDeRStFnRfHx/dx874Xc Af8FCMN3aNzvn/063q+cDSD1jgp1QeMpCOWw3NU53u+zimIE9rbXBubHFtP4u+TQoQMv ARLX4mWo1VpZcgmdMz0OqGTGkw9H3rM23miTulPQKhmM27QrbTvJCV+FpwTPYbfecbrO KvqITKGl6lvXNjRgg9a8ONdnFHQ5fX36voY3z5futN1138LI3IlDbS8A4AVEap4nXTLo PEf8j4EVWySPiyMCf8YCygvK+yOEwqQVItHdSQPqz1oWsJ4e5JlBzLUZxnZgJA5byDZg 6Qng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784119861; x=1784724661; 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=/giKKJOlrJZmyyc0tV7j+6GkAzOJxcx9dQZUh/VbNdM=; b=BCprD2OwJ7XwtYIWZYEdjDURLXvHbu7dHYseTZoz0T3siVQOZrE7RS22omn1N192aE ekrPg8vB2DFk3aJ7/fll6qYo78ypxMJs075+h3FDv/3BI8YKnHKFn9LMMVT5FOrI1oNu 4qpM2Yuoq7UtHWH9YXk4m4OhIvrgq+bxagB2lECvORicEWIPE3XF8YuzJx3yXDchHmVL /2G7M8qPcheF9RkxxmYGV1Ol8P2M0nX+uCZ0K9ybI8EV3Sp/vSJZB3T0ymSIEYrnQyRZ 1eKUlW1pr5o2bPRRiwdMxI5d0oxP0v6f9TZEfQEUMfFrTxVeuwHzbLSP+yRBGZi8ojy0 /kMg== X-Forwarded-Encrypted: i=1; AHgh+RpoM42xCMiTbGwEdQE8yIybvoNCZO5BSxZ8GhRYE/fHDr5srqLXzx3Rcrtvx1xG3aEh5sTTQ9azMvQm+xw=@vger.kernel.org X-Gm-Message-State: AOJu0YwQIiyUHyngCZ0CF7OcypkS3t7XTa64lqR8adbn6RWmhULI0zK1 rvVm4TDOy/yORGer8btPoUlB52P71Wp9lHBB+t2JUl5HjaFixCZkcjgH X-Gm-Gg: AfdE7cnoC/1rmqTP0mpv4xy4kSq7hJOu2Zl6o4AHB70l04wFJ2RSYqBKizyBVaJH/fZ dIJtW/m7lMBbeLbW5vU/nQA5h8HEYXlEl7l0ZAHGK/GhFHeb+cgPuAYlZK+eg/9Glow6HlQIViI NrzIcH/B5iRWkn1vvQPBHGZr6xvI4cxJ/Dj9nUHZhA9xSv5hHNO0CkVSdiY2j1/Tfres6fToA4n Y6pwUYPheRIrSU4a5ljP4NQKYsYlCySUELcVaqwmAlOkvydThTkT4ZUBrnf/orLkIpzgDNmlUv4 ce+9AgN70HFr+t8w4Hf0GD6iMlzQRdlVhYAdaO5C8xfjGE5eu45qQSNDPabRzQPqx8+1OjZE3DC kebWPdi3Sg9C7vNbxAhd1VYPLw89isy+D3CVmKKq3IwD9DSsgwOCKvPwoeEuhMPM2yuJtaWuF0V dn54utenjxlVi+w2RDT7t3PL2cjUmuFar8Tjv4x9wrngzV9nSwdYr8vI+27gxuFfS1R44A3dwab 0END/M7Qi6wGw== X-Received: by 2002:ac2:48ac:0:b0:5ae:bd65:9e04 with SMTP id 2adb3069b0e04-5b0235664a4mr2971527e87.8.1784119861133; Wed, 15 Jul 2026 05:51:01 -0700 (PDT) Received: from archlinux ([94.180.44.28]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b022fac999sm3404042e87.55.2026.07.15.05.51.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2026 05:51:00 -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 54/61] staging: rtl8723bs: inline SetHalODMVar into rtw_hal_set_odm_var Date: Wed, 15 Jul 2026 19:48:22 +0700 Message-ID: <20260715124829.90290-55-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: quoted-printable Content-Type: text/plain; charset="utf-8" Inline the hardware configuration logic from SetHalODMVar directly into rtw_hal_set_odm_var. This eliminates a redundant CamelCase layer and simplifies the interface for updating ODM variables. Signed-off-by: Arsenii Pashchenko --- drivers/staging/rtl8723bs/hal/hal_com.c | 36 --------------------- drivers/staging/rtl8723bs/hal/hal_intf.c | 33 ++++++++++++++++++- drivers/staging/rtl8723bs/include/hal_com.h | 5 --- 3 files changed, 32 insertions(+), 42 deletions(-) diff --git a/drivers/staging/rtl8723bs/hal/hal_com.c b/drivers/staging/rtl8= 723bs/hal/hal_com.c index 0a0b41ebe..3d6b59c24 100644 --- a/drivers/staging/rtl8723bs/hal/hal_com.c +++ b/drivers/staging/rtl8723bs/hal/hal_com.c @@ -643,42 +643,6 @@ u8 GetHalDefVar( return bResult; } =20 -void SetHalODMVar( - struct adapter *Adapter, - enum hal_odm_variable eVariable, - void *pValue1, - bool bSet -) -{ - struct hal_com_data *pHalData =3D GET_HAL_DATA(Adapter); - struct dm_odm_t *podmpriv =3D &pHalData->odmpriv; - /* _irqL irqL; */ - switch (eVariable) { - case HAL_ODM_STA_INFO: - { - struct sta_info *psta =3D pValue1; - - if (bSet) { - ODM_CmnInfoPtrArrayHook(podmpriv, ODM_CMNINFO_STA_STATUS, psta->mac_id= , psta); - } else { - /* spin_lock_bh(&pHalData->odm_stainfo_lock); */ - ODM_CmnInfoPtrArrayHook(podmpriv, ODM_CMNINFO_STA_STATUS, psta->mac_id= , NULL); - - /* spin_unlock_bh(&pHalData->odm_stainfo_lock); */ - } - } - break; - case HAL_ODM_P2P_STATE: - ODM_CmnInfoUpdate(podmpriv, ODM_CMNINFO_WIFI_DIRECT, bSet); - break; - case HAL_ODM_WIFI_DISPLAY_STATE: - ODM_CmnInfoUpdate(podmpriv, ODM_CMNINFO_WIFI_DISPLAY, bSet); - break; - - default: - break; - } -} =20 bool GetU1ByteIntegerFromStringInDecimal(char *Str, u8 *pInt) { diff --git a/drivers/staging/rtl8723bs/hal/hal_intf.c b/drivers/staging/rtl= 8723bs/hal/hal_intf.c index 2c50fa5c0..d2e310115 100644 --- a/drivers/staging/rtl8723bs/hal/hal_intf.c +++ b/drivers/staging/rtl8723bs/hal/hal_intf.c @@ -161,7 +161,38 @@ u8 rtw_hal_get_def_var(struct adapter *padapter, enum = hal_def_variable eVariable =20 void rtw_hal_set_odm_var(struct adapter *padapter, enum hal_odm_variable e= Variable, void *pValue1, bool bSet) { - SetHalODMVar(padapter, eVariable, pValue1, bSet); + struct hal_com_data *pHalData =3D GET_HAL_DATA(padapter); + struct dm_odm_t *podmpriv =3D &pHalData->odmpriv; + /* _irqL irqL; */ + switch (eVariable) { + case HAL_ODM_STA_INFO: + { + struct sta_info *psta =3D pValue1; + + if (bSet) { + ODM_CmnInfoPtrArrayHook( + podmpriv, ODM_CMNINFO_STA_STATUS, psta->mac_id, psta + ); + } else { + /* spin_lock_bh(&pHalData->odm_stainfo_lock); */ + ODM_CmnInfoPtrArrayHook( + podmpriv, ODM_CMNINFO_STA_STATUS, psta->mac_id, NULL + ); + + /* spin_unlock_bh(&pHalData->odm_stainfo_lock); */ + } + } + break; + case HAL_ODM_P2P_STATE: + ODM_CmnInfoUpdate(podmpriv, ODM_CMNINFO_WIFI_DIRECT, bSet); + break; + case HAL_ODM_WIFI_DISPLAY_STATE: + ODM_CmnInfoUpdate(podmpriv, ODM_CMNINFO_WIFI_DISPLAY, bSet); + break; + + default: + break; + }; } =20 u8 rtw_hal_check_ips_status(struct adapter *padapter) diff --git a/drivers/staging/rtl8723bs/include/hal_com.h b/drivers/staging/= rtl8723bs/include/hal_com.h index 962ba3aaa..79bb60c5c 100644 --- a/drivers/staging/rtl8723bs/include/hal_com.h +++ b/drivers/staging/rtl8723bs/include/hal_com.h @@ -141,9 +141,4 @@ bool GetU1ByteIntegerFromStringInDecimal(char *str, u8 = *in); =20 void rtw_bb_rf_gain_offset(struct adapter *padapter); =20 -void SetHalODMVar( - struct adapter *Adapter, - enum hal_odm_variable eVariable, - void *pValue1, - bool bSet); #endif /* __HAL_COMMON_H__ */ --=20 2.55.0 From nobody Sat Jul 25 17:33:43 2026 Received: from mail-lf1-f45.google.com (mail-lf1-f45.google.com [209.85.167.45]) (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 479BB4C6EF7 for ; Wed, 15 Jul 2026 12:51:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119885; cv=none; b=ngsOkkZ725E8dmDPzLv/h2/h6xaFNbtwXNMJIMIu/kZVqBnutdVSvaKevfd2GKjgtlJaoJ5tlHlb9IPc3+9PotIyzsvx5Vm9Gt+Mz8kOfK9hyePDNf0E77iSXS30Jex/8ePpVRubi0IQOvbkgdOOCGf4jkpKZ0nZBM1fgXiV1+Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119885; c=relaxed/simple; bh=DRRvD86nDK2KcPwI5kJpJWsUlfUIah8s81TRQPIYBJ4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oJtfm+6riIHsLZbYIPspxwXgDUzcdRXobbUhkVUG70CybPdc+hMGNcVkyaesYYE7f1CFh4zBlPTTLRnOwTj7oCzIzHHskZ2OOFUond+BWOUjOgnZi4nwWK+ZJw0HArZpTZP4HUBE0UtUNwOJo2G4NnN46YQbBtY61zVRK8rmLHE= 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=dilQQZnL; arc=none smtp.client-ip=209.85.167.45 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="dilQQZnL" Received: by mail-lf1-f45.google.com with SMTP id 2adb3069b0e04-5b15dcaca31so762241e87.0 for ; Wed, 15 Jul 2026 05:51:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784119862; x=1784724662; 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=SvmASoz7rlm7VTOG5ZuhTdo5rXKqhp7vpcYKWZMpB7E=; b=dilQQZnL0ZlyhfA79ULQo22C+QRUP72o6xuVAV4G5Wl4Y5C9P7pBkkN1Shrg946aGp q9GdzFatnklAoZQIzu0I9GBYt6XqJBiozrSoVkzNDF9vaf5y3x72b7gATpf7GYZgZgQj F9QMsssoDILWapKLV0GUWahLGb9XGwiJzRJkQI7l1Mb8NekNSUYFeaTTwLkFKBDwqNTc uAmgioUxWgEcS8+zw8dVjiboThKTQ27Vqweho9kvnp2qHJlNBKwm9WZFEnd/jQV5wOUS o5A/v9yyWLW7uhuo/uTQPIvJNC5Ckhu08jpg2V33ggxFRjeVZw3jxZkNbjCb0gXK8AhV +A2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784119862; x=1784724662; 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=SvmASoz7rlm7VTOG5ZuhTdo5rXKqhp7vpcYKWZMpB7E=; b=DDXURN/KkWdkiQfkLfyjnscXzbHoKbERGNfTuDEpAsopx/lIrNhzmvSrPgELPCTUl4 3Rx9LmN21PpmeSBN1LcbJnARq/+SrthPUGl1Shs9cfv4BmwMHsDgwOLvAUSsoLdyJeL9 wM4KM9JZwt3kVvYODDuMflSUJEJtPjJOJAvuAYAL7CH7cv8ve+JJBC6UegVGjjppvuk9 m78qNdDpFB9UAb8Jag7ldzri4bAd+YPzAQvCQCapKoWdGHDeFCrGzUK5XY9FxA6K4MMO UsuQq7kCeYS/Ah+LztD4nc0o2FzJOdfjCJBJis3l8o8tglbAu2anoY0NZW2Y7Hn7+isx Ujhg== X-Forwarded-Encrypted: i=1; AHgh+RraXHQKBJxDE0SlSxM24zwUkyVw6zU8WsQY0yQV3pVF3I2IJfQe0lrRmBRSD1TYpL1Lp5AUC88jPDErbJk=@vger.kernel.org X-Gm-Message-State: AOJu0Ywq/8lpOpJHPKUeo8mDzZKUJP4/26OKtqnynGkhSebzIupd2Qs/ rStSTDVmB2AOYmDkrVQOr3bciL6TvhRB7cykdfXP4zaWVdSk8zZoOlPEc94uJkSKlR8= X-Gm-Gg: AfdE7cmgx0BjidtHScL5jns4x7Cpzd+VrkWKgZzdeQY1IytRXFKQfLPe8vmvqKI1frG uItXMPVssgRY5hv0LayzHlxcKMYFlwzdmSA5g3vT8lG8ZS7bNHoCHucGHSXoiWm91D37Ih7emeA zfazjMSHOydd3/VEKOlImcO/RlXYA++ioTTJB5+7RDL06dC8xS5pJDlu/xR3obm0U9SOkrhBxTp 0xOpucTuPzzSI52IHO8EL+AOiXYjknKruxoWxF1HA7oCpUEhP/Xu9EQa40xIMLWu1ZAASdnV5Z4 y+qKf8mwSWLe0/0CdywNHWZo7TONcfBRJWiVpTEi3wR3ROp/9Z94bzEIDwfFZrfPSGht+pNJLKc 5HOWE+JAbfXzaBSJcMStdK0QISVyq68hy4fKYotvXVRtym7hL19+U6e3Cf+BqIs7cDfrOUm3Tco 1mDp7h8exw/Mhn65Jv/v9rwaI34m68MAqxX/cd3P+MlP5cM+MPsGkXKXICLjz4Ly4JvnNWdup2V raea5Gad9qeLL5XedN/RXej X-Received: by 2002:a05:6512:39c7:b0:5b0:11cc:2284 with SMTP id 2adb3069b0e04-5b159b7255dmr1549433e87.21.1784119861898; Wed, 15 Jul 2026 05:51:01 -0700 (PDT) Received: from archlinux ([94.180.44.28]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b022fac999sm3404042e87.55.2026.07.15.05.51.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2026 05:51:01 -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 55/61] staging: rtl8723bs: inline CheckIPSStatus logic with defines Date: Wed, 15 Jul 2026 19:48:23 +0700 Message-ID: <20260715124829.90290-56-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: quoted-printable Content-Type: text/plain; charset="utf-8" Inline CheckIPSStatus logic directly into rtw_hal_check_ips_status. Replace the 0x100 register and 0xEA magic number with self-documenting defines: REG_FW_PWR_STATUS and FW_PWR_STATUS_IPS_DONE. Signed-off-by: Arsenii Pashchenko --- drivers/staging/rtl8723bs/hal/hal_intf.c | 2 +- drivers/staging/rtl8723bs/hal/sdio_ops.c | 16 ---------------- drivers/staging/rtl8723bs/include/sdio_ops.h | 4 +++- 3 files changed, 4 insertions(+), 18 deletions(-) diff --git a/drivers/staging/rtl8723bs/hal/hal_intf.c b/drivers/staging/rtl= 8723bs/hal/hal_intf.c index d2e310115..a73abd36f 100644 --- a/drivers/staging/rtl8723bs/hal/hal_intf.c +++ b/drivers/staging/rtl8723bs/hal/hal_intf.c @@ -197,7 +197,7 @@ void rtw_hal_set_odm_var(struct adapter *padapter, enum= hal_odm_variable eVariab =20 u8 rtw_hal_check_ips_status(struct adapter *padapter) { - return CheckIPSStatus(padapter); + return rtw_read8(padapter, REG_FW_PWR_STATUS) =3D=3D FW_PWR_STATUS_IPS_DO= NE; } =20 int rtw_hal_xmitframe_enqueue(struct adapter *padapter, struct xmit_frame = *pxmitframe) diff --git a/drivers/staging/rtl8723bs/hal/sdio_ops.c b/drivers/staging/rtl= 8723bs/hal/sdio_ops.c index c4058cfe7..dced13d2f 100644 --- a/drivers/staging/rtl8723bs/hal/sdio_ops.c +++ b/drivers/staging/rtl8723bs/hal/sdio_ops.c @@ -620,22 +620,6 @@ void rtw_sdio_disable_interrupt(struct adapter *adapte= r) sdio_local_write(adapter, SDIO_REG_HIMR, 4, (u8 *)&himr); } =20 -/* */ -/* Description: */ -/* Using 0x100 to check the power status of FW. */ -/* */ -/* Assumption: */ -/* Using SDIO Local register ONLY for configuration. */ -/* */ -/* Created by Isaac, 2013.09.10. */ -/* */ -u8 CheckIPSStatus(struct adapter *adapter) -{ - if (rtw_read8(adapter, 0x100) =3D=3D 0xEA) - return true; - else - return false; -} =20 static struct recv_buf *sd_recv_rxfifo(struct adapter *adapter, u32 size) { diff --git a/drivers/staging/rtl8723bs/include/sdio_ops.h b/drivers/staging= /rtl8723bs/include/sdio_ops.h index 252b0e164..b5d426c99 100644 --- a/drivers/staging/rtl8723bs/include/sdio_ops.h +++ b/drivers/staging/rtl8723bs/include/sdio_ops.h @@ -23,7 +23,9 @@ u32 _sdio_read32(struct adapter *padapter, u32 addr); s32 _sdio_write32(struct adapter *padapter, u32 addr, u32 val); =20 extern void sd_int_hdl(struct adapter *padapter); -extern u8 CheckIPSStatus(struct adapter *padapter); + +#define REG_FW_PWR_STATUS 0x100 +#define FW_PWR_STATUS_IPS_DONE 0xEA =20 extern void InitInterrupt8723BSdio(struct adapter *padapter); void rtw_sdio_enable_interrupt(struct adapter *padapter); --=20 2.55.0 From nobody Sat Jul 25 17:33:43 2026 Received: from mail-lf1-f54.google.com (mail-lf1-f54.google.com [209.85.167.54]) (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 05C514BC02F for ; Wed, 15 Jul 2026 12:51:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119879; cv=none; b=STVpKgPwbmfEVI6JrNy1gwHM2Vy7y34jnRImQj1COAhdag8KAn7qsWHfoBj47xOmdO/g/nKvy/5aCFpOzSKBzgnKYWhiL6DujR6FZSrhyTQB+ZD5Ib3vmNEgmHkR8dwcBI2cFRYHhuYOW7PlyTQSQDeMOf/OSqcFJZ1tHTeXAWg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119879; c=relaxed/simple; bh=Vtr4UYwJobCeIRQMXJ4byK+T6xtCXLCAFgENupk65VE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QJGfieVp+Q+F+B0mtwA0wkt2TGV891VIX8bU0ofp+Hx/bV55ZYtY7mZqcUJIqEqDKEGL+IgPxClHcCMBJpZUVD7j9M0cs4rLlb+V/zXoHayn5oLon3K4iS9KMiRq+C238xqZUF63/ep4GnO76BU+v63j3yV1dpefE7M37s0DzFQ= 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=hsPYPBlR; arc=none smtp.client-ip=209.85.167.54 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="hsPYPBlR" Received: by mail-lf1-f54.google.com with SMTP id 2adb3069b0e04-5b021916bd3so4484417e87.3 for ; Wed, 15 Jul 2026 05:51:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784119863; x=1784724663; 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=JWQ3QnN0Oyq9QyqnlMfG+IyPMyxqK/+BZoxD0v9pTJ8=; b=hsPYPBlRuOfmZ6N+v8mMNBmknVTpnJjCf2weBv86lhY9p5HW7dP7zVlQuP8sthPRuR 4VPQ6oR75t/AeffiZ6shThTIYfOq5esr/5DLQIFW+2FrvFkhUCSHwAusi/mdrpMKq5OH W8PPbz4UqDq8uxYrxGE1FOh187J5t6Usck8L8dax0bOV58laMC56EFrc/9R915YYnY/X OtDZu+ZvrA7p6o3sHvZ2S+tK+oMioSsmO6hjBnzQV8oxrjvExngvqK77SsOufBFZfClR 4USiuqnxJI9bBis2mCQxionWc9Stdmfle5+ROmb3tWZBNPZxBBBwOQfB2H2oWMn12l0x X03A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784119863; x=1784724663; 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=JWQ3QnN0Oyq9QyqnlMfG+IyPMyxqK/+BZoxD0v9pTJ8=; b=fuIADFXEzD2dsg4hNseQEchYrM8OjiKgyJ4att6ks+wKwfb2U3ZvdhLJcta2NGpkD9 qZAu2DMaNWtjcgt2rU5AGRkc4qHw7tIk1ugnHyHJ80K+ydxyahHI7hv/hm31Q92TwBba mrgQ6zWWj2rh1eBg2w+5FIoXNi9KlI8pY6qnkg4oUfEN2SLZQZ5ZAdo9cWEhb4TEhJQV 9ETb8dBP3PSPGqN0zYftisYfkgFiKheSus1qieNDHZpi8AakdAoiaSmbxgPjaP9CRxhu lB2D4OaWJEClvGElyViioHX0zwJVvPrHS0vHwrsoC4+kfO4kp2ytMIsNa7pdtCK3M7kY qyEA== X-Forwarded-Encrypted: i=1; AHgh+Rp3bAI2b6n3wRt4auFHjPeKtdUg5eUzSQZqKB8naunjqOSBGJ+zQs8s0NBTddA2p+RZuk5lGZmVsyT/cTA=@vger.kernel.org X-Gm-Message-State: AOJu0Yz/7c0I8qyR+7TofaXN4ROOsW/CwTfbec08+s72b7Hlh2JEw6JO rYv2Wp3ssWyCK04+kJODTc0TdRApyFU+ylyYW3q8uSORXVoRcRXKWMYXKZ9fHdG9jwI= X-Gm-Gg: AfdE7cljNjuR4W41ozZ5IAiRa98pPDQZUmRksfYwpteFyf+OppaZbKSvla9lrpbl3Ug fPwc7WUiITeW/VbXjCoF1A6GOCY7m2mvPbn8SwIbqHKYsk+8mDAmWiR1V+7h93GAq0r2cJo0gaG xpgkDBvF5GnnNuh/7ZZaLN41wifGd3xV48svh2NWTQlMNMzbe/othNax1sbZ3WUbQ8KPUp0ICai OtVe44KNOqkklnHIrt2p1fPMwiLmc8F+fmhgAwP7BYuCAI3RJ1BqcneO4XpAiI6ETuAOrZoxdgh LWwEK4G/mn+N8RjfEADumkaqqyBOemVMcmWPfRnxBRlqUVuP8i2puWsejqwt1AvpnVlCHLKIU03 Q86q+BKTquWUymfDP4t/sKN9IWjx4tmZqAaOMIyHzUecrTWyFvp4POR65JELZBMwHy3TvQWaAPg IU/Zx3u8wxU6q3tAISO+vcPZcNGOYoeNOTyH1ts96wm9oVsSnrC4VDWrY8a+33Tiyz3OQll3/j7 zFmu1RiIS77pQ== X-Received: by 2002:ac2:5d72:0:b0:5ae:c7a2:69a8 with SMTP id 2adb3069b0e04-5b15d7a6a2dmr379701e87.44.1784119862945; Wed, 15 Jul 2026 05:51:02 -0700 (PDT) Received: from archlinux ([94.180.44.28]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b022fac999sm3404042e87.55.2026.07.15.05.51.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2026 05:51:02 -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 56/61] staging: rtl8723bs: inline rtl8723bs_hal_xmitframe_enqueue helper Date: Wed, 15 Jul 2026 19:48:24 +0700 Message-ID: <20260715124829.90290-57-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: quoted-printable Content-Type: text/plain; charset="utf-8" Inline the xmit frame enqueue logic from the internal CamelCase function directly into rtw_hal_xmitframe_enqueue. This simplifies the transmit path, removes an unnecessary layer, and cleans up the driver code. Signed-off-by: Arsenii Pashchenko --- drivers/staging/rtl8723bs/hal/hal_intf.c | 14 ++++++++++++- .../staging/rtl8723bs/hal/rtl8723bs_xmit.c | 20 ------------------- .../staging/rtl8723bs/include/rtl8723b_xmit.h | 1 - 3 files changed, 13 insertions(+), 22 deletions(-) diff --git a/drivers/staging/rtl8723bs/hal/hal_intf.c b/drivers/staging/rtl= 8723bs/hal/hal_intf.c index a73abd36f..b11f4ab4a 100644 --- a/drivers/staging/rtl8723bs/hal/hal_intf.c +++ b/drivers/staging/rtl8723bs/hal/hal_intf.c @@ -202,7 +202,19 @@ u8 rtw_hal_check_ips_status(struct adapter *padapter) =20 int rtw_hal_xmitframe_enqueue(struct adapter *padapter, struct xmit_frame = *pxmitframe) { - return rtl8723bs_hal_xmitframe_enqueue(padapter, pxmitframe); + struct xmit_priv *pxmitpriv =3D &padapter->xmitpriv; + s32 err; + + err =3D rtw_xmitframe_enqueue(padapter, pxmitframe); + if (err) { + rtw_free_xmitframe(pxmitpriv, pxmitframe); + + pxmitpriv->tx_drop++; + } else { + complete(&pxmitpriv->SdioXmitStart); + } + + return err; } =20 s32 rtw_hal_xmit(struct adapter *padapter, struct xmit_frame *pxmitframe) diff --git a/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c b/drivers/stagi= ng/rtl8723bs/hal/rtl8723bs_xmit.c index e40f69c13..a4dfee1d4 100644 --- a/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c +++ b/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c @@ -496,26 +496,6 @@ s32 rtl8723bs_hal_xmit( return false; } =20 -s32 rtl8723bs_hal_xmitframe_enqueue( - struct adapter *padapter, struct xmit_frame *pxmitframe -) -{ - struct xmit_priv *pxmitpriv =3D &padapter->xmitpriv; - s32 err; - - err =3D rtw_xmitframe_enqueue(padapter, pxmitframe); - if (err) { - rtw_free_xmitframe(pxmitpriv, pxmitframe); - - pxmitpriv->tx_drop++; - } else { - complete(&pxmitpriv->SdioXmitStart); - } - - return err; - -} - /* * Return *_SUCCESS start thread ok diff --git a/drivers/staging/rtl8723bs/include/rtl8723b_xmit.h b/drivers/st= aging/rtl8723bs/include/rtl8723b_xmit.h index ddf868c78..8d6d6d2b7 100644 --- a/drivers/staging/rtl8723bs/include/rtl8723b_xmit.h +++ b/drivers/staging/rtl8723bs/include/rtl8723b_xmit.h @@ -411,7 +411,6 @@ s32 rtl8723bs_init_xmit_priv(struct adapter *padapter); void rtl8723bs_free_xmit_priv(struct adapter *padapter); s32 rtl8723bs_hal_xmit(struct adapter *padapter, struct xmit_frame *pxmitf= rame); s32 rtl8723bs_mgnt_xmit(struct adapter *padapter, struct xmit_frame *pmgnt= frame); -s32 rtl8723bs_hal_xmitframe_enqueue(struct adapter *padapter, struct xmit_= frame *pxmitframe); s32 rtl8723bs_xmit_buf_handler(struct adapter *padapter); int rtl8723bs_xmit_thread(void *context); =20 --=20 2.55.0 From nobody Sat Jul 25 17:33:43 2026 Received: from mail-lf1-f53.google.com (mail-lf1-f53.google.com [209.85.167.53]) (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 E2B2349551B for ; Wed, 15 Jul 2026 12:51:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119876; cv=none; b=VGxjqUfNZBLNGbiq6ZjArvzeWaOq4W7lT+RNAjB9dgZuaFD4P/IFGJovqXF4h1fyjgyYrnOCX7+Nk8DdkKioJeq0zwXIjoK3oC7YdjPdPQgVMY6iSitFg1RmdlEC7Z1aKb2nbLWCy7/ZO2IDMiOoppNbtFW85WTc4Ywy3dwkolI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119876; c=relaxed/simple; bh=cSVtqwIAX/SFczkOeUbAhlabmVOHw/+tSx5h7+a5Czw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LVI/XPxXKALUWgC2YWP9ATUMTXAbsZHe65wPhoJPmJdcKihQoT4OTlpNSTn6ykwzjEiqWbaGnWlJ3Axae6Lc341IRoDkXCC6hPYslKWe4rAAYATCtTuTOnYYkKV+RZJBgbyUgwIKby/fqG9XMuYyO7OlNgak3VMiTh34ES6+OrI= 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=ZO9O0UZV; arc=none smtp.client-ip=209.85.167.53 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="ZO9O0UZV" Received: by mail-lf1-f53.google.com with SMTP id 2adb3069b0e04-5aeb8c19017so7804666e87.0 for ; Wed, 15 Jul 2026 05:51:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784119864; x=1784724664; 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=P7qtNLeb3vifmZy8w97jp5BanhP4clMFWT1Ht9D7LA0=; b=ZO9O0UZVoLiv6hnMndHdbPvVcPJW4R2OMQARxewrVVXBNPzCsZBWVZLtaKs/LdBqZ0 8fvuJeL8E7Gx2zjfIgAPDs0TrcWso11zkbvQdP0FTsTKZfN8B2FhLDEhAk4sZpAWIYTV 1f8MSl240ostp0b7GMF7QfkXaJSPw6RD7MxFGcNs8ZAaGPZN65FPWKTY+1QJDt00Kj8u XYpnWItlM+2BEaJSq3WAuj3+6JwmCB+Aw6Z7RIbec3ceCvYPKKLxelSNp+3FVMmzeaOt VenhuGrySzomG8jRKHIYDJnx7UTJzIRZqWCmvQdXpqmw8du8+8DwLsgWTUXgnCbGlGu3 a5Lg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784119864; x=1784724664; 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=P7qtNLeb3vifmZy8w97jp5BanhP4clMFWT1Ht9D7LA0=; b=tQFtUk4mjyDQy8SvbrVO7/aLoBfljj9yovEm8y42NjbSZ0DIz34+FM/dSL6QoNEy2N RqWVhdMQOF2jX23fQPLv80S1oNcYQmZxhuodb08JIarZGJrIB/0GoRxgtva95PS7rQ5z j+t7xKr+yVwI6orb4SC9E+Lc/IJ77XYLO4X9dU2H6xkmHxfscnMw8n4FtJHdXSeFNWbl waIzgVfQ9u31+K3aFIa2KEw3RHTklTlwg0Vc5scOhvbPLN8tWuHD2HQItYdIxcnWL0jb TE6YFVNlwbnQeDTuOJFw3+P6IbaXII5PltQr1xtCddv02msiA10/yXsmQR9VZf2Alton oS5A== X-Forwarded-Encrypted: i=1; AHgh+RoeQbYujW0F6JOmeoEh2lYTyk6WNr+NikdV8kNiIR/goM1NVAMqU6rioYPXscbTFKehgkXf0IpBr0QJLeQ=@vger.kernel.org X-Gm-Message-State: AOJu0Yy9THrgsDwXLqYDDU/z7RaTTh/1cwYU4pAo+ukUJqmJIBU3St01 Mocd/Pe/0mMo+EOmaoVW041DwX122iqL9KHyIGxBxgRQxuQXijP8ETVJ X-Gm-Gg: AfdE7cnne5Ou3UY/aqTe8f/TxANf5NZf3c98Njs7qTgiUWq/L60MMlMdReJabJbr8vr e8ZUBDW/xJm1wXnWHSSnH9ZGGQCTTm5P70zDkWsSrekndZ0qj4733G7DtzxeMOTGv/aw4kGEOnn nEUmdJ5dqJFgT3aGjHh2u0gthjlNfkC8xk/nDxF17q2M8zI0Ae69fzWXt/8ujdcwIOXhDtzJuKr Sk68Sn0nTT9sqPbNR8XtZ+rmgKsDgKGsItlSKvlxENTsOt5Ue5cx6/q17xcIXc641xf6CYNlXXO ly8xc6UtpSwO6I5vQDwAZZ0aN060q70mjCupphK/O7koWdQYxY+WQbpQNu/mhkcaWKyZnNjL+b+ gNmEiUgw7crDpSdLKmJ5nFjQU24Ouj4uwzWhGaAOOZFP7YvzRd+xfgmXhzWPvFgOXk6j9M2LK/N HSSCRS7jlHe7jyvOZtd8JqhaLyJ7b0PJ+xj5rel2fLJGkvWfLIpU/JTAWSOzidJPiX7J+DEw/o2 IkH02oOqOlRWg== X-Received: by 2002:a05:6512:2524:b0:5ae:b5bd:5e72 with SMTP id 2adb3069b0e04-5b1582c61aemr1847196e87.59.1784119863753; Wed, 15 Jul 2026 05:51:03 -0700 (PDT) Received: from archlinux ([94.180.44.28]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b022fac999sm3404042e87.55.2026.07.15.05.51.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2026 05:51:03 -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 57/61] staging: rtl8723bs: inline rtl8723bs_hal_xmit into rtw_hal_xmit Date: Wed, 15 Jul 2026 19:48:25 +0700 Message-ID: <20260715124829.90290-58-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: quoted-printable Content-Type: text/plain; charset="utf-8" Inline the transmit frame handling logic from rtl8723bs_hal_xmit directly into rtw_hal_xmit. This simplifies the driver's transmit path, cuts down on an unnecessary redirection layer, and improves code maintainability. Signed-off-by: Arsenii Pashchenko --- drivers/staging/rtl8723bs/hal/hal_intf.c | 28 ++++++++++++- .../staging/rtl8723bs/hal/rtl8723bs_xmit.c | 42 ------------------- .../staging/rtl8723bs/include/rtl8723b_xmit.h | 1 - 3 files changed, 27 insertions(+), 44 deletions(-) diff --git a/drivers/staging/rtl8723bs/hal/hal_intf.c b/drivers/staging/rtl= 8723bs/hal/hal_intf.c index b11f4ab4a..9bb1fba5c 100644 --- a/drivers/staging/rtl8723bs/hal/hal_intf.c +++ b/drivers/staging/rtl8723bs/hal/hal_intf.c @@ -219,10 +219,36 @@ int rtw_hal_xmitframe_enqueue(struct adapter *padapte= r, struct xmit_frame *pxmit =20 s32 rtw_hal_xmit(struct adapter *padapter, struct xmit_frame *pxmitframe) { - if (rtl8723bs_hal_xmit(padapter, pxmitframe)) + struct xmit_priv *pxmitpriv; + s32 err; + + pxmitframe->attrib.qsel =3D pxmitframe->attrib.priority; + pxmitpriv =3D &padapter->xmitpriv; + + if ( + (pxmitframe->frame_tag =3D=3D DATA_FRAMETAG) && + (pxmitframe->attrib.ether_type !=3D 0x0806) && + (pxmitframe->attrib.ether_type !=3D 0x888e) && + (pxmitframe->attrib.dhcp_pkt !=3D 1) + ) { + if (padapter->mlmepriv.link_detect_info.busy_traffic) + rtw_issue_addbareq_cmd(padapter, pxmitframe); + } + + spin_lock_bh(&pxmitpriv->lock); + err =3D rtw_xmitframe_enqueue(padapter, pxmitframe); + spin_unlock_bh(&pxmitpriv->lock); + if (err) { + rtw_free_xmitframe(pxmitpriv, pxmitframe); + + pxmitpriv->tx_drop++; return _FAIL; + } + + complete(&pxmitpriv->SdioXmitStart); =20 return _SUCCESS; + } =20 /* diff --git a/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c b/drivers/stagi= ng/rtl8723bs/hal/rtl8723bs_xmit.c index a4dfee1d4..2298c41df 100644 --- a/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c +++ b/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c @@ -453,48 +453,6 @@ s32 rtl8723bs_mgnt_xmit( return ret; } =20 -/* - * Description: - *Handle xmitframe(packet) come from rtw_xmit() - * - * Return: - * true dump packet directly ok - * false enqueue, temporary can't transmit packets to hardware - */ -s32 rtl8723bs_hal_xmit( - struct adapter *padapter, struct xmit_frame *pxmitframe -) -{ - struct xmit_priv *pxmitpriv; - s32 err; - - pxmitframe->attrib.qsel =3D pxmitframe->attrib.priority; - pxmitpriv =3D &padapter->xmitpriv; - - if ( - (pxmitframe->frame_tag =3D=3D DATA_FRAMETAG) && - (pxmitframe->attrib.ether_type !=3D 0x0806) && - (pxmitframe->attrib.ether_type !=3D 0x888e) && - (pxmitframe->attrib.dhcp_pkt !=3D 1) - ) { - if (padapter->mlmepriv.link_detect_info.busy_traffic) - rtw_issue_addbareq_cmd(padapter, pxmitframe); - } - - spin_lock_bh(&pxmitpriv->lock); - err =3D rtw_xmitframe_enqueue(padapter, pxmitframe); - spin_unlock_bh(&pxmitpriv->lock); - if (err) { - rtw_free_xmitframe(pxmitpriv, pxmitframe); - - pxmitpriv->tx_drop++; - return true; - } - - complete(&pxmitpriv->SdioXmitStart); - - return false; -} =20 /* * Return diff --git a/drivers/staging/rtl8723bs/include/rtl8723b_xmit.h b/drivers/st= aging/rtl8723bs/include/rtl8723b_xmit.h index 8d6d6d2b7..157b2a808 100644 --- a/drivers/staging/rtl8723bs/include/rtl8723b_xmit.h +++ b/drivers/staging/rtl8723bs/include/rtl8723b_xmit.h @@ -409,7 +409,6 @@ u32 rtl8723bs_hal_init(struct adapter *padapter); u32 rtl8723bs_hal_deinit(struct adapter *padapter); s32 rtl8723bs_init_xmit_priv(struct adapter *padapter); void rtl8723bs_free_xmit_priv(struct adapter *padapter); -s32 rtl8723bs_hal_xmit(struct adapter *padapter, struct xmit_frame *pxmitf= rame); s32 rtl8723bs_mgnt_xmit(struct adapter *padapter, struct xmit_frame *pmgnt= frame); s32 rtl8723bs_xmit_buf_handler(struct adapter *padapter); int rtl8723bs_xmit_thread(void *context); --=20 2.55.0 From nobody Sat Jul 25 17:33:43 2026 Received: from mail-lf1-f54.google.com (mail-lf1-f54.google.com [209.85.167.54]) (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 98D4C47DFAB for ; Wed, 15 Jul 2026 12:51:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119875; cv=none; b=dKjW9SlO6iApnrElMHLPkOoan204NewIUXh3NxAhmXJ4VTKMMhiBRGhMB1rkyjUOf16rxm8xJoiv2rOzPDZfu+CkpQ7XoqAccpLg7nBgIsPY2XpvOtaoAotBt0zQrdl4+CD1VaUiOSpfPINOWAZxVCJDUG7PsuaarmyZpNwbN3k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119875; c=relaxed/simple; bh=nzV9Ce+SC2Jvi0Vo/pIxDenZi8/RhTAMn2nRayZff1A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=U5WxD1trd6ddQwEW8JAaLv4FRcWL7hZxnrh0/CJ5yKhozAyKL3AcjNw4lt0sz3ccKgaNv/6kCicUtA/Pnkv3fPFnckgVcYX9BzEndzXv65FyQZ0oCxyzGucfZdjEhPkbOE3JsvlnsbRa6anSq3KXRu/YChkrXcoPHHzZjdK2QrI= 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=V1DEh+hR; arc=none smtp.client-ip=209.85.167.54 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="V1DEh+hR" Received: by mail-lf1-f54.google.com with SMTP id 2adb3069b0e04-5b0f19bea2fso2003187e87.1 for ; Wed, 15 Jul 2026 05:51:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784119865; x=1784724665; 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=7Y8Q8h6hkHXG1Mppemncd0CjDI9ldk0KPs75Hl1V2N4=; b=V1DEh+hRTt9O1Iyq36A4c0lelDfgPCd7hdNAkGweJpAquW6M3xQ046RHcb+PUB4i3g EbiWJDBAQ1xQ+Hv/qb356e8I4ZVreSaBcmLbxtaxAgGU1Ic5kJAqEyoVeRLFPZRpqDJ7 0Y505oZTnW3GR3nTxxYk7noSo9pf4n03pcXmlpxBFLp2cpAdPmJkfAvMK+zusWdP1Jhd nq9NqhYezA4LhRQj33kG9ew/lOsevaXVYksLu9Gk3Qt2/U3BcxLL/CbgRef+ELlMD2DO t65glSZNAcMdM4L3SfEcBUeSnXIMKCLzzQG8MPiZtXutUYQdBAnN/xHsTr/nU5nJdfua Yfsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784119865; x=1784724665; 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=7Y8Q8h6hkHXG1Mppemncd0CjDI9ldk0KPs75Hl1V2N4=; b=aOWeDi3+J7ScyUg90jGsvLaM7pR4Y39sbd7Y9JFhKDhbREXSDkxESJZBCLxOnk6roj oi1/j3KuxrlljQp19e0pZIwMSr/vqhDWJ2wZtq7yPhzLYSXuKKUC5B4zJfBAHMUaTMWs GQLcjLvj//grD2fj1BVGLNbAN7f4/lWcHOPN+YIBxxfZb6OJbVlf6jGwDjd3Rt+8eywV apYJArK+si09n+b0iWyRxPgUycxZIQPThPRIyQG3oqa1t8rrTUUtIfpnbmVsPRwkfE2x hNQIx7zmgAZgB909++u1AtWjubRtWYXpcB1noVxxOmK2OvSNBEEF+hw/Vsk9QqlMiL+u w0tw== X-Forwarded-Encrypted: i=1; AHgh+RptIMmDh8h4r9vZZ7pIykpzeGZqFC5kfV+azuK407PozEnSSE+M4RyuOGcRtL/ZHnBVuUx0PvkUUjG/Bb0=@vger.kernel.org X-Gm-Message-State: AOJu0Yze0OybJm9mSi28jyAw7CXwXGX7Hs42yxtBVdzIkPbFQkhxq89j n7FsyqVgUmEsRrsMfBkmKz76Wi3CnKHNp8zWvBaqDFUtw0p40c+QESKoplxLuI2U59E= X-Gm-Gg: AfdE7clpCIFuU3X6OIOUrwC4MZKoYOT/cPUh8iUSL9FV+/OxRzWzCLfLnrtLrpj1rqH dlELoLxyD8jI8N26iOHNvtGtufsK0JkaZ9zGkFPCJYofpCY3Qg0KCwFfbjKTh5paCD24RiVHyDz GB7nbXxPz5pC6LaQQuxxDQSeEDl9ESJknn67n+ZyZk+h79Ioeo+Gter3kFs4Gaz5M6hs73819ta /DVRI9j1+7FhUELfFlXsZQ49IECqB1smwIWoBNVzpI4qF0oDYLBPpT74XWwLCWfpmhZNa7aPVhg Lr78wrrt6iGI/MbPF4XyXg3swdBv3Ru6kUJ5UWucq7X1D6l351oyGHmG5iFo3wdGd1/fkRcgcrd 56r409V/7Joquueo2e3M5s6ZAbzYNURFCXlOauEeSDXGJRVhAdbzRO9gapqhTUrW36dwoxoeBzc FtHZGTKS3l95VyDbfdho3VMScb1qdfP5fDjIXag7vv1XQLw2261B239Itd0R2YjygDi551i9mrY hdCZdpi487zFw== X-Received: by 2002:a05:6512:2526:b0:5ae:b86b:71f0 with SMTP id 2adb3069b0e04-5b0236999c5mr4097798e87.37.1784119864525; Wed, 15 Jul 2026 05:51:04 -0700 (PDT) Received: from archlinux ([94.180.44.28]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b022fac999sm3404042e87.55.2026.07.15.05.51.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2026 05:51:04 -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 58/61] staging: rtl8723bs: extend rtw_hal_mgnt_xmit functionality Date: Wed, 15 Jul 2026 19:48:26 +0700 Message-ID: <20260715124829.90290-59-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: quoted-printable Content-Type: text/plain; charset="utf-8" Extend rtw_hal_mgnt_xmit to extract RA/TA MAC addresses from the 802.11 header before transmission. Signed-off-by: Arsenii Pashchenko --- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 10 ---------- drivers/staging/rtl8723bs/hal/hal_intf.c | 11 ++++++----- drivers/staging/rtl8723bs/include/rtw_mlme_ext.h | 1 - drivers/staging/rtl8723bs/include/rtw_xmit.h | 1 + 4 files changed, 7 insertions(+), 16 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/stagin= g/rtl8723bs/core/rtw_mlme_ext.c index 1fab3e829..fcf33c956 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c @@ -1916,16 +1916,6 @@ void update_mgntframe_attrib(struct adapter *padapte= r, struct pkt_attrib *pattri pattrib->mbssid =3D 0; } =20 -void update_mgntframe_attrib_addr(struct adapter *padapter, struct xmit_fr= ame *pmgntframe) -{ - u8 *pframe; - struct pkt_attrib *pattrib =3D &pmgntframe->attrib; - - pframe =3D (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; - - memcpy(pattrib->ra, GetAddr1Ptr(pframe), ETH_ALEN); - memcpy(pattrib->ta, GetAddr2Ptr(pframe), ETH_ALEN); -} =20 void dump_mgntframe(struct adapter *padapter, struct xmit_frame *pmgntfram= e) { diff --git a/drivers/staging/rtl8723bs/hal/hal_intf.c b/drivers/staging/rtl= 8723bs/hal/hal_intf.c index 9bb1fba5c..7cf5128e7 100644 --- a/drivers/staging/rtl8723bs/hal/hal_intf.c +++ b/drivers/staging/rtl8723bs/hal/hal_intf.c @@ -256,15 +256,16 @@ s32 rtw_hal_xmit(struct adapter *padapter, struct xmi= t_frame *pxmitframe) */ s32 rtw_hal_mgnt_xmit(struct adapter *padapter, struct xmit_frame *pmgntfr= ame) { - update_mgntframe_attrib_addr(padapter, pmgntframe); - /* pframe =3D (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; */ - /* pwlanhdr =3D (struct rtw_ieee80211_hdr *)pframe; */ - /* memcpy(pmgntframe->attrib.ra, pwlanhdr->addr1, ETH_ALEN); */ + struct pkt_attrib *pattrib =3D &pmgntframe->attrib; + + u8 *pframe =3D (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; + + memcpy(pattrib->ra, GetAddr1Ptr(pframe), ETH_ALEN); + memcpy(pattrib->ta, GetAddr2Ptr(pframe), ETH_ALEN); =20 if (padapter->securitypriv.binstallBIPkey) { if (is_multicast_ether_addr(pmgntframe->attrib.ra)) { pmgntframe->attrib.encrypt =3D _BIP_; - /* pmgntframe->attrib.bswenc =3D true; */ } else { pmgntframe->attrib.encrypt =3D _AES_; pmgntframe->attrib.bswenc =3D true; diff --git a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h b/drivers/sta= ging/rtl8723bs/include/rtw_mlme_ext.h index 3d1126740..7a1c90c71 100644 --- a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h +++ b/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h @@ -524,7 +524,6 @@ extern u8 set_tx_beacon_cmd(struct adapter *padapter); unsigned int setup_beacon_frame(struct adapter *padapter, unsigned char *b= eacon_frame); void update_mgnt_tx_rate(struct adapter *padapter, u8 rate); void update_mgntframe_attrib(struct adapter *padapter, struct pkt_attrib *= pattrib); -void update_mgntframe_attrib_addr(struct adapter *padapter, struct xmit_fr= ame *pmgntframe); void dump_mgntframe(struct adapter *padapter, struct xmit_frame *pmgntfram= e); s32 dump_mgntframe_and_wait(struct adapter *padapter, struct xmit_frame *p= mgntframe, int timeout_ms); s32 dump_mgntframe_and_wait_ack(struct adapter *padapter, struct xmit_fram= e *pmgntframe); diff --git a/drivers/staging/rtl8723bs/include/rtw_xmit.h b/drivers/staging= /rtl8723bs/include/rtw_xmit.h index f85a03efe..41a04e3b0 100644 --- a/drivers/staging/rtl8723bs/include/rtw_xmit.h +++ b/drivers/staging/rtl8723bs/include/rtw_xmit.h @@ -213,6 +213,7 @@ void rtw_sctx_init(struct submit_ctx *sctx, int timeout= _ms); int rtw_sctx_wait(struct submit_ctx *sctx); void rtw_sctx_done_err(struct submit_ctx **sctx, int status); =20 + struct xmit_buf { struct list_head list; =20 --=20 2.55.0 From nobody Sat Jul 25 17:33:43 2026 Received: from mail-lf1-f49.google.com (mail-lf1-f49.google.com [209.85.167.49]) (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 87BBE4C042B for ; Wed, 15 Jul 2026 12:51:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119886; cv=none; b=duCduQC1q9kN4JomswHCRq4ooJwBmrlmbG4y/htUS5i8N+M3+AOWo0zos5I+6ZKp2BIN9PGlSAnOyt5XCP+Y/cpwN4UWsopuvOqvB1atafWKzShwFuiyGz6O5jSWGGsveKHKNMsjmcDWwUSkBRMEb7MhEu4/PAWHpQ+xSCK7aiI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119886; c=relaxed/simple; bh=fISncI/RA4hTAB1pJnBoN0nB4uV7YsltXJ7Bvn3kBgM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nCUWV+JRayQwo0F1tcBgV7BfJfBbEwydSWoBTzFBUQsxK/O7h/nNPgav6Qc9WrBDdLLr4xPDyay2JNlst74Io0Cr8eeAJTkOTbhf4DCuVJPo1P1S4CS1skGAoOkEUQMYm8erFl0UNlREz4UXgCKQVhOGxATnCQloAoQ5GNrVnHs= 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=AOd6mxSd; arc=none smtp.client-ip=209.85.167.49 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="AOd6mxSd" Received: by mail-lf1-f49.google.com with SMTP id 2adb3069b0e04-5b0f19bea2fso2003202e87.1 for ; Wed, 15 Jul 2026 05:51:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784119866; x=1784724666; 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=MHJFILJjmYuD0QyR36xdFL//pqzNWfMe1G6QhVxTjco=; b=AOd6mxSd8t2jKCDdYW+ksVZZnehBbDEjf1d4tkfyZFT+RdxHhWScYOndvVBSoh5t3F QIPBwISILgdDw5/TYQ/ywYLA7TiUQq3UfHEbX2FhrOjylbtv+L/SUSXDclhG/ZDfVu/m 4NatnqCwIdMvxxOkGnfG4NMwPi6kNC5FOM8ef5hMb4rtIM/wyHv9emmGXKEa+nikrv2h HOXZa2rCskmcJb09K39KgZIQyxD3S/ATyKz478xGFKJIaec3KeQsEDHZOsn4guAsoaqr c/V9cbdlmJk1AbbPtgTdC03a2Jidk9zYfUCpd5ZQuhymruGMYcymPH/Oi8C1EBnegMSx jKvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784119866; x=1784724666; 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=MHJFILJjmYuD0QyR36xdFL//pqzNWfMe1G6QhVxTjco=; b=PcVUDSBLO8lwcp5Xv41+uYIZdWjf7C59htRqPBOhrrsHlZg2aNT1OvK8WNjobdIXcv Su6wynSnv/FAt1qTZQjP36VBJtn74HYSJ77kjl8igp5qJ09XafRqEr+sHpc0wsZ3VM4d +bWuA2VDuWxUVraYfI7syeQOwbLvCsB2KZcyBMfSrleOa8EiRkuAOKPcqKbcXSSAUbQq 0Aqt0pzM7BN/p/rc+kIbkfPz3wbNPhK5/BT9MXyRBPzV0ket5GdGlsbLsBRoi+bSE58B kpxSqSmInRnTf8FQ0aZ60NKelaUy7smqAGUtf2u84SyhNBjFB57L3HIeyidjiTMMjliD Cnwg== X-Forwarded-Encrypted: i=1; AHgh+RrA7ztCT97NmwOHlTDPDbf9bRqkZcotrn7aedddbhD8GvsUHt1ZNcQ6JFVhbbK4Bhkb7UOilyuhUMaJymE=@vger.kernel.org X-Gm-Message-State: AOJu0YxqIb/wMeSV/HmtiHiAEf2dLXgL9jFt2nH8YY/cCVhgfB9J01YJ n+JqyZ2woq+kzwVB9zDLgJdiFkLxKZ1SONMVqwOXiH44aTZAkUYouhJR X-Gm-Gg: AfdE7cm07YmEA0Izs0NV/yhx78HXu5PWMH/LTdPYY4Uu3zoiEObVNKb9Kkahuny0Ozd C/RWP89Qq8ebGp8G25trhaaOkRm1T86R+TrX08EMGeFRscfF+ZmRL7myhPgE8paZ8eRKpr1SDPE PDDQM793FSF4beF+24KRapOUgM3q1yAc21EI3gBcP6c73Rlc0gZRf7VmfTR/MUs0N+6aLPjsdBP 03KOSbWhUq98YjCsTxJa9zw12zUDYa1JYDu/aL0kMUSYK4DyvWy+/7AGmXla+mGizztY8yH5Wx0 yb3Zsrk/s+sbNG67ScjXYfzZ+ppWh+OYFS31Kg4na0ALj2LGV+yYO0XR+sNxLIe1Hph7pfXEQuU IYj5iyrxWZUKhys2Fi0QmtoL7BUW8j7b4n1/oZEqMfRNAxYJvLejixFQKOCsh0dGMNj/Xgj71S8 aXsXYWhPCUOIABxRxtPUPxbe8Ruc9sZT85vESf19V3vhu1wOOjfhWakxOuL8+XEyHvYrxVIWhi5 D91fAfK5gmzeqV50uct31Co X-Received: by 2002:ac2:5227:0:b0:5ae:be77:44bc with SMTP id 2adb3069b0e04-5b0235614f6mr3163533e87.4.1784119865564; Wed, 15 Jul 2026 05:51:05 -0700 (PDT) Received: from archlinux ([94.180.44.28]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b022fac999sm3404042e87.55.2026.07.15.05.51.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2026 05:51:05 -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 59/61] staging: rtl8723bs: inline rtl8723bs_init_xmit_priv helper Date: Wed, 15 Jul 2026 19:48:27 +0700 Message-ID: <20260715124829.90290-60-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: quoted-printable Content-Type: text/plain; charset="utf-8" Inline the xmit private initialization logic from the internal function directly into rtw_hal_init_xmit_priv. This eliminates an unnecessary redirection layer for initializing SDIO-specific completions and locks. Signed-off-by: Arsenii Pashchenko --- drivers/staging/rtl8723bs/hal/hal_intf.c | 118 +++++++++++++++++- .../staging/rtl8723bs/hal/rtl8723bs_recv.c | 88 +------------ .../staging/rtl8723bs/hal/rtl8723bs_xmit.c | 53 -------- .../staging/rtl8723bs/include/rtl8723b_hal.h | 2 + .../staging/rtl8723bs/include/rtl8723b_recv.h | 2 +- .../staging/rtl8723bs/include/rtl8723b_xmit.h | 3 +- 6 files changed, 121 insertions(+), 145 deletions(-) diff --git a/drivers/staging/rtl8723bs/hal/hal_intf.c b/drivers/staging/rtl= 8723bs/hal/hal_intf.c index 7cf5128e7..3244f121d 100644 --- a/drivers/staging/rtl8723bs/hal/hal_intf.c +++ b/drivers/staging/rtl8723bs/hal/hal_intf.c @@ -278,17 +278,129 @@ s32 rtw_hal_mgnt_xmit(struct adapter *padapter, stru= ct xmit_frame *pmgntframe) =20 s32 rtw_hal_init_xmit_priv(struct adapter *padapter) { - return rtl8723bs_init_xmit_priv(padapter); + struct xmit_priv *xmitpriv =3D &padapter->xmitpriv; + struct hal_com_data *phal; + + phal =3D GET_HAL_DATA(padapter); + + spin_lock_init(&phal->SdioTxFIFOFreePageLock); + init_completion(&xmitpriv->SdioXmitStart); + init_completion(&xmitpriv->SdioXmitTerminate); + + return _SUCCESS; } =20 void rtw_hal_free_xmit_priv(struct adapter *padapter) { - rtl8723bs_free_xmit_priv(padapter); + struct xmit_priv *pxmitpriv =3D &padapter->xmitpriv; + struct xmit_buf *pxmitbuf; + struct __queue *pqueue =3D &pxmitpriv->pending_xmitbuf_queue; + struct list_head *plist, *phead; + struct list_head tmplist; + + phead =3D get_list_head(pqueue); + INIT_LIST_HEAD(&tmplist); + + spin_lock_bh(&pqueue->lock); + if (!list_empty(&pqueue->queue)) { + /* Insert tmplist to end of queue, and delete phead */ + /* then tmplist become head of queue. */ + list_add_tail(&tmplist, phead); + list_del_init(phead); + } + spin_unlock_bh(&pqueue->lock); + + phead =3D &tmplist; + while (!list_empty(phead)) { + plist =3D get_next(phead); + list_del_init(plist); + + pxmitbuf =3D container_of(plist, struct xmit_buf, list); + rtw_free_xmitframe(pxmitpriv, (struct xmit_frame *)pxmitbuf->priv_data); + pxmitbuf->priv_data =3D NULL; + rtw_free_xmitbuf(pxmitpriv, pxmitbuf); + } } =20 s32 rtw_hal_init_recv_priv(struct adapter *padapter) { - return rtl8723bs_init_recv_priv(padapter); + s32 res; + u32 i, n; + struct recv_priv *precvpriv; + struct recv_buf *precvbuf; + + res =3D _SUCCESS; + precvpriv =3D &padapter->recvpriv; + + /* 3 1. init recv buffer */ + INIT_LIST_HEAD(&precvpriv->free_recv_buf_queue.queue); + spin_lock_init(&precvpriv->free_recv_buf_queue.lock); + INIT_LIST_HEAD(&precvpriv->recv_buf_pending_queue.queue); + spin_lock_init(&precvpriv->recv_buf_pending_queue.lock); + + n =3D NR_RECVBUFF * sizeof(struct recv_buf) + 4; + precvpriv->pallocated_recv_buf =3D kzalloc(n, GFP_KERNEL); + if (!precvpriv->pallocated_recv_buf) { + res =3D _FAIL; + goto exit; + } + + precvpriv->precv_buf =3D (u8 *)N_BYTE_ALIGMENT((SIZE_PTR)(precvpriv->pall= ocated_recv_buf), 4); + + /* init each recv buffer */ + precvbuf =3D (struct recv_buf *)precvpriv->precv_buf; + for (i =3D 0; i < NR_RECVBUFF; i++) { + initrecvbuf(precvbuf, padapter); + + if (!precvbuf->pskb) { + SIZE_PTR tmpaddr =3D 0; + SIZE_PTR alignment =3D 0; + + precvbuf->pskb =3D __dev_alloc_skb( + MAX_RECVBUF_SZ + RECVBUFF_ALIGN_SZ, + GFP_ATOMIC); + if (precvbuf->pskb) { + precvbuf->pskb->dev =3D padapter->pnetdev; + + tmpaddr =3D (SIZE_PTR)precvbuf->pskb->data; + alignment =3D tmpaddr & (RECVBUFF_ALIGN_SZ-1); + skb_reserve(precvbuf->pskb, (RECVBUFF_ALIGN_SZ - alignment)); + } + } + + list_add_tail(&precvbuf->list, &precvpriv->free_recv_buf_queue.queue); + + precvbuf++; + } + precvpriv->free_recv_buf_queue_cnt =3D i; + + if (res =3D=3D _FAIL) + goto initbuferror; + + /* 3 2. init tasklet */ + tasklet_setup(&precvpriv->recv_tasklet, rtl8723bs_recv_tasklet); + + goto exit; + +initbuferror: + precvbuf =3D (struct recv_buf *)precvpriv->precv_buf; + if (precvbuf) { + n =3D precvpriv->free_recv_buf_queue_cnt; + precvpriv->free_recv_buf_queue_cnt =3D 0; + for (i =3D 0; i < n ; i++) { + list_del_init(&precvbuf->list); + if (precvbuf->pskb) + dev_kfree_skb_any(precvbuf->pskb); + precvbuf++; + } + precvpriv->precv_buf =3D NULL; + } + + kfree(precvpriv->pallocated_recv_buf); + precvpriv->pallocated_recv_buf =3D NULL; + +exit: + return res; } =20 void rtw_hal_free_recv_priv(struct adapter *padapter) diff --git a/drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c b/drivers/stagi= ng/rtl8723bs/hal/rtl8723bs_recv.c index 97dce28fd..384c5e643 100644 --- a/drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c +++ b/drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c @@ -8,7 +8,7 @@ #include #include =20 -static void initrecvbuf(struct recv_buf *precvbuf, struct adapter *padapte= r) +void initrecvbuf(struct recv_buf *precvbuf, struct adapter *padapter) { INIT_LIST_HEAD(&precvbuf->list); spin_lock_init(&precvbuf->recvbuf_lock); @@ -213,7 +213,7 @@ static inline bool pkt_exceeds_tail(struct recv_priv *p= recvpriv, return false; } =20 -static void rtl8723bs_recv_tasklet(struct tasklet_struct *t) +void rtl8723bs_recv_tasklet(struct tasklet_struct *t) { struct adapter *padapter =3D from_tasklet(padapter, t, recvpriv.recv_tasklet); @@ -357,90 +357,6 @@ static void rtl8723bs_recv_tasklet(struct tasklet_stru= ct *t) } while (1); } =20 -/* - * Initialize recv private variable for hardware dependent - * 1. recv buf - * 2. recv tasklet - * - */ -s32 rtl8723bs_init_recv_priv(struct adapter *padapter) -{ - s32 res; - u32 i, n; - struct recv_priv *precvpriv; - struct recv_buf *precvbuf; - - res =3D _SUCCESS; - precvpriv =3D &padapter->recvpriv; - - /* 3 1. init recv buffer */ - INIT_LIST_HEAD(&precvpriv->free_recv_buf_queue.queue); - spin_lock_init(&precvpriv->free_recv_buf_queue.lock); - INIT_LIST_HEAD(&precvpriv->recv_buf_pending_queue.queue); - spin_lock_init(&precvpriv->recv_buf_pending_queue.lock); - - n =3D NR_RECVBUFF * sizeof(struct recv_buf) + 4; - precvpriv->pallocated_recv_buf =3D kzalloc(n, GFP_KERNEL); - if (!precvpriv->pallocated_recv_buf) { - res =3D _FAIL; - goto exit; - } - - precvpriv->precv_buf =3D (u8 *)N_BYTE_ALIGMENT((SIZE_PTR)(precvpriv->pall= ocated_recv_buf), 4); - - /* init each recv buffer */ - precvbuf =3D (struct recv_buf *)precvpriv->precv_buf; - for (i =3D 0; i < NR_RECVBUFF; i++) { - initrecvbuf(precvbuf, padapter); - - if (!precvbuf->pskb) { - SIZE_PTR tmpaddr =3D 0; - SIZE_PTR alignment =3D 0; - - precvbuf->pskb =3D __dev_alloc_skb(MAX_RECVBUF_SZ + RECVBUFF_ALIGN_SZ, = GFP_ATOMIC); - if (precvbuf->pskb) { - precvbuf->pskb->dev =3D padapter->pnetdev; - - tmpaddr =3D (SIZE_PTR)precvbuf->pskb->data; - alignment =3D tmpaddr & (RECVBUFF_ALIGN_SZ-1); - skb_reserve(precvbuf->pskb, (RECVBUFF_ALIGN_SZ - alignment)); - } - } - - list_add_tail(&precvbuf->list, &precvpriv->free_recv_buf_queue.queue); - - precvbuf++; - } - precvpriv->free_recv_buf_queue_cnt =3D i; - - if (res =3D=3D _FAIL) - goto initbuferror; - - /* 3 2. init tasklet */ - tasklet_setup(&precvpriv->recv_tasklet, rtl8723bs_recv_tasklet); - - goto exit; - -initbuferror: - precvbuf =3D (struct recv_buf *)precvpriv->precv_buf; - if (precvbuf) { - n =3D precvpriv->free_recv_buf_queue_cnt; - precvpriv->free_recv_buf_queue_cnt =3D 0; - for (i =3D 0; i < n ; i++) { - list_del_init(&precvbuf->list); - if (precvbuf->pskb) - dev_kfree_skb_any(precvbuf->pskb); - precvbuf++; - } - precvpriv->precv_buf =3D NULL; - } - - kfree(precvpriv->pallocated_recv_buf); - precvpriv->pallocated_recv_buf =3D NULL; - -exit: - return res; -} =20 /* * Free recv private variable of hardware dependent diff --git a/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c b/drivers/stagi= ng/rtl8723bs/hal/rtl8723bs_xmit.c index 2298c41df..1037b9d11 100644 --- a/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c +++ b/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c @@ -452,56 +452,3 @@ s32 rtl8723bs_mgnt_xmit( =20 return ret; } - - -/* - * Return - *_SUCCESS start thread ok - *_FAIL start thread fail - * - */ -s32 rtl8723bs_init_xmit_priv(struct adapter *padapter) -{ - struct xmit_priv *xmitpriv =3D &padapter->xmitpriv; - struct hal_com_data *phal; - - phal =3D GET_HAL_DATA(padapter); - - spin_lock_init(&phal->SdioTxFIFOFreePageLock); - init_completion(&xmitpriv->SdioXmitStart); - init_completion(&xmitpriv->SdioXmitTerminate); - - return _SUCCESS; -} - -void rtl8723bs_free_xmit_priv(struct adapter *padapter) -{ - struct xmit_priv *pxmitpriv =3D &padapter->xmitpriv; - struct xmit_buf *pxmitbuf; - struct __queue *pqueue =3D &pxmitpriv->pending_xmitbuf_queue; - struct list_head *plist, *phead; - struct list_head tmplist; - - phead =3D get_list_head(pqueue); - INIT_LIST_HEAD(&tmplist); - - spin_lock_bh(&pqueue->lock); - if (!list_empty(&pqueue->queue)) { - /* Insert tmplist to end of queue, and delete phead */ - /* then tmplist become head of queue. */ - list_add_tail(&tmplist, phead); - list_del_init(phead); - } - spin_unlock_bh(&pqueue->lock); - - phead =3D &tmplist; - while (!list_empty(phead)) { - plist =3D get_next(phead); - list_del_init(plist); - - pxmitbuf =3D container_of(plist, struct xmit_buf, list); - rtw_free_xmitframe(pxmitpriv, (struct xmit_frame *)pxmitbuf->priv_data); - pxmitbuf->priv_data =3D NULL; - rtw_free_xmitbuf(pxmitpriv, pxmitbuf); - } -} diff --git a/drivers/staging/rtl8723bs/include/rtl8723b_hal.h b/drivers/sta= ging/rtl8723bs/include/rtl8723b_hal.h index fe6401c4f..e00d9e6b2 100644 --- a/drivers/staging/rtl8723bs/include/rtl8723b_hal.h +++ b/drivers/staging/rtl8723bs/include/rtl8723b_hal.h @@ -242,5 +242,7 @@ void Hal_ReadRFGainOffset(struct adapter *padapter, u8 = *hwinfo, =20 void phy_StoreTxPowerByRateBase(struct adapter *padapter); void phy_ConvertTxPowerByRateInDbmToRelativeValues(struct adapter *padapte= r); +void initrecvbuf(struct recv_buf *precvbuf, struct adapter *padapter); +void rtl8723bs_recv_tasklet(struct tasklet_struct *t); =20 #endif diff --git a/drivers/staging/rtl8723bs/include/rtl8723b_recv.h b/drivers/st= aging/rtl8723bs/include/rtl8723b_recv.h index e9ebecb22..c4c91f5f4 100644 --- a/drivers/staging/rtl8723bs/include/rtl8723b_recv.h +++ b/drivers/staging/rtl8723bs/include/rtl8723b_recv.h @@ -81,7 +81,7 @@ struct rxreport_8723b { u32 tsfl; }; =20 -s32 rtl8723bs_init_recv_priv(struct adapter *padapter); + void rtl8723bs_free_recv_priv(struct adapter *padapter); =20 void rtl8723b_query_rx_phy_status(union recv_frame *prframe, struct phy_st= at *pphy_stat); diff --git a/drivers/staging/rtl8723bs/include/rtl8723b_xmit.h b/drivers/st= aging/rtl8723bs/include/rtl8723b_xmit.h index 157b2a808..d467cc301 100644 --- a/drivers/staging/rtl8723bs/include/rtl8723b_xmit.h +++ b/drivers/staging/rtl8723bs/include/rtl8723b_xmit.h @@ -407,8 +407,7 @@ void rtl8723b_fill_fake_txdesc(struct adapter *padapter= , u8 *pDesc, u32 BufferLe =20 u32 rtl8723bs_hal_init(struct adapter *padapter); u32 rtl8723bs_hal_deinit(struct adapter *padapter); -s32 rtl8723bs_init_xmit_priv(struct adapter *padapter); -void rtl8723bs_free_xmit_priv(struct adapter *padapter); + s32 rtl8723bs_mgnt_xmit(struct adapter *padapter, struct xmit_frame *pmgnt= frame); s32 rtl8723bs_xmit_buf_handler(struct adapter *padapter); int rtl8723bs_xmit_thread(void *context); --=20 2.55.0 From nobody Sat Jul 25 17:33:43 2026 Received: from mail-lf1-f54.google.com (mail-lf1-f54.google.com [209.85.167.54]) (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 922AA4C042F for ; Wed, 15 Jul 2026 12:51:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119883; cv=none; b=d/S1H8ztSKj9pyKMws1xndIjePmB9v9jiFpUDI1rUeCAJg0fboMWvjcTbtTCXKg1FdL61aNCfW84upQH/Ul+aR3fYZMWpHp7rZvI7Rl4OQFL/KpyraWbop9lRcmmgZhy7tS2H9M7pCljMD+UmcAYkuYQuzIeXEcrJ+NR0lfXQyg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119883; c=relaxed/simple; bh=1QTGDCvZKkTy0djuSNnMKzL2xAk47pu2/T928AMpX9I=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=j0SmphCgmr/G1A9WLx7kxgWjgvGn/utP6fbNDWNPmem/G58z347MBxjz4C++hxfZK1WRuXMVcDXLtPWcY3DiMDRhMVfGSb+lQqT3shYwDbOryI/90bh0g8cePJ3nFOX03boH9bGrYVs7Jtl/gueAqLURIdKHU3FnNDj/fiNc2EM= 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=i+kRCp9e; arc=none smtp.client-ip=209.85.167.54 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="i+kRCp9e" Received: by mail-lf1-f54.google.com with SMTP id 2adb3069b0e04-5b00d1e7082so4098130e87.1 for ; Wed, 15 Jul 2026 05:51:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784119867; x=1784724667; 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=0LIa5iHpmMsuZVmHeWYom4Y+VxWHnjdmh8WpgFjA5KE=; b=i+kRCp9ep3TG4e1JUspNcaUjvpxbsGwt8fUMMTnvYKZHAKZoKqKk3fLSyeFAX2f5Ri 9EQ6E+TYJiZj3PUa6UveWfLlZoraVz4q5L7jrbZszo234EoH+N7TvYbf1nyAqGKor+/1 g/EwzHxlqZ1r+ILsgun0TEp1FfwYyHUJB2XzCqfxDz8AvZzplWpk4QmwfFkysCXRyXK7 TcG8aRJozGPfDigzwp5oGzkKV1slq2Mf311fBqcBLoTfpI+P2r68GXDnVyYGCyB3zK4j rHKWbCuHVGgLHu9g5TAOsAfJG50BR0J41DLg/xYMrOzlIJB/YACSsVg9UrNx4+nLtxlp KobA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784119867; x=1784724667; 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=0LIa5iHpmMsuZVmHeWYom4Y+VxWHnjdmh8WpgFjA5KE=; b=KwEor9aYaRj1vaU+j8JrOJMQEB+fJYsxuct7WAjvAiS9UctIqddpoFGWvKUfQlsfRe eG7M+QQ+meNK/Dm2euMz4P8XpqN31ZsIz6M25G5uXwY0ALfB4SD+RlQq5ob5vE00EvSi 0VyCb8yjve63nvV23aB099ygrBRChMQJPma7eFnOuYJU3yncLzQdldtOkSd5T1Fi2kky joYFNoM5dpE4M1Ff+9ymuEUk/SbuU/PFcx+OowYnSxKD9/wLNSBY0JqpGd8o79YoYsIY ULPmFiz6sAlyQYOKHhlTjDaHCbceTVrWGEW9gMGDQbPUQYityJgqbMtoHZNva6Oq2Hsy 1aGg== X-Forwarded-Encrypted: i=1; AHgh+RopbYPV5iTMAPnpuR7/ozue/roeAQciYz1KzJcTLnAHyXEUmtu72Ebs1pYj8N1Bo0Hh9r/UMcTsF96hxXE=@vger.kernel.org X-Gm-Message-State: AOJu0YzAMZJZ8+4JmbT51YUXCVmJrbz93oKSLzmyVSmgW9Zyuq7v9DLV GYC6aw1o9z6aZtrTmdJLkGczCJFczunyfZCQA/NQPY+rnJwrc3x661w1NwCc+XoFIKY= X-Gm-Gg: AfdE7clIn0eLvk43p9RoAr8Lx1SJtlsnU5F+C2CxNUkxm14rBNoQhqfmxN+ZecoI6BI +Znt6vhyqAa5aKibtXskAJziH4pL9sGUW7WEes7tm7e5vIiAWROcEqkY6hN6EHOKyLLtwGWySgT Kf3m5UXkCIjvE5cjP90a+pVWNLkg7hjzD5kdp0rRm89CHUDwtFB5JDosQPd3WMXjN4Jv3gmh8mN ukT2rp4OdV2xxixQeqqehig6ZxGJz4G7spVXGoBgeWtkX2CBmuZg+isI2czBwlEyc5ztk8vH1zn Tk0qn7DmUkRY4QqFR/S6wjVzi3NtONPQLLMi+vAN22W624GKmSsCgZO3HoFQgrUg66FCLA+0qZr XR3JCZOYzw3ly2LodFleMLffRV29N+oVsqxDs4QI3Y10Zmz7NK80r2at+f1qojIjpchESyfLNDr 2SvX+GYYWpLtRstBaQhkchnXCG0vjrXzLlI4H4CbYNuWVjNBaomXnsoJiUvQ2h5sGHcAlvmxR/M X78UtWKHrKo1A== X-Received: by 2002:a05:6512:12ce:b0:5b0:17c9:a4f3 with SMTP id 2adb3069b0e04-5b159b8fd2fmr1512716e87.60.1784119866632; Wed, 15 Jul 2026 05:51:06 -0700 (PDT) Received: from archlinux ([94.180.44.28]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b022fac999sm3404042e87.55.2026.07.15.05.51.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2026 05:51:06 -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 60/61] staging: rtl8723bs: inline recv private data freeing helper Date: Wed, 15 Jul 2026 19:48:28 +0700 Message-ID: <20260715124829.90290-61-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: quoted-printable Content-Type: text/plain; charset="utf-8" Inline the receive private data freeing logic directly into rtw_hal_free_recv_priv. This eliminates a redundant redirection layer for killing the recv tasklet, dropping pending skbs, and freeing allocated memory buffers during teardown. Signed-off-by: Arsenii Pashchenko --- .../staging/rtl8723bs/hal/HalBtc8723b2Ant.c | 2 +- .../staging/rtl8723bs/hal/HalBtc8723b2Ant.h | 1 + drivers/staging/rtl8723bs/hal/hal_intf.c | 50 ++++++++++++++++++- drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 30 ----------- .../staging/rtl8723bs/hal/rtl8723bs_recv.c | 35 ------------- .../staging/rtl8723bs/include/rtl8723b_cmd.h | 1 - .../staging/rtl8723bs/include/rtl8723b_recv.h | 1 - 7 files changed, 50 insertions(+), 70 deletions(-) diff --git a/drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c b/drivers/stag= ing/rtl8723bs/hal/HalBtc8723b2Ant.c index efb0ffd54..bb3ebfe74 100644 --- a/drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c +++ b/drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c @@ -1031,7 +1031,7 @@ static void halbtc8723b2ant_CoexAllOff(struct btc_coe= xist *pBtCoexist) halbtc8723b2ant_CoexTableWithType(pBtCoexist, NORMAL_EXEC, 0); } =20 -static void halbtc8723b2ant_InitCoexDm(struct btc_coexist *pBtCoexist) +void halbtc8723b2ant_InitCoexDm(struct btc_coexist *pBtCoexist) { /* force to reset coex mechanism */ =20 diff --git a/drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.h b/drivers/stag= ing/rtl8723bs/hal/HalBtc8723b2Ant.h index 4043e4e4d..bdb7720a1 100644 --- a/drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.h +++ b/drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.h @@ -144,3 +144,4 @@ void EXhalbtc8723b2ant_PnpNotify(struct btc_coexist *pB= tCoexist, u8 pnpState); void EXhalbtc8723b2ant_Periodical(struct btc_coexist *pBtCoexist); =20 void halbtc8723b2ant_InitHwConfig(struct btc_coexist *pBtCoexist); +void halbtc8723b2ant_InitCoexDm(struct btc_coexist *pBtCoexist); diff --git a/drivers/staging/rtl8723bs/hal/hal_intf.c b/drivers/staging/rtl= 8723bs/hal/hal_intf.c index 3244f121d..9c471d176 100644 --- a/drivers/staging/rtl8723bs/hal/hal_intf.c +++ b/drivers/staging/rtl8723bs/hal/hal_intf.c @@ -405,7 +405,30 @@ s32 rtw_hal_init_recv_priv(struct adapter *padapter) =20 void rtw_hal_free_recv_priv(struct adapter *padapter) { - rtl8723bs_free_recv_priv(padapter); + u32 i; + struct recv_priv *precvpriv; + struct recv_buf *precvbuf; + + precvpriv =3D &padapter->recvpriv; + + /* 3 1. kill tasklet */ + tasklet_kill(&precvpriv->recv_tasklet); + + /* 3 2. free all recv buffers */ + precvbuf =3D (struct recv_buf *)precvpriv->precv_buf; + if (precvbuf) { + precvpriv->free_recv_buf_queue_cnt =3D 0; + for (i =3D 0; i < NR_RECVBUFF; i++) { + list_del_init(&precvbuf->list); + if (precvbuf->pskb) + dev_kfree_skb_any(precvbuf->pskb); + precvbuf++; + } + precvpriv->precv_buf =3D NULL; + } + + kfree(precvpriv->pallocated_recv_buf); + precvpriv->pallocated_recv_buf =3D NULL; } =20 void rtw_hal_update_ra_mask(struct sta_info *psta, u8 rssi_level) @@ -427,9 +450,32 @@ void rtw_hal_update_ra_mask(struct sta_info *psta, u8 = rssi_level) } } =20 +/* arg[0] =3D macid */ +/* arg[1] =3D raid */ +/* arg[2] =3D shortGIrate */ +/* arg[3] =3D init_rate */ void rtw_hal_add_ra_tid(struct adapter *padapter, u32 bitmap, u8 *arg, u8 = rssi_level) { - rtl8723b_Add_RateATid(padapter, bitmap, arg, rssi_level); + struct hal_com_data *pHalData =3D GET_HAL_DATA(padapter); + struct mlme_ext_priv *pmlmeext =3D &padapter->mlmeextpriv; + struct mlme_ext_info *pmlmeinfo =3D &(pmlmeext->mlmext_info); + struct sta_info *psta; + u8 mac_id =3D arg[0]; + u8 raid =3D arg[1]; + u8 shortGI =3D arg[2]; + u8 bw; + u32 mask =3D bitmap&0x0FFFFFFF; + + psta =3D pmlmeinfo->FW_sta_info[mac_id].psta; + if (!psta) + return; + + bw =3D psta->bw_mode; + + if (rssi_level !=3D DM_RATR_STA_INIT) + mask =3D ODM_Get_Rate_Bitmap(&pHalData->odmpriv, mac_id, mask, rssi_leve= l); + + rtl8723b_set_FwMacIdConfig_cmd(padapter, mac_id, raid, bw, shortGI, mask); } =20 u32 rtw_hal_read_bbreg(struct adapter *padapter, u32 RegAddr, u32 BitMask) diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c b/drivers/staging= /rtl8723bs/hal/rtl8723b_cmd.c index 826a20529..593354e41 100644 --- a/drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c +++ b/drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c @@ -697,38 +697,8 @@ void rtl8723b_set_FwJoinBssRpt_cmd(struct adapter *pad= apter, u8 mstatus) rtl8723b_download_rsvd_page(padapter, RT_MEDIA_CONNECT); } =20 -/* arg[0] =3D macid */ -/* arg[1] =3D raid */ -/* arg[2] =3D shortGIrate */ -/* arg[3] =3D init_rate */ -void rtl8723b_Add_RateATid( - struct adapter *padapter, - u32 bitmap, - u8 *arg, - u8 rssi_level -) -{ - struct hal_com_data *pHalData =3D GET_HAL_DATA(padapter); - struct mlme_ext_priv *pmlmeext =3D &padapter->mlmeextpriv; - struct mlme_ext_info *pmlmeinfo =3D &(pmlmeext->mlmext_info); - struct sta_info *psta; - u8 mac_id =3D arg[0]; - u8 raid =3D arg[1]; - u8 shortGI =3D arg[2]; - u8 bw; - u32 mask =3D bitmap&0x0FFFFFFF; - - psta =3D pmlmeinfo->FW_sta_info[mac_id].psta; - if (!psta) - return; =20 - bw =3D psta->bw_mode; =20 - if (rssi_level !=3D DM_RATR_STA_INIT) - mask =3D ODM_Get_Rate_Bitmap(&pHalData->odmpriv, mac_id, mask, rssi_leve= l); - - rtl8723b_set_FwMacIdConfig_cmd(padapter, mac_id, raid, bw, shortGI, mask); -} =20 static void ConstructBtNullFunctionData( struct adapter *padapter, diff --git a/drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c b/drivers/stagi= ng/rtl8723bs/hal/rtl8723bs_recv.c index 384c5e643..f9aab253f 100644 --- a/drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c +++ b/drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c @@ -356,38 +356,3 @@ void rtl8723bs_recv_tasklet(struct tasklet_struct *t) rtw_enqueue_recvbuf(precvbuf, &precvpriv->free_recv_buf_queue); } while (1); } - - -/* - * Free recv private variable of hardware dependent - * 1. recv buf - * 2. recv tasklet - * - */ -void rtl8723bs_free_recv_priv(struct adapter *padapter) -{ - u32 i; - struct recv_priv *precvpriv; - struct recv_buf *precvbuf; - - precvpriv =3D &padapter->recvpriv; - - /* 3 1. kill tasklet */ - tasklet_kill(&precvpriv->recv_tasklet); - - /* 3 2. free all recv buffers */ - precvbuf =3D (struct recv_buf *)precvpriv->precv_buf; - if (precvbuf) { - precvpriv->free_recv_buf_queue_cnt =3D 0; - for (i =3D 0; i < NR_RECVBUFF; i++) { - list_del_init(&precvbuf->list); - if (precvbuf->pskb) - dev_kfree_skb_any(precvbuf->pskb); - precvbuf++; - } - precvpriv->precv_buf =3D NULL; - } - - kfree(precvpriv->pallocated_recv_buf); - precvpriv->pallocated_recv_buf =3D NULL; -} diff --git a/drivers/staging/rtl8723bs/include/rtl8723b_cmd.h b/drivers/sta= ging/rtl8723bs/include/rtl8723b_cmd.h index 6b2d79e19..df62991c9 100644 --- a/drivers/staging/rtl8723bs/include/rtl8723b_cmd.h +++ b/drivers/staging/rtl8723bs/include/rtl8723b_cmd.h @@ -166,7 +166,6 @@ enum { void rtl8723b_set_FwPwrMode_cmd(struct adapter *padapter, u8 Mode); void rtl8723b_set_FwJoinBssRpt_cmd(struct adapter *padapter, u8 mstatus); void rtl8723b_set_rssi_cmd(struct adapter *padapter, u8 *param); -void rtl8723b_Add_RateATid(struct adapter *padapter, u32 bitmap, u8 *arg, = u8 rssi_level); void rtl8723b_fw_try_ap_cmd(struct adapter *padapter, u32 need_ack); /* s32 rtl8723b_set_lowpwr_lps_cmd(struct adapter *padapter, u8 enable); */ void rtl8723b_set_FwPsTuneParam_cmd(struct adapter *padapter); diff --git a/drivers/staging/rtl8723bs/include/rtl8723b_recv.h b/drivers/st= aging/rtl8723bs/include/rtl8723b_recv.h index c4c91f5f4..2fc530494 100644 --- a/drivers/staging/rtl8723bs/include/rtl8723b_recv.h +++ b/drivers/staging/rtl8723bs/include/rtl8723b_recv.h @@ -82,7 +82,6 @@ struct rxreport_8723b { }; =20 =20 -void rtl8723bs_free_recv_priv(struct adapter *padapter); =20 void rtl8723b_query_rx_phy_status(union recv_frame *prframe, struct phy_st= at *pphy_stat); void rtl8723b_process_phy_info(struct adapter *padapter, void *prframe); --=20 2.55.0 From nobody Sat Jul 25 17:33:43 2026 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 0152447DFB0 for ; Wed, 15 Jul 2026 12:51:12 +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=1784119878; cv=none; b=eUMvBBA4hgUpARqjVIJsYrsHO+jv/zFZdwDHsRhe53kDwEGBq0353/KcPbdqeyRqifOa/D7bMrQ15+/LGf7fEMrw+0tTM9V80nB04YEWT+NX67zHsbCy/aVOafCssMXgJ0zD9iw+HYOOlJVfX/40HeDUIJZtm2i7PyLbFFRVIN8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119878; c=relaxed/simple; bh=4UMnNqvjYlYoBVL98iCDufghaVBXrJyxQ7ZYTuAFCco=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VM3VkEv7Y8tArIjZt+kV0a4lY16tqBMu5rCC9wns7yrMOIMOSyarfZZ0a0n9+82tV1XTaid1X9jUPSujRqnKt3Q5T1eYT8soKoSQd/oN3CAm+AYgNahiOZweEBgHaioRTah/VE6F+c93bj8L0CB7ktaqE4Z4N1Q5TDWbeMG/uv4= 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=eJ7p8ylD; 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="eJ7p8ylD" Received: by mail-lf1-f43.google.com with SMTP id 2adb3069b0e04-5b15dcaca31so762350e87.0 for ; Wed, 15 Jul 2026 05:51:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784119867; x=1784724667; 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=/4u9zgrmxiREjYwS8Qv0Serfz7FqeIq0lu9hAYsQr4Q=; b=eJ7p8ylDUugsV9YNo6iWdzOQq4VXn5Upo35twKkP/Le/tCpF+b2oqQKylFupUOJul6 RZNGkrWoZmF2Ry+rDmGq+LzP6ty7xnJuMN4LiGrTnHsRTrF/W+E1vbupRVCfd2O8JdzI 8BCc72aT/39MF5BgdaENmnBKQkM9H4pTpa9Q18qLHQXN0RasjzNPZiU8sh0Rs/jhp2B3 s94Y0E4d1+Pj/V66HESx/RioQpu6yMID1n8//X3XWIljLFPKi0SXj+g0MUiupgP2ykFb BiXaeCirRgfgXY0CuLrm6BHpMO171BQuOLAjJ9nyd9/4s4tZz1uvl7ui1hrpDCjluZnS Rt4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784119867; x=1784724667; 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=/4u9zgrmxiREjYwS8Qv0Serfz7FqeIq0lu9hAYsQr4Q=; b=TJTdnYtROcEemJEv4CS6+lhHQtzOGEqcyBYbfaW1wFWijy8agHZHanxuxm3bZjrhUi cUq92MN34BpHxg8woP545JBNCLZYQH+QFmFdL4UD/lnU/Jjskl4g7vfd2eFISv6TVVb3 V0Zk6POiW3ygOQBVhEAFoXwnaIIDWdTEJzyiUJALi1m4No9K8wCEd7CEVFhCA7FsozIK E5L5aH44zt4mr1D2SIhhWY5onJPlbaDVSDZdvC9sma7NsU2LiQQQLXEOK27jkb6i563I R0a6QWYkASNwZwH9GF+tSUIea7xaB1hi01hir2GRMpX2SqqT1PwswWYrSzREFwLmhsUF y56w== X-Forwarded-Encrypted: i=1; AHgh+RrUWsKrSdbCRIt5v5z2lc4oisiu2YiPa9+dDPxmVqJ1DoEWV5S5agg3ZN/9UN4RvbkCFyEUsfJh5eIlebs=@vger.kernel.org X-Gm-Message-State: AOJu0YzLw36bEGdX/d8YFMulOU5oYJFjAnnUniReX/Xl2J0Q+lUeo8/E TzgwOXTFNrl3upSI6cFetAIVuz6shLW9m62CpfbLMca17pQSqaTvQJJ3r/jm/eE6ChM= X-Gm-Gg: AfdE7cl9p4CqCcbt6bp5J7Mc/diwS20pk/tmtnzvxiqjiJF50tj/aKYSYxqCJyBRUpR vKLBl37mQnBsO+wFwIJC3YTCom7Dv+WB5tUkNVWAjkOVdRXE+QilJSXEcUu5DbdcK3FA1dQnP+Q Cfhjjg3SLdfvxQMlZ/AkyKN0vbR1F1kYAYuP+6KrBTuje4m5hsqQlNFCNJ1ob0Aj+YfXA6oiJ++ +jESe9VZWedlHCnZl2kZnxID+MP4TRe/F4QhS8HAVeWZsBdgxj/alBicAv5+Z5qbKRx4DLERS5W yRDUbu5y3sOmmdIY6gvThsfVrX556e4qeyz3ocsJKGOD8W+tpNmll+TpNMxj+WGn5ua1KEMg0Sb mPDylCAFv/IvKuLmOEKpJrRHe1POa/AFVgKymyGygvTxucDkKd86GjqBiMrITb3GJCP1Qj3Wf8P 9h7wCvzUwGg2YwFdbZc6cHys1QNhHsMAWFgqsuj1yKdeATjSi7StjpuF0OX6LaXxQxZv2ZWGIgB 7ECZqVKvJACZA== X-Received: by 2002:a05:6512:3e03:b0:5b1:5061:e5d2 with SMTP id 2adb3069b0e04-5b159b86efdmr1520546e87.30.1784119867382; Wed, 15 Jul 2026 05:51:07 -0700 (PDT) Received: from archlinux ([94.180.44.28]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b022fac999sm3404042e87.55.2026.07.15.05.51.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2026 05:51:07 -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 61/61] staging: rtl8723bs: fix tx power limit lookup by using correct channel index Date: Wed, 15 Jul 2026 19:48:29 +0700 Message-ID: <20260715124829.90290-62-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: quoted-printable Content-Type: text/plain; charset="utf-8" In phy_get_tx_pwr_lmt(), the result of phy_GetChannelIndexOfTxPowerLimit() is erroneously assigned back to the input parameter 'channel'. Since 'channel' is never used again afterward, this triggers a -Wunused-but-set-parameter compiler warning. Furthermore, the actual index variable 'idx_channel' remains initialized to -1, causing the function to always fail the subsequent validation check and prematurely return MAX_POWER_INDEX. Fix this by assigning the computed channel index directly to 'idx_channel'. This resolves the compiler warning and restores the intended hardware tx power limit lookup logic. Signed-off-by: Arsenii Pashchenko --- drivers/staging/rtl8723bs/hal/hal_com_phycfg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c b/drivers/stagi= ng/rtl8723bs/hal/hal_com_phycfg.c index 7ad04aa85..bbaedf256 100644 --- a/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c +++ b/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c @@ -718,7 +718,7 @@ s8 phy_get_tx_pwr_lmt(struct adapter *adapter, u32 reg_= pwr_tbl_sel, if (idx_rate_sctn =3D=3D 0 || idx_rate_sctn =3D=3D 1) idx_bandwidth =3D 0; =20 - channel--; + idx_channel--; =20 if (idx_regulation =3D=3D -1 || idx_bandwidth =3D=3D -1 || idx_rate_sctn =3D=3D -1 || idx_channel =3D=3D -1) --=20 2.55.0