From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-vk1-f173.google.com (mail-vk1-f173.google.com [209.85.221.173]) (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 B1C8830DED1 for ; Sat, 21 Mar 2026 16:02:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.173 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774108976; cv=none; b=rIzxqAm8csfosOdLFqEcCzKGSTB93ZDraMELVyEciUN6BPIpvgMZSgfJhV10uoNM968tgpnMMySUgX2RgIJsAtZwd4o4Xy59stQs2aEyzKewNESEntDEpXFL3NEvSsNY41xF5sd5NUVEndA1UtmMcg1ohTXr6hKUpS/59/WsO9o= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774108976; c=relaxed/simple; bh=szCXeduZguoIPvLL7U43b2UFIX3WZ2v/WqgYWIaT/Uk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=r/9aqoaKo9QXLkHlPjq4xdIBLWyexM4NJkxkqsQTr0x2rpW4Qf+bGyKCYUo1JWiv6mSoUhPRgeMJSM2jiUIUguPUh0D8K5GYggqHQYVFd+RUDQfnu1MHEAvxTKScmpV7ZdsXD0wEHNhQeNbDkAOMl2LOEzpBpaNlrTQZzWljDj4= 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=SmoqwITV; arc=none smtp.client-ip=209.85.221.173 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="SmoqwITV" Received: by mail-vk1-f173.google.com with SMTP id 71dfb90a1353d-56b7043c97eso578694e0c.1 for ; Sat, 21 Mar 2026 09:02:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1774108974; x=1774713774; 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=OMTJ+JZRNEFKgPlIFAlccbq6vCjPo+L0egZvGvODbWM=; b=SmoqwITVpqWym8SlGr9oQZgFbPtp/eBXvBJnQwrX38a4NnMsLmO1tz4K/y0K6ERH/c gBw/OZAy0BeLfnpEgWA6D/SGQV6cT8dG1zFgEeSaO3afy6ADr9NuuC0r8rGsANz6qivx Uv5VyCXws7kFUGU5DwE3SXfYbg79P7t+ue4fUB2XOhvATdoZCyOIXrUh16wrPaRx0vhw aYoBMuDPcxICIKmCOHcbzYI0UlcSeVf0uTt5eeho1kvH1bDcXdQ5FfstfoZG6eAKRYzp ChvdHZLSCfDqmpY55G8BIYvNdaOAqpAI49K+qJ3Yzv/G6ulPdkfpHkgRv6P66AJplH8X ji8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774108974; x=1774713774; 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=OMTJ+JZRNEFKgPlIFAlccbq6vCjPo+L0egZvGvODbWM=; b=qB7Z5D5dWypG7XmnCbWgzg1okwKwS1EmzNJlfRzkPlkYkbfZKJVt/Ooz9LyFnUYN99 MLzDc9XllIg5exVToJmhsnx3daL4RP4pVzEtFe4mnIMM0EFP58qdoqbvti8m/Nv7Ljbo M3VhSVdcFfrB08ZbPilNP4M8kJ6HyPKlK1SuPMvq3RmKKmw4C/mfJhQ/JgFshy/4zqaA nmzRxthqF1xjAv1/iqMPv5JhD37A3Hs393GNlcx/ghi1VxbzRYZYvQZ4vN/0J66QDEem REcbQmclg3gX5mPvt0413kczeih0O7hv1NtJyjDN2LcCE6Fg75BAm8mWg1KOM1g0lqO9 tMow== X-Forwarded-Encrypted: i=1; AJvYcCUjPdetwtoLJLis9MsdV4WUfT/MZp/kuOBl6Dc7nSBoHSypeUFEMWZy2x6k1l4XYJXKpidiYMe8ZZyQ998=@vger.kernel.org X-Gm-Message-State: AOJu0YwgINnMwM+TCi0wcm/cP9RvLLtwp3aUmNp/ymcQ6CmWs+7LcfSt ihvH8b0hmXxh5tbUE+YkvTCD2EYgok9nWmiHC06biT+qucXLIi7Gdi4QEp66ww== X-Gm-Gg: ATEYQzzWu5vbD8xhatrEe+1hyW3pZjv1Tt/vYrGiv21OmBW1CCwRnnP0Yti/XxWU3a7 aGOxmbJzIOJI5M9Gloc7Nji661a6XzDIHGn0iThsUJKY5NtyavL3rNLmfB2hSfGNICVSgyVQrnS A29ral/DyVYuDdEDbRvypftp4dmHa+Q33NxDwltRN+UB3iQxej3kxrMhJSkOoAejbq7dBi9HNL9 vDcaeELxIFJx20QEf8r4KxlpWA+GotOQB3DiC3fFOlz1Nu7+YPNVC/nM19VV9TzT182Dydogcl/ wlPMllkKFrku/7L98lX3DdJvhdws0yrpYrGfRmS7VKCOjiDmmexs7MX8y20cP5IlE9B13jhFE0D TvEU0Jq+QsNsJqzF5vAxi5U74b3TOJ8R8x/4FtbLC60s3J0YxOTyB3afrIrkXr3nah2tZavz8+r e3NZIlsF7lwYQjm6TnohiyIaoTFkOAeG0wht4HKqg4tYewPMSx X-Received: by 2002:a05:6122:e251:b0:56b:5893:d051 with SMTP id 71dfb90a1353d-56cde437244mr3257789e0c.13.1774108973624; Sat, 21 Mar 2026 09:02:53 -0700 (PDT) Received: from localhost.localdomain ([131.255.96.168]) by smtp.gmail.com with ESMTPSA id 71dfb90a1353d-56cddcc2d60sm4829916e0c.15.2026.03.21.09.02.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Mar 2026 09:02:53 -0700 (PDT) From: Marcos Andrade To: dan.carpenter@linaro.org Cc: gregkh@linuxfoundation.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Marcos Andrade Subject: [PATCH v2 2/3] staging: rtl8723bs: rename rt_channel_info members to snake_case Date: Sat, 21 Mar 2026 16:02:17 +0000 Message-ID: <20260321160217.36060-3-marcosandrade95963@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260321160217.36060-1-marcosandrade95963@gmail.com> References: <20260321160217.36060-1-marcosandrade95963@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 Replace all occurrences of the CamelCase member names ChannelNum and ScanType in rtw_mlme_ext.c with their snake_case equivalents channel_num and scan_type, as defined in struct rt_channel_info. This change brings the code in line with the kernel coding style as described in Documentation/process/coding-style.rst. No functional changes intended. Signed-off-by: Marcos Andrade --- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 82 +++++++++---------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c index b1f20aa81efb..d8bf44eaa577 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c @@ -171,12 +171,12 @@ int rtw_ch_set_search_ch(struct rt_channel_info *ch_set, const u32 ch) { int i; - for (i = 0; ch_set[i].ChannelNum != 0; i++) { - if (ch == ch_set[i].ChannelNum) + for (i = 0; ch_set[i].channel_num != 0; i++) { + if (ch == ch_set[i].channel_num) break; } - if (i >= ch_set[i].ChannelNum) + if (i >= ch_set[i].channel_num) return -1; return i; } @@ -261,7 +261,7 @@ static int has_channel(struct rt_channel_info *channel_set, int i; for (i = 0; i < chanset_size; i++) - if (channel_set[i].ChannelNum == chan) + if (channel_set[i].channel_num == chan) return 1; return 0; @@ -340,22 +340,22 @@ static u8 init_channel_set(struct adapter *padapter, u8 ChannelPlan, struct rt_c if (b2_4GBand) { for (index = 0; index < RTW_ChannelPlan2G[Index2G].Len; index++) { - channel_set[chanset_size].ChannelNum = RTW_ChannelPlan2G[Index2G].Channel[index]; + channel_set[chanset_size].channel_num = RTW_ChannelPlan2G[Index2G].Channel[index]; if ((ChannelPlan == RT_CHANNEL_DOMAIN_GLOBAL_DOAMIN) ||/* Channel 1~11 is active, and 12~14 is passive */ (ChannelPlan == RT_CHANNEL_DOMAIN_GLOBAL_NULL)) { - if (channel_set[chanset_size].ChannelNum >= 1 && channel_set[chanset_size].ChannelNum <= 11) - channel_set[chanset_size].ScanType = SCAN_ACTIVE; - else if ((channel_set[chanset_size].ChannelNum >= 12 && channel_set[chanset_size].ChannelNum <= 14)) - channel_set[chanset_size].ScanType = SCAN_PASSIVE; + if (channel_set[chanset_size].channel_num >= 1 && channel_set[chanset_size].channel_num <= 11) + 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].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].ChannelNum <= 11) - channel_set[chanset_size].ScanType = SCAN_ACTIVE; + if (channel_set[chanset_size].channel_num <= 11) + 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++; } @@ -4279,27 +4279,27 @@ static void process_80211d(struct adapter *padapter, struct wlan_bssid_ex *bssid if (pregistrypriv->wireless_mode & WIRELESS_11G) { do { if ((i == MAX_CHANNEL_NUM) || - (chplan_sta[i].ChannelNum == 0) || - (chplan_sta[i].ChannelNum > 14)) + (chplan_sta[i].channel_num == 0) || + (chplan_sta[i].channel_num > 14)) break; if ((j == chplan_ap.Len) || (chplan_ap.Channel[j] > 14)) break; - if (chplan_sta[i].ChannelNum == chplan_ap.Channel[j]) { - chplan_new[k].ChannelNum = chplan_ap.Channel[j]; - chplan_new[k].ScanType = SCAN_ACTIVE; + if (chplan_sta[i].channel_num == chplan_ap.Channel[j]) { + chplan_new[k].channel_num = chplan_ap.Channel[j]; + chplan_new[k].scan_type = SCAN_ACTIVE; i++; j++; k++; - } else if (chplan_sta[i].ChannelNum < chplan_ap.Channel[j]) { - chplan_new[k].ChannelNum = chplan_sta[i].ChannelNum; - chplan_new[k].ScanType = SCAN_PASSIVE; + } else if (chplan_sta[i].channel_num < chplan_ap.Channel[j]) { + chplan_new[k].channel_num = chplan_sta[i].channel_num; + chplan_new[k].scan_type = SCAN_PASSIVE; i++; k++; - } else if (chplan_sta[i].ChannelNum > chplan_ap.Channel[j]) { - chplan_new[k].ChannelNum = chplan_ap.Channel[j]; - chplan_new[k].ScanType = SCAN_ACTIVE; + } else if (chplan_sta[i].channel_num > chplan_ap.Channel[j]) { + chplan_new[k].channel_num = chplan_ap.Channel[j]; + chplan_new[k].scan_type = SCAN_ACTIVE; j++; k++; } @@ -4307,29 +4307,29 @@ static void process_80211d(struct adapter *padapter, struct wlan_bssid_ex *bssid /* change AP not support channel to Passive scan */ while ((i < MAX_CHANNEL_NUM) && - (chplan_sta[i].ChannelNum != 0) && - (chplan_sta[i].ChannelNum <= 14)) { + (chplan_sta[i].channel_num != 0) && + (chplan_sta[i].channel_num <= 14)) { - chplan_new[k].ChannelNum = chplan_sta[i].ChannelNum; - chplan_new[k].ScanType = SCAN_PASSIVE; + chplan_new[k].channel_num = chplan_sta[i].channel_num; + chplan_new[k].scan_type = SCAN_PASSIVE; i++; k++; } /* add channel AP supported */ while ((j < chplan_ap.Len) && (chplan_ap.Channel[j] <= 14)) { - chplan_new[k].ChannelNum = chplan_ap.Channel[j]; - chplan_new[k].ScanType = SCAN_ACTIVE; + chplan_new[k].channel_num = chplan_ap.Channel[j]; + chplan_new[k].scan_type = SCAN_ACTIVE; j++; k++; } } else { /* keep original STA 2.4G channel plan */ while ((i < MAX_CHANNEL_NUM) && - (chplan_sta[i].ChannelNum != 0) && - (chplan_sta[i].ChannelNum <= 14)) { - chplan_new[k].ChannelNum = chplan_sta[i].ChannelNum; - chplan_new[k].ScanType = chplan_sta[i].ScanType; + (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].scan_type = chplan_sta[i].scan_type; i++; k++; } @@ -4346,10 +4346,10 @@ static void process_80211d(struct adapter *padapter, struct wlan_bssid_ex *bssid channel = bssid->configuration.ds_config; chplan_new = pmlmeext->channel_set; i = 0; - while ((i < MAX_CHANNEL_NUM) && (chplan_new[i].ChannelNum != 0)) { - if (chplan_new[i].ChannelNum == channel) { - if (chplan_new[i].ScanType == SCAN_PASSIVE) - chplan_new[i].ScanType = SCAN_ACTIVE; + while ((i < MAX_CHANNEL_NUM) && (chplan_new[i].channel_num != 0)) { + if (chplan_new[i].channel_num == channel) { + if (chplan_new[i].scan_type == SCAN_PASSIVE) + chplan_new[i].scan_type = SCAN_ACTIVE; break; } i++; @@ -5448,7 +5448,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++; @@ -5469,9 +5469,9 @@ static int rtw_scan_ch_decision(struct adapter *padapter, struct rtw_ieee80211_c break; } - out[j].hw_value = pmlmeext->channel_set[i].ChannelNum; + 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++; -- 2.53.0