staging: wfx: drop unused argument from hif_scan()

It is no more necessary to compute the expected duration of the scan
request.

Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com>
Link: https://lore.kernel.org/r/20210913130203.1903622-7-Jerome.Pouiller@silabs.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/wfx/hif_tx.c b/drivers/staging/wfx/hif_tx.c
index 63b437261eb727fcf6879d870e5c556a707e5fd1..14b7e047916eb075565a410e45abd72cc0ca1b72 100644 (file)
--- a/drivers/staging/wfx/hif_tx.c
+++ b/drivers/staging/wfx/hif_tx.c
@@ -227,14 +227,13 @@ int hif_write_mib(struct wfx_dev *wdev, int vif_id, u16 mib_id,
 }
 
 int hif_scan(struct wfx_vif *wvif, struct cfg80211_scan_request *req,
-            int chan_start_idx, int chan_num, int *timeout)
+            int chan_start_idx, int chan_num)
 {
        int ret, i;
        struct hif_msg *hif;
        size_t buf_len =
                sizeof(struct hif_req_start_scan_alt) + chan_num * sizeof(u8);
        struct hif_req_start_scan_alt *body = wfx_alloc_hif(buf_len, &hif);
-       int tmo_chan_fg, tmo_chan_bg, tmo;
 
        WARN(chan_num > HIF_API_MAX_NB_CHANNELS, "invalid params");
        WARN(req->n_ssids > HIF_API_MAX_NB_SSIDS, "invalid params");
@@ -269,12 +268,6 @@ int hif_scan(struct wfx_vif *wvif, struct cfg80211_scan_request *req,
                body->num_of_probe_requests = 2;
                body->probe_delay = 100;
        }
-       tmo_chan_bg = le32_to_cpu(body->max_channel_time) * USEC_PER_TU;
-       tmo_chan_fg = 512 * USEC_PER_TU + body->probe_delay;
-       tmo_chan_fg *= body->num_of_probe_requests;
-       tmo = chan_num * max(tmo_chan_bg, tmo_chan_fg) + 512 * USEC_PER_TU;
-       if (timeout)
-               *timeout = usecs_to_jiffies(tmo);
 
        wfx_fill_header(hif, wvif->id, HIF_REQ_ID_START_SCAN, buf_len);
        ret = wfx_cmd_send(wvif->wdev, hif, NULL, 0, false);

diff --git a/drivers/staging/wfx/hif_tx.h b/drivers/staging/wfx/hif_tx.h
index 3521c545ae6bffa4610873abed237220b413e200..46eed6cfa247e90faa714d80850a719eda2b1500 100644 (file)
--- a/drivers/staging/wfx/hif_tx.h
+++ b/drivers/staging/wfx/hif_tx.h
@@ -40,7 +40,7 @@ int hif_read_mib(struct wfx_dev *wdev, int vif_id, u16 mib_id,
 int hif_write_mib(struct wfx_dev *wdev, int vif_id, u16 mib_id,
                  void *buf, size_t buf_size);
 int hif_scan(struct wfx_vif *wvif, struct cfg80211_scan_request *req80211,
-            int chan_start, int chan_num, int *timeout);
+            int chan_start, int chan_num);
 int hif_stop_scan(struct wfx_vif *wvif);
 int hif_join(struct wfx_vif *wvif, const struct ieee80211_bss_conf *conf,
             struct ieee80211_channel *channel, const u8 *ssid, int ssidlen);

diff --git a/drivers/staging/wfx/scan.c b/drivers/staging/wfx/scan.c
index 695b06974194892d28079c85bfbbd9d2e1ccbbd0..9e2d08317c9e03d4d0960161b5b77327ff784c99 100644 (file)
--- a/drivers/staging/wfx/scan.c
+++ b/drivers/staging/wfx/scan.c
@@ -56,7 +56,7 @@ static int send_scan_req(struct wfx_vif *wvif,
        wfx_tx_lock_flush(wvif->wdev);
        wvif->scan_abort = false;
        reinit_completion(&wvif->scan_complete);
-       ret = hif_scan(wvif, req, start_idx, i - start_idx, NULL);
+       ret = hif_scan(wvif, req, start_idx, i - start_idx);
        if (ret) {
                wfx_tx_unlock(wvif->wdev);
                return -EIO;