Commit 0e6ccd25 authored by Dmitry Antipov's avatar Dmitry Antipov Committed by Kalle Valo
Browse files

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: default avatarDmitry Antipov <dmantipov@yandex.ru>
Acked-by: default avatarBrian Norris <briannorris@chromium.org>
Signed-off-by: default avatarKalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20230814142101.60308-1-dmantipov@yandex.ru
parent 2785851c

drivers/net/wireless/marvell/mwifiex/init.c

+0 −1
Original line number Diff line number Diff line
@@ -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));

drivers/net/wireless/marvell/mwifiex/main.h

+0 −3
Original line number Diff line number Diff line
@@ -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;

drivers/net/wireless/marvell/mwifiex/scan.c

+0 −4
Original line number Diff line number Diff line
@@ -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)