From mboxrd@z Thu Jan 1 00:00:00 1970 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: 8bit 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/rtl8723bs/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; } -void SetHalODMVar( - struct adapter *Adapter, - enum hal_odm_variable eVariable, - void *pValue1, - bool bSet -) -{ - struct hal_com_data *pHalData = GET_HAL_DATA(Adapter); - struct dm_odm_t *podmpriv = &pHalData->odmpriv; - /* _irqL irqL; */ - switch (eVariable) { - case HAL_ODM_STA_INFO: - { - struct sta_info *psta = 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; - } -} bool GetU1ByteIntegerFromStringInDecimal(char *Str, u8 *pInt) { diff --git a/drivers/staging/rtl8723bs/hal/hal_intf.c b/drivers/staging/rtl8723bs/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 void rtw_hal_set_odm_var(struct adapter *padapter, enum hal_odm_variable eVariable, void *pValue1, bool bSet) { - SetHalODMVar(padapter, eVariable, pValue1, bSet); + struct hal_com_data *pHalData = GET_HAL_DATA(padapter); + struct dm_odm_t *podmpriv = &pHalData->odmpriv; + /* _irqL irqL; */ + switch (eVariable) { + case HAL_ODM_STA_INFO: + { + struct sta_info *psta = 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; + }; } 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); void rtw_bb_rf_gain_offset(struct adapter *padapter); -void SetHalODMVar( - struct adapter *Adapter, - enum hal_odm_variable eVariable, - void *pValue1, - bool bSet); #endif /* __HAL_COMMON_H__ */ -- 2.55.0