wifi: mwifiex: cleanup adapter data

Remove unused and set but unused 'dfs_workqueue', 'dfs_work', and
'scan_channels' members of 'struct mwifiex_adapter', adjust users.

Signed-off-by: Dmitry Antipov <dmantipov@yandex.ru>
Acked-by: Brian Norris <briannorris@chromium.org>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20230814142101.60308-1-dmantipov@yandex.ru

diff --git a/drivers/net/wireless/marvell/mwifiex/init.c b/drivers/net/wireless/marvell/mwifiex/init.c
index 86293be782a257171b68ded3cd21cd32866f1506..c9c58419c37bfb197272fb5aae9ddea2a5741fcb 100644 (file)
--- a/drivers/net/wireless/marvell/mwifiex/init.c
+++ b/drivers/net/wireless/marvell/mwifiex/init.c
@@ -288,7 +288,6 @@ static void mwifiex_init_adapter(struct mwifiex_adapter *adapter)
        adapter->fw_bands = 0;
        adapter->config_bands = 0;
        adapter->adhoc_start_band = 0;
-       adapter->scan_channels = NULL;
        adapter->fw_release_number = 0;
        adapter->fw_cap_info = 0;
        memset(&adapter->upld_buf, 0, sizeof(adapter->upld_buf));

diff --git a/drivers/net/wireless/marvell/mwifiex/main.h b/drivers/net/wireless/marvell/mwifiex/main.h
index 97e7c835d729e8facbd43b3f3a1d583c98d5418e..7bdec6c622481dc7f8dc7719723e6fd58c3cce77 100644 (file)
--- a/drivers/net/wireless/marvell/mwifiex/main.h
+++ b/drivers/net/wireless/marvell/mwifiex/main.h
@@ -878,8 +878,6 @@ struct mwifiex_adapter {
        struct work_struct main_work;
        struct workqueue_struct *rx_workqueue;
        struct work_struct rx_work;
-       struct workqueue_struct *dfs_workqueue;
-       struct work_struct dfs_work;
        bool rx_work_enabled;
        bool rx_processing;
        bool delay_main_work;
@@ -943,7 +941,6 @@ struct mwifiex_adapter {
        u8 fw_bands;
        u8 adhoc_start_band;
        u8 config_bands;
-       struct mwifiex_chan_scan_param_set *scan_channels;
        u8 tx_lock_flag;
        struct mwifiex_sleep_period sleep_period;
        u16 ps_mode;

diff --git a/drivers/net/wireless/marvell/mwifiex/scan.c b/drivers/net/wireless/marvell/mwifiex/scan.c
index fb3105a7633775b35ec6a05f169e88a88a16e752..72904c275461e659fe30e8b715dfc7d20a1dc5d1 100644 (file)
--- a/drivers/net/wireless/marvell/mwifiex/scan.c
+++ b/drivers/net/wireless/marvell/mwifiex/scan.c
@@ -612,7 +612,6 @@ mwifiex_scan_channel_list(struct mwifiex_private *priv,
        struct mwifiex_adapter *adapter = priv->adapter;
        int ret = 0;
        struct mwifiex_chan_scan_param_set *tmp_chan_list;
-       struct mwifiex_chan_scan_param_set *start_chan;
        u32 tlv_idx, rates_size, cmd_no;
        u32 total_scan_time;
        u32 done_early;
@@ -643,7 +642,6 @@ mwifiex_scan_channel_list(struct mwifiex_private *priv,
                total_scan_time = 0;
                radio_type = 0;
                chan_tlv_out->header.len = 0;
-               start_chan = tmp_chan_list;
                done_early = false;
 
                /*
@@ -750,8 +748,6 @@ mwifiex_scan_channel_list(struct mwifiex_private *priv,
                rates_size = mwifiex_append_rate_tlv(priv, scan_cfg_out,
                                                     radio_type);
 
-               priv->adapter->scan_channels = start_chan;
-
                /* Send the scan command to the firmware with the specified
                   cfg */
                if (priv->adapter->ext_scan)