Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

wifi: wcn36xx: Remove unused wcn36xx_smd_update_scan_params

wcn36xx_smd_update_scan_params() last use was removed in 2020 by
commit 5973a2947430 ("wcn36xx: Fix software-driven scan")

Remove it.

This leaves the wcn36xx_hal_update_scan_params_req_ex and
wcn36xx_hal_update_scan_params_resp structs unused.

Remove them, together with the unused
wcn36xx_hal_update_scan_params_req.

Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org>
Acked-by: Loic Poulain <loic.poulain@oss.qualcomm.com>
Link: https://patch.msgid.link/20251011001038.352393-1-linux@treblig.org
Signed-off-by: Jeff Johnson <jeff.johnson@oss.qualcomm.com>

authored by

Dr. David Alan Gilbert and committed by
Jeff Johnson
4077d7fb 94aced6e

-135
-74
drivers/net/wireless/ath/wcn36xx/hal.h
··· 4484 4484 u32 status; 4485 4485 }; 4486 4486 4487 - /* Update scan params - sent from host to PNO to be used during PNO 4488 - * scanningx */ 4489 - struct wcn36xx_hal_update_scan_params_req { 4490 - 4491 - struct wcn36xx_hal_msg_header header; 4492 - 4493 - /* Host setting for 11d */ 4494 - u8 dot11d_enabled; 4495 - 4496 - /* Lets PNO know that host has determined the regulatory domain */ 4497 - u8 dot11d_resolved; 4498 - 4499 - /* Channels on which PNO is allowed to scan */ 4500 - u8 channel_count; 4501 - u8 channels[WCN36XX_HAL_PNO_MAX_NETW_CHANNELS]; 4502 - 4503 - /* Minimum channel time */ 4504 - u16 active_min_ch_time; 4505 - 4506 - /* Maximum channel time */ 4507 - u16 active_max_ch_time; 4508 - 4509 - /* Minimum channel time */ 4510 - u16 passive_min_ch_time; 4511 - 4512 - /* Maximum channel time */ 4513 - u16 passive_max_ch_time; 4514 - 4515 - /* Cb State */ 4516 - enum phy_chan_bond_state state; 4517 - } __packed; 4518 - 4519 - /* Update scan params - sent from host to PNO to be used during PNO 4520 - * scanningx */ 4521 - struct wcn36xx_hal_update_scan_params_req_ex { 4522 - 4523 - struct wcn36xx_hal_msg_header header; 4524 - 4525 - /* Host setting for 11d */ 4526 - u8 dot11d_enabled; 4527 - 4528 - /* Lets PNO know that host has determined the regulatory domain */ 4529 - u8 dot11d_resolved; 4530 - 4531 - /* Channels on which PNO is allowed to scan */ 4532 - u8 channel_count; 4533 - u8 channels[WCN36XX_HAL_PNO_MAX_NETW_CHANNELS_EX]; 4534 - 4535 - /* Minimum channel time */ 4536 - u16 active_min_ch_time; 4537 - 4538 - /* Maximum channel time */ 4539 - u16 active_max_ch_time; 4540 - 4541 - /* Minimum channel time */ 4542 - u16 passive_min_ch_time; 4543 - 4544 - /* Maximum channel time */ 4545 - u16 passive_max_ch_time; 4546 - 4547 - /* Cb State */ 4548 - enum phy_chan_bond_state state; 4549 - } __packed; 4550 - 4551 - /* Update scan params - sent from host to PNO to be used during PNO 4552 - * scanningx */ 4553 - struct wcn36xx_hal_update_scan_params_resp { 4554 - 4555 - struct wcn36xx_hal_msg_header header; 4556 - 4557 - /* status of the request */ 4558 - u32 status; 4559 - } __packed; 4560 - 4561 4487 struct wcn36xx_hal_set_tx_per_tracking_req_msg { 4562 4488 struct wcn36xx_hal_msg_header header; 4563 4489
-60
drivers/net/wireless/ath/wcn36xx/smd.c
··· 1127 1127 return ret; 1128 1128 } 1129 1129 1130 - static int wcn36xx_smd_update_scan_params_rsp(void *buf, size_t len) 1131 - { 1132 - struct wcn36xx_hal_update_scan_params_resp *rsp; 1133 - 1134 - rsp = buf; 1135 - 1136 - /* Remove the PNO version bit */ 1137 - rsp->status &= (~(WCN36XX_FW_MSG_PNO_VERSION_MASK)); 1138 - 1139 - if (WCN36XX_FW_MSG_RESULT_SUCCESS != rsp->status) { 1140 - wcn36xx_warn("error response from update scan\n"); 1141 - return rsp->status; 1142 - } 1143 - 1144 - return 0; 1145 - } 1146 - 1147 - int wcn36xx_smd_update_scan_params(struct wcn36xx *wcn, 1148 - u8 *channels, size_t channel_count) 1149 - { 1150 - struct wcn36xx_hal_update_scan_params_req_ex msg_body; 1151 - int ret; 1152 - 1153 - mutex_lock(&wcn->hal_mutex); 1154 - INIT_HAL_MSG(msg_body, WCN36XX_HAL_UPDATE_SCAN_PARAM_REQ); 1155 - 1156 - msg_body.dot11d_enabled = false; 1157 - msg_body.dot11d_resolved = true; 1158 - 1159 - msg_body.channel_count = channel_count; 1160 - memcpy(msg_body.channels, channels, channel_count); 1161 - msg_body.active_min_ch_time = 60; 1162 - msg_body.active_max_ch_time = 120; 1163 - msg_body.passive_min_ch_time = 60; 1164 - msg_body.passive_max_ch_time = 110; 1165 - msg_body.state = PHY_SINGLE_CHANNEL_CENTERED; 1166 - 1167 - PREPARE_HAL_BUF(wcn->hal_buf, msg_body); 1168 - 1169 - wcn36xx_dbg(WCN36XX_DBG_HAL, 1170 - "hal update scan params channel_count %d\n", 1171 - msg_body.channel_count); 1172 - 1173 - ret = wcn36xx_smd_send_and_wait(wcn, msg_body.header.len); 1174 - if (ret) { 1175 - wcn36xx_err("Sending hal_update_scan_params failed\n"); 1176 - goto out; 1177 - } 1178 - ret = wcn36xx_smd_update_scan_params_rsp(wcn->hal_buf, 1179 - wcn->hal_rsp_len); 1180 - if (ret) { 1181 - wcn36xx_err("hal_update_scan_params response failed err=%d\n", 1182 - ret); 1183 - goto out; 1184 - } 1185 - out: 1186 - mutex_unlock(&wcn->hal_mutex); 1187 - return ret; 1188 - } 1189 - 1190 1130 static int wcn36xx_smd_add_sta_self_rsp(struct wcn36xx *wcn, 1191 1131 struct ieee80211_vif *vif, 1192 1132 void *buf,
-1
drivers/net/wireless/ath/wcn36xx/smd.h
··· 66 66 int wcn36xx_smd_init_scan(struct wcn36xx *wcn, enum wcn36xx_hal_sys_mode mode, 67 67 struct ieee80211_vif *vif); 68 68 69 - int wcn36xx_smd_update_scan_params(struct wcn36xx *wcn, u8 *channels, size_t channel_count); 70 69 int wcn36xx_smd_start_hw_scan(struct wcn36xx *wcn, struct ieee80211_vif *vif, 71 70 struct cfg80211_scan_request *req); 72 71 int wcn36xx_smd_stop_hw_scan(struct wcn36xx *wcn);