projects / openwrt / openwrt.git / blob
? search:


fe16a7ec2025cf65553e0df79a831c1a3bc8258d
[openwrt/openwrt.git] /
1 From e66f3b5c7535bb508e9c561a047b32de4ddc1cda Mon Sep 17 00:00:00 2001
2 From: Bitterblue Smith <rtl8821cerfe2@gmail.com>
3 Date: Tue, 4 Feb 2025 20:40:22 +0200
4 Subject: [PATCH] wifi: rtw88: Constify some more structs and arrays
5
6 These structs and arrays are never modified, so make them const:
7
8 rtw_band_2ghz
9 rtw_band_5ghz
10 rtw_pci_tx_queue_idx_addr
11 rtw_pci_ops
12 rtw_cck_rates
13 rtw_ofdm_rates
14 rtw_ht_1s_rates
15 rtw_ht_2s_rates
16 rtw_vht_1s_rates
17 rtw_vht_2s_rates
18 rtw_rate_section
19 rtw_rate_size
20 rtw_sdio_ops
21 rtw_usb_ops
22
23 Signed-off-by: Bitterblue Smith <rtl8821cerfe2@gmail.com>
24 Acked-by: Ping-Ke Shih <pkshih@realtek.com>
25 Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
26 Link: https://patch.msgid.link/502f124e-ccf3-4c09-80a4-1e5c5304822b@gmail.com
27 ---
28 drivers/net/wireless/realtek/rtw88/main.c | 4 ++--
29 drivers/net/wireless/realtek/rtw88/main.h | 2 +-
30 drivers/net/wireless/realtek/rtw88/pci.c | 4 ++--
31 drivers/net/wireless/realtek/rtw88/phy.c | 26 ++++++++++++++---------
32 drivers/net/wireless/realtek/rtw88/phy.h | 16 +++++++-------
33 drivers/net/wireless/realtek/rtw88/sdio.c | 2 +-
34 drivers/net/wireless/realtek/rtw88/usb.c | 2 +-
35 7 files changed, 31 insertions(+), 25 deletions(-)
36
37 --- a/drivers/net/wireless/realtek/rtw88/main.c
38 +++ b/drivers/net/wireless/realtek/rtw88/main.c
39 @@ -136,7 +136,7 @@ u16 rtw_desc_to_bitrate(u8 desc_rate)
40 return rate.bitrate;
41 }
42
43 -static struct ieee80211_supported_band rtw_band_2ghz = {
44 +static const struct ieee80211_supported_band rtw_band_2ghz = {
45 .band = NL80211_BAND_2GHZ,
46
47 .channels = rtw_channeltable_2g,
48 @@ -149,7 +149,7 @@ static struct ieee80211_supported_band r
49 .vht_cap = {0},
50 };
51
52 -static struct ieee80211_supported_band rtw_band_5ghz = {
53 +static const struct ieee80211_supported_band rtw_band_5ghz = {
54 .band = NL80211_BAND_5GHZ,
55
56 .channels = rtw_channeltable_5g,
57 --- a/drivers/net/wireless/realtek/rtw88/main.h
58 +++ b/drivers/net/wireless/realtek/rtw88/main.h
59 @@ -61,7 +61,7 @@ enum rtw_hci_type {
60 };
61
62 struct rtw_hci {
63 - struct rtw_hci_ops *ops;
64 + const struct rtw_hci_ops *ops;
65 enum rtw_hci_type type;
66
67 u32 rpwm_addr;
68 --- a/drivers/net/wireless/realtek/rtw88/pci.c
69 +++ b/drivers/net/wireless/realtek/rtw88/pci.c
70 @@ -20,7 +20,7 @@ module_param_named(disable_aspm, rtw_pci
71 MODULE_PARM_DESC(disable_msi, "Set Y to disable MSI interrupt support");
72 MODULE_PARM_DESC(disable_aspm, "Set Y to disable PCI ASPM support");
73
74 -static u32 rtw_pci_tx_queue_idx_addr[] = {
75 +static const u32 rtw_pci_tx_queue_idx_addr[] = {
76 [RTW_TX_QUEUE_BK] = RTK_PCI_TXBD_IDX_BKQ,
77 [RTW_TX_QUEUE_BE] = RTK_PCI_TXBD_IDX_BEQ,
78 [RTW_TX_QUEUE_VI] = RTK_PCI_TXBD_IDX_VIQ,
79 @@ -1591,7 +1591,7 @@ static void rtw_pci_destroy(struct rtw_d
80 rtw_pci_io_unmapping(rtwdev, pdev);
81 }
82
83 -static struct rtw_hci_ops rtw_pci_ops = {
84 +static const struct rtw_hci_ops rtw_pci_ops = {
85 .tx_write = rtw_pci_tx_write,
86 .tx_kick_off = rtw_pci_tx_kick_off,
87 .flush_queues = rtw_pci_flush_queues,
88 --- a/drivers/net/wireless/realtek/rtw88/phy.c
89 +++ b/drivers/net/wireless/realtek/rtw88/phy.c
90 @@ -52,44 +52,50 @@ static const u32 db_invert_table[12][8]
91 1995262315, 2511886432U, 3162277660U, 3981071706U}
92 };
93
94 -u8 rtw_cck_rates[] = { DESC_RATE1M, DESC_RATE2M, DESC_RATE5_5M, DESC_RATE11M };
95 -u8 rtw_ofdm_rates[] = {
96 +const u8 rtw_cck_rates[] = { DESC_RATE1M, DESC_RATE2M, DESC_RATE5_5M, DESC_RATE11M };
97 +
98 +const u8 rtw_ofdm_rates[] = {
99 DESC_RATE6M, DESC_RATE9M, DESC_RATE12M,
100 DESC_RATE18M, DESC_RATE24M, DESC_RATE36M,
101 DESC_RATE48M, DESC_RATE54M
102 };
103 -u8 rtw_ht_1s_rates[] = {
104 +
105 +const u8 rtw_ht_1s_rates[] = {
106 DESC_RATEMCS0, DESC_RATEMCS1, DESC_RATEMCS2,
107 DESC_RATEMCS3, DESC_RATEMCS4, DESC_RATEMCS5,
108 DESC_RATEMCS6, DESC_RATEMCS7
109 };
110 -u8 rtw_ht_2s_rates[] = {
111 +
112 +const u8 rtw_ht_2s_rates[] = {
113 DESC_RATEMCS8, DESC_RATEMCS9, DESC_RATEMCS10,
114 DESC_RATEMCS11, DESC_RATEMCS12, DESC_RATEMCS13,
115 DESC_RATEMCS14, DESC_RATEMCS15
116 };
117 -u8 rtw_vht_1s_rates[] = {
118 +
119 +const u8 rtw_vht_1s_rates[] = {
120 DESC_RATEVHT1SS_MCS0, DESC_RATEVHT1SS_MCS1,
121 DESC_RATEVHT1SS_MCS2, DESC_RATEVHT1SS_MCS3,
122 DESC_RATEVHT1SS_MCS4, DESC_RATEVHT1SS_MCS5,
123 DESC_RATEVHT1SS_MCS6, DESC_RATEVHT1SS_MCS7,
124 DESC_RATEVHT1SS_MCS8, DESC_RATEVHT1SS_MCS9
125 };
126 -u8 rtw_vht_2s_rates[] = {
127 +
128 +const u8 rtw_vht_2s_rates[] = {
129 DESC_RATEVHT2SS_MCS0, DESC_RATEVHT2SS_MCS1,
130 DESC_RATEVHT2SS_MCS2, DESC_RATEVHT2SS_MCS3,
131 DESC_RATEVHT2SS_MCS4, DESC_RATEVHT2SS_MCS5,
132 DESC_RATEVHT2SS_MCS6, DESC_RATEVHT2SS_MCS7,
133 DESC_RATEVHT2SS_MCS8, DESC_RATEVHT2SS_MCS9
134 };
135 -u8 *rtw_rate_section[RTW_RATE_SECTION_MAX] = {
136 +
137 +const u8 * const rtw_rate_section[RTW_RATE_SECTION_MAX] = {
138 rtw_cck_rates, rtw_ofdm_rates,
139 rtw_ht_1s_rates, rtw_ht_2s_rates,
140 rtw_vht_1s_rates, rtw_vht_2s_rates
141 };
142 EXPORT_SYMBOL(rtw_rate_section);
143
144 -u8 rtw_rate_size[RTW_RATE_SECTION_MAX] = {
145 +const u8 rtw_rate_size[RTW_RATE_SECTION_MAX] = {
146 ARRAY_SIZE(rtw_cck_rates),
147 ARRAY_SIZE(rtw_ofdm_rates),
148 ARRAY_SIZE(rtw_ht_1s_rates),
149 @@ -2214,7 +2220,7 @@ static void rtw_phy_set_tx_power_index_b
150 {
151 struct rtw_hal *hal = &rtwdev->hal;
152 u8 regd = rtw_regd_get(rtwdev);
153 - u8 *rates;
154 + const u8 *rates;
155 u8 size;
156 u8 rate;
157 u8 pwr_idx;
158 @@ -2274,7 +2280,7 @@ EXPORT_SYMBOL(rtw_phy_set_tx_power_level
159
160 static void
161 rtw_phy_tx_power_by_rate_config_by_path(struct rtw_hal *hal, u8 path,
162 - u8 rs, u8 size, u8 *rates)
163 + u8 rs, u8 size, const u8 *rates)
164 {
165 u8 rate;
166 u8 base_idx, rate_idx;
167 --- a/drivers/net/wireless/realtek/rtw88/phy.h
168 +++ b/drivers/net/wireless/realtek/rtw88/phy.h
169 @@ -7,14 +7,14 @@
170
171 #include "debug.h"
172
173 -extern u8 rtw_cck_rates[];
174 -extern u8 rtw_ofdm_rates[];
175 -extern u8 rtw_ht_1s_rates[];
176 -extern u8 rtw_ht_2s_rates[];
177 -extern u8 rtw_vht_1s_rates[];
178 -extern u8 rtw_vht_2s_rates[];
179 -extern u8 *rtw_rate_section[];
180 -extern u8 rtw_rate_size[];
181 +extern const u8 rtw_cck_rates[];
182 +extern const u8 rtw_ofdm_rates[];
183 +extern const u8 rtw_ht_1s_rates[];
184 +extern const u8 rtw_ht_2s_rates[];
185 +extern const u8 rtw_vht_1s_rates[];
186 +extern const u8 rtw_vht_2s_rates[];
187 +extern const u8 * const rtw_rate_section[];
188 +extern const u8 rtw_rate_size[];
189
190 void rtw_phy_init(struct rtw_dev *rtwdev);
191 void rtw_phy_dynamic_mechanism(struct rtw_dev *rtwdev);
192 --- a/drivers/net/wireless/realtek/rtw88/sdio.c
193 +++ b/drivers/net/wireless/realtek/rtw88/sdio.c
194 @@ -1147,7 +1147,7 @@ static void rtw_sdio_declaim(struct rtw_
195 sdio_release_host(sdio_func);
196 }
197
198 -static struct rtw_hci_ops rtw_sdio_ops = {
199 +static const struct rtw_hci_ops rtw_sdio_ops = {
200 .tx_write = rtw_sdio_tx_write,
201 .tx_kick_off = rtw_sdio_tx_kick_off,
202 .setup = rtw_sdio_setup,
203 --- a/drivers/net/wireless/realtek/rtw88/usb.c
204 +++ b/drivers/net/wireless/realtek/rtw88/usb.c
205 @@ -881,7 +881,7 @@ static void rtw_usb_dynamic_rx_agg(struc
206 }
207 }
208
209 -static struct rtw_hci_ops rtw_usb_ops = {
210 +static const struct rtw_hci_ops rtw_usb_ops = {
211 .tx_write = rtw_usb_tx_write,
212 .tx_kick_off = rtw_usb_tx_kick_off,
213 .setup = rtw_usb_setup,
OpenWrt Source Repository