drivers/net/wireless/ath/wcn36xx/smd.c | 60 -------------------------- drivers/net/wireless/ath/wcn36xx/smd.h | 1 - 2 files changed, 61 deletions(-)
From: "Dr. David Alan Gilbert" <linux@treblig.org>
wcn36xx_smd_update_scan_params() last use was removed in 2020 by
commit 5973a2947430 ("wcn36xx: Fix software-driven scan")
Remove it.
Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org>
---
drivers/net/wireless/ath/wcn36xx/smd.c | 60 --------------------------
drivers/net/wireless/ath/wcn36xx/smd.h | 1 -
2 files changed, 61 deletions(-)
diff --git a/drivers/net/wireless/ath/wcn36xx/smd.c b/drivers/net/wireless/ath/wcn36xx/smd.c
index 2cf86fc3f8fe..136acc414714 100644
--- a/drivers/net/wireless/ath/wcn36xx/smd.c
+++ b/drivers/net/wireless/ath/wcn36xx/smd.c
@@ -1127,66 +1127,6 @@ int wcn36xx_smd_process_ptt_msg(struct wcn36xx *wcn,
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,
diff --git a/drivers/net/wireless/ath/wcn36xx/smd.h b/drivers/net/wireless/ath/wcn36xx/smd.h
index 2c1ed9e570bf..4e39df5589b3 100644
--- a/drivers/net/wireless/ath/wcn36xx/smd.h
+++ b/drivers/net/wireless/ath/wcn36xx/smd.h
@@ -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);
--
2.49.0
On Thu, Jun 19, 2025 at 3:05 AM <linux@treblig.org> wrote: > > From: "Dr. David Alan Gilbert" <linux@treblig.org> > > wcn36xx_smd_update_scan_params() last use was removed in 2020 by > commit 5973a2947430 ("wcn36xx: Fix software-driven scan") > > Remove it. > > Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org> Reviewed-by: Loic Poulain <loic.poulain@oss.qualcomm.com> > --- > drivers/net/wireless/ath/wcn36xx/smd.c | 60 -------------------------- > drivers/net/wireless/ath/wcn36xx/smd.h | 1 - > 2 files changed, 61 deletions(-) > > diff --git a/drivers/net/wireless/ath/wcn36xx/smd.c b/drivers/net/wireless/ath/wcn36xx/smd.c > index 2cf86fc3f8fe..136acc414714 100644 > --- a/drivers/net/wireless/ath/wcn36xx/smd.c > +++ b/drivers/net/wireless/ath/wcn36xx/smd.c > @@ -1127,66 +1127,6 @@ int wcn36xx_smd_process_ptt_msg(struct wcn36xx *wcn, > 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, > diff --git a/drivers/net/wireless/ath/wcn36xx/smd.h b/drivers/net/wireless/ath/wcn36xx/smd.h > index 2c1ed9e570bf..4e39df5589b3 100644 > --- a/drivers/net/wireless/ath/wcn36xx/smd.h > +++ b/drivers/net/wireless/ath/wcn36xx/smd.h > @@ -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); > -- > 2.49.0 >
© 2016 - 2025 Red Hat, Inc.