1 From 93c1592889fca46d09d833455628bab05516cdbf Mon Sep 17 00:00:00 2001
2 From: Jeff Johnson <quic_jjohnson@quicinc.com>
3 Date: Wed, 14 Sep 2022 17:23:03 -0700
4 Subject: [PATCH] wifi: ath11k: Make QMI message rules const
6 Commit ff6d365898d4 ("soc: qcom: qmi: use const for struct
7 qmi_elem_info") allows QMI message encoding/decoding rules to be
8 const, so do that for ath11k.
12 Signed-off-by: Jeff Johnson <quic_jjohnson@quicinc.com>
13 Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
14 Link: https://lore.kernel.org/r/20220915002303.12206-1-quic_jjohnson@quicinc.com
16 drivers/net/wireless/ath/ath11k/qmi.c | 72 +++++++++++++--------------
17 1 file changed, 36 insertions(+), 36 deletions(-)
19 --- a/drivers/net/wireless/ath/ath11k/qmi.c
20 +++ b/drivers/net/wireless/ath/ath11k/qmi.c
21 @@ -29,7 +29,7 @@ module_param_named(cold_boot_cal, ath11k
22 MODULE_PARM_DESC(cold_boot_cal,
23 "Decrease the channel switch time but increase the driver load time (Default: true)");
25 -static struct qmi_elem_info qmi_wlanfw_host_cap_req_msg_v01_ei[] = {
26 +static const struct qmi_elem_info qmi_wlanfw_host_cap_req_msg_v01_ei[] = {
28 .data_type = QMI_OPT_FLAG,
30 @@ -280,7 +280,7 @@ static struct qmi_elem_info qmi_wlanfw_h
34 -static struct qmi_elem_info qmi_wlanfw_host_cap_resp_msg_v01_ei[] = {
35 +static const struct qmi_elem_info qmi_wlanfw_host_cap_resp_msg_v01_ei[] = {
37 .data_type = QMI_STRUCT,
39 @@ -297,7 +297,7 @@ static struct qmi_elem_info qmi_wlanfw_h
43 -static struct qmi_elem_info qmi_wlanfw_ind_register_req_msg_v01_ei[] = {
44 +static const struct qmi_elem_info qmi_wlanfw_ind_register_req_msg_v01_ei[] = {
46 .data_type = QMI_OPT_FLAG,
48 @@ -522,7 +522,7 @@ static struct qmi_elem_info qmi_wlanfw_i
52 -static struct qmi_elem_info qmi_wlanfw_ind_register_resp_msg_v01_ei[] = {
53 +static const struct qmi_elem_info qmi_wlanfw_ind_register_resp_msg_v01_ei[] = {
55 .data_type = QMI_STRUCT,
57 @@ -558,7 +558,7 @@ static struct qmi_elem_info qmi_wlanfw_i
61 -static struct qmi_elem_info qmi_wlanfw_mem_cfg_s_v01_ei[] = {
62 +static const struct qmi_elem_info qmi_wlanfw_mem_cfg_s_v01_ei[] = {
64 .data_type = QMI_UNSIGNED_8_BYTE,
66 @@ -590,7 +590,7 @@ static struct qmi_elem_info qmi_wlanfw_m
70 -static struct qmi_elem_info qmi_wlanfw_mem_seg_s_v01_ei[] = {
71 +static const struct qmi_elem_info qmi_wlanfw_mem_seg_s_v01_ei[] = {
73 .data_type = QMI_UNSIGNED_4_BYTE,
75 @@ -632,7 +632,7 @@ static struct qmi_elem_info qmi_wlanfw_m
79 -static struct qmi_elem_info qmi_wlanfw_request_mem_ind_msg_v01_ei[] = {
80 +static const struct qmi_elem_info qmi_wlanfw_request_mem_ind_msg_v01_ei[] = {
82 .data_type = QMI_DATA_LEN,
84 @@ -659,7 +659,7 @@ static struct qmi_elem_info qmi_wlanfw_r
88 -static struct qmi_elem_info qmi_wlanfw_mem_seg_resp_s_v01_ei[] = {
89 +static const struct qmi_elem_info qmi_wlanfw_mem_seg_resp_s_v01_ei[] = {
91 .data_type = QMI_UNSIGNED_8_BYTE,
93 @@ -699,7 +699,7 @@ static struct qmi_elem_info qmi_wlanfw_m
97 -static struct qmi_elem_info qmi_wlanfw_respond_mem_req_msg_v01_ei[] = {
98 +static const struct qmi_elem_info qmi_wlanfw_respond_mem_req_msg_v01_ei[] = {
100 .data_type = QMI_DATA_LEN,
102 @@ -726,7 +726,7 @@ static struct qmi_elem_info qmi_wlanfw_r
106 -static struct qmi_elem_info qmi_wlanfw_respond_mem_resp_msg_v01_ei[] = {
107 +static const struct qmi_elem_info qmi_wlanfw_respond_mem_resp_msg_v01_ei[] = {
109 .data_type = QMI_STRUCT,
111 @@ -744,7 +744,7 @@ static struct qmi_elem_info qmi_wlanfw_r
115 -static struct qmi_elem_info qmi_wlanfw_cap_req_msg_v01_ei[] = {
116 +static const struct qmi_elem_info qmi_wlanfw_cap_req_msg_v01_ei[] = {
118 .data_type = QMI_EOTI,
119 .array_type = NO_ARRAY,
120 @@ -752,7 +752,7 @@ static struct qmi_elem_info qmi_wlanfw_c
124 -static struct qmi_elem_info qmi_wlanfw_device_info_req_msg_v01_ei[] = {
125 +static const struct qmi_elem_info qmi_wlanfw_device_info_req_msg_v01_ei[] = {
127 .data_type = QMI_EOTI,
128 .array_type = NO_ARRAY,
129 @@ -760,7 +760,7 @@ static struct qmi_elem_info qmi_wlanfw_d
133 -static struct qmi_elem_info qmi_wlfw_device_info_resp_msg_v01_ei[] = {
134 +static const struct qmi_elem_info qmi_wlfw_device_info_resp_msg_v01_ei[] = {
136 .data_type = QMI_STRUCT,
138 @@ -814,7 +814,7 @@ static struct qmi_elem_info qmi_wlfw_dev
142 -static struct qmi_elem_info qmi_wlanfw_rf_chip_info_s_v01_ei[] = {
143 +static const struct qmi_elem_info qmi_wlanfw_rf_chip_info_s_v01_ei[] = {
145 .data_type = QMI_UNSIGNED_4_BYTE,
147 @@ -840,7 +840,7 @@ static struct qmi_elem_info qmi_wlanfw_r
151 -static struct qmi_elem_info qmi_wlanfw_rf_board_info_s_v01_ei[] = {
152 +static const struct qmi_elem_info qmi_wlanfw_rf_board_info_s_v01_ei[] = {
154 .data_type = QMI_UNSIGNED_4_BYTE,
156 @@ -857,7 +857,7 @@ static struct qmi_elem_info qmi_wlanfw_r
160 -static struct qmi_elem_info qmi_wlanfw_soc_info_s_v01_ei[] = {
161 +static const struct qmi_elem_info qmi_wlanfw_soc_info_s_v01_ei[] = {
163 .data_type = QMI_UNSIGNED_4_BYTE,
165 @@ -873,7 +873,7 @@ static struct qmi_elem_info qmi_wlanfw_s
169 -static struct qmi_elem_info qmi_wlanfw_fw_version_info_s_v01_ei[] = {
170 +static const struct qmi_elem_info qmi_wlanfw_fw_version_info_s_v01_ei[] = {
172 .data_type = QMI_UNSIGNED_4_BYTE,
174 @@ -899,7 +899,7 @@ static struct qmi_elem_info qmi_wlanfw_f
178 -static struct qmi_elem_info qmi_wlanfw_cap_resp_msg_v01_ei[] = {
179 +static const struct qmi_elem_info qmi_wlanfw_cap_resp_msg_v01_ei[] = {
181 .data_type = QMI_STRUCT,
183 @@ -1100,7 +1100,7 @@ static struct qmi_elem_info qmi_wlanfw_c
187 -static struct qmi_elem_info qmi_wlanfw_bdf_download_req_msg_v01_ei[] = {
188 +static const struct qmi_elem_info qmi_wlanfw_bdf_download_req_msg_v01_ei[] = {
190 .data_type = QMI_UNSIGNED_1_BYTE,
192 @@ -1235,7 +1235,7 @@ static struct qmi_elem_info qmi_wlanfw_b
196 -static struct qmi_elem_info qmi_wlanfw_bdf_download_resp_msg_v01_ei[] = {
197 +static const struct qmi_elem_info qmi_wlanfw_bdf_download_resp_msg_v01_ei[] = {
199 .data_type = QMI_STRUCT,
201 @@ -1253,7 +1253,7 @@ static struct qmi_elem_info qmi_wlanfw_b
205 -static struct qmi_elem_info qmi_wlanfw_m3_info_req_msg_v01_ei[] = {
206 +static const struct qmi_elem_info qmi_wlanfw_m3_info_req_msg_v01_ei[] = {
208 .data_type = QMI_UNSIGNED_8_BYTE,
210 @@ -1277,7 +1277,7 @@ static struct qmi_elem_info qmi_wlanfw_m
214 -static struct qmi_elem_info qmi_wlanfw_m3_info_resp_msg_v01_ei[] = {
215 +static const struct qmi_elem_info qmi_wlanfw_m3_info_resp_msg_v01_ei[] = {
217 .data_type = QMI_STRUCT,
219 @@ -1294,7 +1294,7 @@ static struct qmi_elem_info qmi_wlanfw_m
223 -static struct qmi_elem_info qmi_wlanfw_ce_tgt_pipe_cfg_s_v01_ei[] = {
224 +static const struct qmi_elem_info qmi_wlanfw_ce_tgt_pipe_cfg_s_v01_ei[] = {
226 .data_type = QMI_UNSIGNED_4_BYTE,
228 @@ -1347,7 +1347,7 @@ static struct qmi_elem_info qmi_wlanfw_c
232 -static struct qmi_elem_info qmi_wlanfw_ce_svc_pipe_cfg_s_v01_ei[] = {
233 +static const struct qmi_elem_info qmi_wlanfw_ce_svc_pipe_cfg_s_v01_ei[] = {
235 .data_type = QMI_UNSIGNED_4_BYTE,
237 @@ -1382,7 +1382,7 @@ static struct qmi_elem_info qmi_wlanfw_c
241 -static struct qmi_elem_info qmi_wlanfw_shadow_reg_cfg_s_v01_ei[] = {
242 +static const struct qmi_elem_info qmi_wlanfw_shadow_reg_cfg_s_v01_ei[] = {
244 .data_type = QMI_UNSIGNED_2_BYTE,
246 @@ -1406,7 +1406,7 @@ static struct qmi_elem_info qmi_wlanfw_s
250 -static struct qmi_elem_info qmi_wlanfw_shadow_reg_v2_cfg_s_v01_ei[] = {
251 +static const struct qmi_elem_info qmi_wlanfw_shadow_reg_v2_cfg_s_v01_ei[] = {
253 .data_type = QMI_UNSIGNED_4_BYTE,
255 @@ -1423,7 +1423,7 @@ static struct qmi_elem_info qmi_wlanfw_s
259 -static struct qmi_elem_info qmi_wlanfw_wlan_mode_req_msg_v01_ei[] = {
260 +static const struct qmi_elem_info qmi_wlanfw_wlan_mode_req_msg_v01_ei[] = {
262 .data_type = QMI_UNSIGNED_4_BYTE,
264 @@ -1458,7 +1458,7 @@ static struct qmi_elem_info qmi_wlanfw_w
268 -static struct qmi_elem_info qmi_wlanfw_wlan_mode_resp_msg_v01_ei[] = {
269 +static const struct qmi_elem_info qmi_wlanfw_wlan_mode_resp_msg_v01_ei[] = {
271 .data_type = QMI_STRUCT,
273 @@ -1476,7 +1476,7 @@ static struct qmi_elem_info qmi_wlanfw_w
277 -static struct qmi_elem_info qmi_wlanfw_wlan_cfg_req_msg_v01_ei[] = {
278 +static const struct qmi_elem_info qmi_wlanfw_wlan_cfg_req_msg_v01_ei[] = {
280 .data_type = QMI_OPT_FLAG,
282 @@ -1615,7 +1615,7 @@ static struct qmi_elem_info qmi_wlanfw_w
286 -static struct qmi_elem_info qmi_wlanfw_wlan_cfg_resp_msg_v01_ei[] = {
287 +static const struct qmi_elem_info qmi_wlanfw_wlan_cfg_resp_msg_v01_ei[] = {
289 .data_type = QMI_STRUCT,
291 @@ -1632,28 +1632,28 @@ static struct qmi_elem_info qmi_wlanfw_w
295 -static struct qmi_elem_info qmi_wlanfw_mem_ready_ind_msg_v01_ei[] = {
296 +static const struct qmi_elem_info qmi_wlanfw_mem_ready_ind_msg_v01_ei[] = {
298 .data_type = QMI_EOTI,
299 .array_type = NO_ARRAY,
303 -static struct qmi_elem_info qmi_wlanfw_fw_ready_ind_msg_v01_ei[] = {
304 +static const struct qmi_elem_info qmi_wlanfw_fw_ready_ind_msg_v01_ei[] = {
306 .data_type = QMI_EOTI,
307 .array_type = NO_ARRAY,
311 -static struct qmi_elem_info qmi_wlanfw_cold_boot_cal_done_ind_msg_v01_ei[] = {
312 +static const struct qmi_elem_info qmi_wlanfw_cold_boot_cal_done_ind_msg_v01_ei[] = {
314 .data_type = QMI_EOTI,
315 .array_type = NO_ARRAY,
319 -static struct qmi_elem_info qmi_wlanfw_wlan_ini_req_msg_v01_ei[] = {
320 +static const struct qmi_elem_info qmi_wlanfw_wlan_ini_req_msg_v01_ei[] = {
322 .data_type = QMI_OPT_FLAG,
324 @@ -1679,7 +1679,7 @@ static struct qmi_elem_info qmi_wlanfw_w
328 -static struct qmi_elem_info qmi_wlanfw_wlan_ini_resp_msg_v01_ei[] = {
329 +static const struct qmi_elem_info qmi_wlanfw_wlan_ini_resp_msg_v01_ei[] = {
331 .data_type = QMI_STRUCT,
333 @@ -1697,7 +1697,7 @@ static struct qmi_elem_info qmi_wlanfw_w
337 -static struct qmi_elem_info qmi_wlfw_fw_init_done_ind_msg_v01_ei[] = {
338 +static const struct qmi_elem_info qmi_wlfw_fw_init_done_ind_msg_v01_ei[] = {
340 .data_type = QMI_EOTI,
341 .array_type = NO_ARRAY,