From mboxrd@z Thu Jan 1 00:00:00 1970 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: 8bit 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/staging/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 = WIRELESS_11B; else wireless_mode = WIRELESS_11G; - pattrib->raid = rtw_get_mgntframe_raid(padapter, wireless_mode); + pattrib->raid = (wireless_mode & WIRELESS_11B) ? RATEID_IDX_B : RATEID_IDX_G; pattrib->rate = pmlmeext->tx_rate; pattrib->encrypt = _NO_PRIVACY_; diff --git a/drivers/staging/rtl8723bs/hal/hal_com.c b/drivers/staging/rtl8723bs/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; } -u8 rtw_get_mgntframe_raid(struct adapter *adapter, unsigned char network_type) -{ - return (network_type & WIRELESS_11B) ? RATEID_IDX_B : RATEID_IDX_G; -} void rtw_hal_update_sta_rate_mask(struct adapter *padapter, struct sta_info *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 s32 c2h_evt_read_88xx(struct adapter *adapter, u8 *buf); -u8 rtw_get_mgntframe_raid(struct adapter *adapter, unsigned char network_type); void rtw_hal_update_sta_rate_mask(struct adapter *padapter, struct sta_info *psta); void SetHwReg(struct adapter *padapter, u8 variable, u8 *val); -- 2.55.0