From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) (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 8B6D418027 for ; Fri, 19 Jun 2026 19:15:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.68 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781896518; cv=none; b=u5k7fl5MtkNSeiAY1VO6fkCTpcsRG17MEAXLI9jna239gPHSpPgFImsoi2FdRgYJCD3VLbEgrpWTTuJBRls0pRS7VQlMnhUJFwyEXHouppy9tI9rEABPStnuFQoh9/fJW4nAuO82HaPHzK6aRd53c1jsIhm/DI6xR5pH6cyrOzA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781896518; c=relaxed/simple; bh=fvSqkxxprQMrTOpMLxZt/z0GwqfIf7SI3KtJLVG93n0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gNXS18rsrDTVmDpq6C1aDIA43QYTQLkb22ob2PrkKg3abIrjfS9RstML2w5w1NKNkYjMoeISdQIhNlIby5mnGlPJSTyj8ykIML5XnYzhaBEWifcr0FeqRgFXWaJkCSKenVwKZNtwdYPyYzfCWDsk+5SiH+LQZ30Y09+1iAP3OmY= 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=XU5wg15y; arc=none smtp.client-ip=209.85.128.68 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="XU5wg15y" Received: by mail-wm1-f68.google.com with SMTP id 5b1f17b1804b1-490bb83a3f6so16357385e9.0 for ; Fri, 19 Jun 2026 12:15:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781896515; x=1782501315; 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; bh=waGPckFghLqiW6DdlxbVrpHRiV1SlAdaWjaMF78OucA=; b=XU5wg15yOTrXnO8ci4i9uRwK7gykSPGP7yLgw+0YtPtpHwBlLSgp8Q9HY+5Jp9P5Jo TI6ryQW6cVx+r8/UiiN9Ier30iAlwlVYrAA/CyPmReFs/hi+6+WZRIFyrUndmGXjeEWb H25IKM3ScJ21dOYdcvUNJn71vDGbgyBsC+f6oQb4YALk16R0I5DgSAKHyl4c1lOP9rM7 7Eow+mj8o2KUKZg2H7tcgVghlbkfyWyU63G/hRxbDJ11tlhcRKm/kz4Cy7kT4NXbSukE enr1NpkVCS3QTDf2uiZx5fAQ6yzz0I2OWacBUXYF6wmqGYLkzxRBNl+5MwYcbzL7q6Xw eO5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781896515; x=1782501315; 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; bh=waGPckFghLqiW6DdlxbVrpHRiV1SlAdaWjaMF78OucA=; b=TjXVjO4VImoAiuY851Xyn0J8gD8BkOKKXdZ8j/8sVg82gTUU74bJCutMFPIzSwr0kU aNk7DPujskkNf4Ymy7WWJSyiIzS5SvRc5xJzEVn5KToUv1T/yqxmiaQYnurJ+XAh7+3l xGHMzyOhUXCkehRBrSUuhfZzNPPOZcc1mZehjzNc2cZsBcRLUEmbOQj7Cwg7dMM7PGvD 62zTYPj1MTmtTW1U0hLeI4iGOQEPXyOVRS7aThCktN8MIXhWMZvEQFZ7E8EjTeN/bkgG pdG+AJdUfEW1HUezvk5L0Qlbwvk/wNg6hYJuEXf4TnPiZcbhIEI251b8FwqXLf7dWfMM 0YMg== X-Forwarded-Encrypted: i=1; AFNElJ8LswDOZQnB035xaRpp2o54uKlFzMxbG6LUAlALWuSB2oSdxycNzY0TgIhuSam4wrpfxQeNpb+OfTAzEyQ=@vger.kernel.org X-Gm-Message-State: AOJu0YzqOCpBqIm70yTxNcuZmu36aLiFPM1/h4wK7/+aLr8n/unl3Fwe dxcMvgCe6xSXCvqUyeDhwMNl/YV5uyK08+zakDUBPurJ0I+4PYl7HhuF X-Gm-Gg: AfdE7cnyZq1iA+0utKS/g6fR9dBBbsGC9mByrvleHLy6ZQii3k5E2qfUl0VyOfv+iDJ tJ5muI9ul+vVDze03ep1fndnSIeZtg0dT12o1iwCp1rAnTvjrlfPyT7dQ49fakNEmYqxwECOOQ1 Ra/RzjCLsTgmdw6Ulu+j0pkh2L7qOiQADdnqH8YMS+kXZSo1MWpwC2IK6KY1G93IjvLhEziD4n/ +AiQPa1sXmsbTHFSIpta4sLFNQ6Fm40rCtdk0YX+48p46DymQgex0DfPSIn80Q4xH9WqIiJpe61 VVWVZnIjCFryIj3GWp8aDnynR9sbsBBGdWDGottNo2JYGaZG70ShZvGSGRBIyL5tUZJTxvhIWbi 30C7kG6zyWamKtUfZVPz5MpC41g7KujU8tmB6nyCO/fFeHjWhSUIx+Y8zMIklQ9E7WEb1zsw= X-Received: by 2002:a05:600c:4694:b0:492:4717:59fb with SMTP id 5b1f17b1804b1-492490a77a4mr8219515e9.17.1781896515022; Fri, 19 Jun 2026 12:15:15 -0700 (PDT) Received: from fedora ([212.253.214.17]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-46666c57a0esm1109034f8f.27.2026.06.19.12.15.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Jun 2026 12:15:14 -0700 (PDT) From: Serhat Kumral To: gregkh@linuxfoundation.org Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Serhat Kumral Subject: [PATCH 2/2] staging: rtl8723bs: rename ScanType to scan_type Date: Tue, 16 Jun 2026 03:01:17 +0300 Message-ID: <20260616000117.126504-2-serhatkumral1@gmail.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260616000117.126504-1-serhatkumral1@gmail.com> References: <20260616000117.126504-1-serhatkumral1@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 Rename the CamelCase field ScanType of struct rt_channel_info, as well as the relevant local variables, to scan_type to conform to the Linux kernel coding style guidelines. This also fixes several checkpatch.pl warnings: CHECK: Avoid CamelCase: Signed-off-by: Serhat Kumral --- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 37 ++++++++++--------- .../staging/rtl8723bs/include/rtw_mlme_ext.h | 2 +- drivers/staging/rtl8723bs/os_dep/wifi_regd.c | 2 +- 3 files changed, 21 insertions(+), 20 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c index 0dcac7638..655e1e72b 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c @@ -346,18 +346,18 @@ static u8 init_channel_set(struct adapter *padapter, u8 ChannelPlan, struct rt_c (ChannelPlan == RT_CHANNEL_DOMAIN_GLOBAL_NULL)) { if (channel_set[chanset_size].channel_num >= 1 && channel_set[chanset_size].channel_num <= 11) - channel_set[chanset_size].ScanType = SCAN_ACTIVE; + channel_set[chanset_size].scan_type = SCAN_ACTIVE; else if (channel_set[chanset_size].channel_num >= 12 && channel_set[chanset_size].channel_num <= 14) - channel_set[chanset_size].ScanType = SCAN_PASSIVE; + channel_set[chanset_size].scan_type = SCAN_PASSIVE; } else if (ChannelPlan == RT_CHANNEL_DOMAIN_WORLD_WIDE_13 || Index2G == RT_CHANNEL_DOMAIN_2G_WORLD) { /* channel 12~13, passive scan */ if (channel_set[chanset_size].channel_num <= 11) - channel_set[chanset_size].ScanType = SCAN_ACTIVE; + channel_set[chanset_size].scan_type = SCAN_ACTIVE; else - channel_set[chanset_size].ScanType = SCAN_PASSIVE; + channel_set[chanset_size].scan_type = SCAN_PASSIVE; } else - channel_set[chanset_size].ScanType = SCAN_ACTIVE; + channel_set[chanset_size].scan_type = SCAN_ACTIVE; chanset_size++; } @@ -3689,7 +3689,7 @@ unsigned int send_beacon(struct adapter *padapter) void site_survey(struct adapter *padapter) { unsigned char survey_channel = 0, val8; - enum rt_scan_type ScanType = SCAN_PASSIVE; + enum rt_scan_type scan_type = SCAN_PASSIVE; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; u32 initialgain = 0; @@ -3701,7 +3701,8 @@ void site_survey(struct adapter *padapter) if (pmlmeext->sitesurvey_res.channel_idx < pmlmeext->sitesurvey_res.ch_num) { ch = &pmlmeext->sitesurvey_res.ch[pmlmeext->sitesurvey_res.channel_idx]; survey_channel = ch->hw_value; - ScanType = (ch->flags & RTW_IEEE80211_CHAN_PASSIVE_SCAN) ? SCAN_PASSIVE : SCAN_ACTIVE; + scan_type = (ch->flags & RTW_IEEE80211_CHAN_PASSIVE_SCAN) ? + SCAN_PASSIVE : SCAN_ACTIVE; } } @@ -3712,7 +3713,7 @@ void site_survey(struct adapter *padapter) else r8723bs_select_channel(padapter, survey_channel); - if (ScanType == SCAN_ACTIVE) { /* obey the channel plan setting... */ + if (scan_type == SCAN_ACTIVE) { /* obey the channel plan setting... */ { int i; @@ -4185,18 +4186,18 @@ static void process_80211d(struct adapter *padapter, struct wlan_bssid_ex *bssid if (chplan_sta[i].channel_num == chplan_ap.Channel[j]) { chplan_new[k].channel_num = chplan_ap.Channel[j]; - chplan_new[k].ScanType = SCAN_ACTIVE; + chplan_new[k].scan_type = SCAN_ACTIVE; i++; j++; k++; } else if (chplan_sta[i].channel_num < chplan_ap.Channel[j]) { chplan_new[k].channel_num = chplan_sta[i].channel_num; - chplan_new[k].ScanType = SCAN_PASSIVE; + chplan_new[k].scan_type = SCAN_PASSIVE; i++; k++; } else if (chplan_sta[i].channel_num > chplan_ap.Channel[j]) { chplan_new[k].channel_num = chplan_ap.Channel[j]; - chplan_new[k].ScanType = SCAN_ACTIVE; + chplan_new[k].scan_type = SCAN_ACTIVE; j++; k++; } @@ -4207,7 +4208,7 @@ static void process_80211d(struct adapter *padapter, struct wlan_bssid_ex *bssid (chplan_sta[i].channel_num != 0) && (chplan_sta[i].channel_num <= 14)) { chplan_new[k].channel_num = chplan_sta[i].channel_num; - chplan_new[k].ScanType = SCAN_PASSIVE; + chplan_new[k].scan_type = SCAN_PASSIVE; i++; k++; } @@ -4215,7 +4216,7 @@ static void process_80211d(struct adapter *padapter, struct wlan_bssid_ex *bssid /* add channel AP supported */ while ((j < chplan_ap.Len) && (chplan_ap.Channel[j] <= 14)) { chplan_new[k].channel_num = chplan_ap.Channel[j]; - chplan_new[k].ScanType = SCAN_ACTIVE; + chplan_new[k].scan_type = SCAN_ACTIVE; j++; k++; } @@ -4225,7 +4226,7 @@ static void process_80211d(struct adapter *padapter, struct wlan_bssid_ex *bssid (chplan_sta[i].channel_num != 0) && (chplan_sta[i].channel_num <= 14)) { chplan_new[k].channel_num = chplan_sta[i].channel_num; - chplan_new[k].ScanType = chplan_sta[i].ScanType; + chplan_new[k].scan_type = chplan_sta[i].scan_type; i++; k++; } @@ -4244,8 +4245,8 @@ static void process_80211d(struct adapter *padapter, struct wlan_bssid_ex *bssid i = 0; while ((i < MAX_CHANNEL_NUM) && (chplan_new[i].channel_num != 0)) { if (chplan_new[i].channel_num == channel) { - if (chplan_new[i].ScanType == SCAN_PASSIVE) - chplan_new[i].ScanType = SCAN_ACTIVE; + if (chplan_new[i].scan_type == SCAN_PASSIVE) + chplan_new[i].scan_type = SCAN_ACTIVE; break; } i++; @@ -5315,7 +5316,7 @@ static int rtw_scan_ch_decision(struct adapter *padapter, struct rtw_ieee80211_c memcpy(&out[j], &in[i], sizeof(struct rtw_ieee80211_channel)); - if (pmlmeext->channel_set[set_idx].ScanType == SCAN_PASSIVE) + if (pmlmeext->channel_set[set_idx].scan_type == SCAN_PASSIVE) out[j].flags |= RTW_IEEE80211_CHAN_PASSIVE_SCAN; j++; @@ -5337,7 +5338,7 @@ static int rtw_scan_ch_decision(struct adapter *padapter, struct rtw_ieee80211_c out[j].hw_value = pmlmeext->channel_set[i].channel_num; - if (pmlmeext->channel_set[i].ScanType == SCAN_PASSIVE) + if (pmlmeext->channel_set[i].scan_type == SCAN_PASSIVE) out[j].flags |= RTW_IEEE80211_CHAN_PASSIVE_SCAN; j++; diff --git a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h b/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h index a2e0596ae..786dc8055 100644 --- a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h +++ b/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h @@ -323,7 +323,7 @@ struct mlme_ext_info { /* The channel information about this channel including joining, scanning, and power constraints. */ struct rt_channel_info { u8 channel_num; /* The channel number. */ - enum rt_scan_type ScanType; /* Scan type such as passive or active scan. */ + enum rt_scan_type scan_type; /* Scan type such as passive or active scan. */ }; int rtw_ch_set_search_ch(struct rt_channel_info *ch_set, const u32 ch); diff --git a/drivers/staging/rtl8723bs/os_dep/wifi_regd.c b/drivers/staging/rtl8723bs/os_dep/wifi_regd.c index ff2072eb3..d201a18d7 100644 --- a/drivers/staging/rtl8723bs/os_dep/wifi_regd.c +++ b/drivers/staging/rtl8723bs/os_dep/wifi_regd.c @@ -74,7 +74,7 @@ static void _rtw_reg_apply_flags(struct wiphy *wiphy) freq = rtw_ieee80211_channel_to_frequency(channel); ch = ieee80211_get_channel(wiphy, freq); if (ch) { - if (channel_set[i].ScanType == SCAN_PASSIVE) + if (channel_set[i].scan_type == SCAN_PASSIVE) ch->flags = IEEE80211_CHAN_NO_IR; else ch->flags = 0; -- 2.54.0