mirror of
https://github.com/torvalds/linux.git
synced 2025-12-07 20:06:24 +00:00
wifi: wcn36xx: Remove unused wcn36xx_smd_update_scan_params
wcn36xx_smd_update_scan_params() last use was removed in 2020 by
commit 5973a29474 ("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>
This commit is contained in:
committed by
Jeff Johnson
parent
94aced6ed9
commit
4077d7fb27
@@ -4484,80 +4484,6 @@ struct set_rssi_filter_resp {
|
||||
u32 status;
|
||||
};
|
||||
|
||||
/* Update scan params - sent from host to PNO to be used during PNO
|
||||
* scanningx */
|
||||
struct wcn36xx_hal_update_scan_params_req {
|
||||
|
||||
struct wcn36xx_hal_msg_header header;
|
||||
|
||||
/* Host setting for 11d */
|
||||
u8 dot11d_enabled;
|
||||
|
||||
/* Lets PNO know that host has determined the regulatory domain */
|
||||
u8 dot11d_resolved;
|
||||
|
||||
/* Channels on which PNO is allowed to scan */
|
||||
u8 channel_count;
|
||||
u8 channels[WCN36XX_HAL_PNO_MAX_NETW_CHANNELS];
|
||||
|
||||
/* Minimum channel time */
|
||||
u16 active_min_ch_time;
|
||||
|
||||
/* Maximum channel time */
|
||||
u16 active_max_ch_time;
|
||||
|
||||
/* Minimum channel time */
|
||||
u16 passive_min_ch_time;
|
||||
|
||||
/* Maximum channel time */
|
||||
u16 passive_max_ch_time;
|
||||
|
||||
/* Cb State */
|
||||
enum phy_chan_bond_state state;
|
||||
} __packed;
|
||||
|
||||
/* Update scan params - sent from host to PNO to be used during PNO
|
||||
* scanningx */
|
||||
struct wcn36xx_hal_update_scan_params_req_ex {
|
||||
|
||||
struct wcn36xx_hal_msg_header header;
|
||||
|
||||
/* Host setting for 11d */
|
||||
u8 dot11d_enabled;
|
||||
|
||||
/* Lets PNO know that host has determined the regulatory domain */
|
||||
u8 dot11d_resolved;
|
||||
|
||||
/* Channels on which PNO is allowed to scan */
|
||||
u8 channel_count;
|
||||
u8 channels[WCN36XX_HAL_PNO_MAX_NETW_CHANNELS_EX];
|
||||
|
||||
/* Minimum channel time */
|
||||
u16 active_min_ch_time;
|
||||
|
||||
/* Maximum channel time */
|
||||
u16 active_max_ch_time;
|
||||
|
||||
/* Minimum channel time */
|
||||
u16 passive_min_ch_time;
|
||||
|
||||
/* Maximum channel time */
|
||||
u16 passive_max_ch_time;
|
||||
|
||||
/* Cb State */
|
||||
enum phy_chan_bond_state state;
|
||||
} __packed;
|
||||
|
||||
/* Update scan params - sent from host to PNO to be used during PNO
|
||||
* scanningx */
|
||||
struct wcn36xx_hal_update_scan_params_resp {
|
||||
|
||||
struct wcn36xx_hal_msg_header header;
|
||||
|
||||
/* status of the request */
|
||||
u32 status;
|
||||
} __packed;
|
||||
|
||||
struct wcn36xx_hal_set_tx_per_tracking_req_msg {
|
||||
struct wcn36xx_hal_msg_header header;
|
||||
|
||||
|
||||
@@ -1127,66 +1127,6 @@ out_nomem:
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int wcn36xx_smd_update_scan_params_rsp(void *buf, size_t len)
|
||||
{
|
||||
struct wcn36xx_hal_update_scan_params_resp *rsp;
|
||||
|
||||
rsp = buf;
|
||||
|
||||
/* Remove the PNO version bit */
|
||||
rsp->status &= (~(WCN36XX_FW_MSG_PNO_VERSION_MASK));
|
||||
|
||||
if (WCN36XX_FW_MSG_RESULT_SUCCESS != rsp->status) {
|
||||
wcn36xx_warn("error response from update scan\n");
|
||||
return rsp->status;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int wcn36xx_smd_update_scan_params(struct wcn36xx *wcn,
|
||||
u8 *channels, size_t channel_count)
|
||||
{
|
||||
struct wcn36xx_hal_update_scan_params_req_ex msg_body;
|
||||
int ret;
|
||||
|
||||
mutex_lock(&wcn->hal_mutex);
|
||||
INIT_HAL_MSG(msg_body, WCN36XX_HAL_UPDATE_SCAN_PARAM_REQ);
|
||||
|
||||
msg_body.dot11d_enabled = false;
|
||||
msg_body.dot11d_resolved = true;
|
||||
|
||||
msg_body.channel_count = channel_count;
|
||||
memcpy(msg_body.channels, channels, channel_count);
|
||||
msg_body.active_min_ch_time = 60;
|
||||
msg_body.active_max_ch_time = 120;
|
||||
msg_body.passive_min_ch_time = 60;
|
||||
msg_body.passive_max_ch_time = 110;
|
||||
msg_body.state = PHY_SINGLE_CHANNEL_CENTERED;
|
||||
|
||||
PREPARE_HAL_BUF(wcn->hal_buf, msg_body);
|
||||
|
||||
wcn36xx_dbg(WCN36XX_DBG_HAL,
|
||||
"hal update scan params channel_count %d\n",
|
||||
msg_body.channel_count);
|
||||
|
||||
ret = wcn36xx_smd_send_and_wait(wcn, msg_body.header.len);
|
||||
if (ret) {
|
||||
wcn36xx_err("Sending hal_update_scan_params failed\n");
|
||||
goto out;
|
||||
}
|
||||
ret = wcn36xx_smd_update_scan_params_rsp(wcn->hal_buf,
|
||||
wcn->hal_rsp_len);
|
||||
if (ret) {
|
||||
wcn36xx_err("hal_update_scan_params response failed err=%d\n",
|
||||
ret);
|
||||
goto out;
|
||||
}
|
||||
out:
|
||||
mutex_unlock(&wcn->hal_mutex);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int wcn36xx_smd_add_sta_self_rsp(struct wcn36xx *wcn,
|
||||
struct ieee80211_vif *vif,
|
||||
void *buf,
|
||||
|
||||
@@ -66,7 +66,6 @@ int wcn36xx_smd_finish_scan(struct wcn36xx *wcn, enum wcn36xx_hal_sys_mode mode,
|
||||
int wcn36xx_smd_init_scan(struct wcn36xx *wcn, enum wcn36xx_hal_sys_mode mode,
|
||||
struct ieee80211_vif *vif);
|
||||
|
||||
int wcn36xx_smd_update_scan_params(struct wcn36xx *wcn, u8 *channels, size_t channel_count);
|
||||
int wcn36xx_smd_start_hw_scan(struct wcn36xx *wcn, struct ieee80211_vif *vif,
|
||||
struct cfg80211_scan_request *req);
|
||||
int wcn36xx_smd_stop_hw_scan(struct wcn36xx *wcn);
|
||||
|
||||
Reference in New Issue
Block a user