[PATCH 05/20] staging: wfx: wfx_update_filtering_work() is no more used

Jerome Pouiller
2020-04-15T16:14:43Z

Since we had simplified the join process, update_filtering_work is no
more used. Drop it.

Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com>
---
drivers/staging/wfx/sta.c | 10 ----------
drivers/staging/wfx/sta.h | 1 -
drivers/staging/wfx/wfx.h | 1 -
3 files changed, 12 deletions(-)

diff --git a/drivers/staging/wfx/sta.c b/drivers/staging/wfx/sta.c
index b01467f7606a..7255899b4a5a 100644
--- a/drivers/staging/wfx/sta.c
+++ b/drivers/staging/wfx/sta.c
@@ -174,14 +174,6 @@ void wfx_update_filtering(struct wfx_vif *wvif)
hif_set_data_filtering(wvif, true, true);
}

-static void wfx_update_filtering_work(struct work_struct *work)
-{
- struct wfx_vif *wvif = container_of(work, struct wfx_vif,
- update_filtering_work);
-
- wfx_update_filtering(wvif);
-}
-
u64 wfx_prepare_multicast(struct ieee80211_hw *hw,
struct netdev_hw_addr_list *mc_list)
{
@@ -415,7 +407,6 @@ static void wfx_do_unjoin(struct wfx_vif *wvif)
if (wvif->state == WFX_STATE_AP)
return;

- cancel_work_sync(&wvif->update_filtering_work);
wvif->state = WFX_STATE_PASSIVE;

/* Unjoin is a reset. */
@@ -934,7 +925,6 @@ int wfx_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif)

init_completion(&wvif->set_pm_mode_complete);
complete(&wvif->set_pm_mode_complete);
- INIT_WORK(&wvif->update_filtering_work, wfx_update_filtering_work);
INIT_WORK(&wvif->bss_params_work, wfx_bss_params_work);
INIT_WORK(&wvif->tx_policy_upload_work, wfx_tx_policy_upload_work);

diff --git a/drivers/staging/wfx/sta.h b/drivers/staging/wfx/sta.h
index 3002d89dc871..8d76fba5f504 100644
--- a/drivers/staging/wfx/sta.h
+++ b/drivers/staging/wfx/sta.h
@@ -88,7 +88,6 @@ void wfx_suspend_resume_mc(struct wfx_vif *wvif, enum sta_notify_cmd cmd);

// Other Helpers
void wfx_cqm_bssloss_sm(struct wfx_vif *wvif, int init, int good, int bad);
-void wfx_update_filtering(struct wfx_vif *wvif);
int wfx_fwd_probe_req(struct wfx_vif *wvif, bool enable);
u32 wfx_rate_mask_to_hw(struct wfx_dev *wdev, u32 rates);

diff --git a/drivers/staging/wfx/wfx.h b/drivers/staging/wfx/wfx.h
index 41d67dc091a6..a69d9c9c37b6 100644
--- a/drivers/staging/wfx/wfx.h
+++ b/drivers/staging/wfx/wfx.h
@@ -91,7 +91,6 @@ struct wfx_vif {
bool filter_bssid;
bool fwd_probe_req;
bool disable_beacon_filter;
- struct work_struct update_filtering_work;

unsigned long uapsd_mask;
struct hif_req_set_bss_params bss_params;
--
2.25.1