Commit 42f14190 authored by Jérôme Pouiller's avatar Jérôme Pouiller Committed by Greg Kroah-Hartman
Browse files

staging: wfx: remove force_ps_timeout 



ps_timeout should be in nl80211, not in debugfs. Let's remove it until
the driver is accepted.

Signed-off-by: default avatarJérôme Pouiller <jerome.pouiller@silabs.com>
Link: https://lore.kernel.org/r/20220113085524.1110708-27-Jerome.Pouiller@silabs.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ea174822

drivers/staging/wfx/debug.c

+0 −23
Original line number Diff line number Diff line
@@ -316,28 +316,6 @@ static const struct file_operations wfx_send_hif_msg_fops = { 
	.read = wfx_send_hif_msg_read,

};



static int wfx_ps_timeout_set(void *data, u64 val)

{

	struct wfx_dev *wdev = (struct wfx_dev *)data;

	struct wfx_vif *wvif;



	wdev->force_ps_timeout = val;

	wvif = NULL;

	while ((wvif = wvif_iterate(wdev, wvif)) != NULL)

		wfx_update_pm(wvif);

	return 0;

}



static int wfx_ps_timeout_get(void *data, u64 *val)

{

	struct wfx_dev *wdev = (struct wfx_dev *)data;



	*val = wdev->force_ps_timeout;

	return 0;

}



DEFINE_DEBUGFS_ATTRIBUTE(wfx_ps_timeout_fops, wfx_ps_timeout_get, wfx_ps_timeout_set, "%lld\n");



int wfx_debug_init(struct wfx_dev *wdev)

{

	struct dentry *d;
@@ -348,7 +326,6 @@ int wfx_debug_init(struct wfx_dev *wdev) 
	debugfs_create_file("tx_power_loop", 0444, d, wdev, &wfx_tx_power_loop_fops);

	debugfs_create_file("send_pds", 0200, d, wdev, &wfx_send_pds_fops);

	debugfs_create_file("send_hif_msg", 0600, d, wdev, &wfx_send_hif_msg_fops);

	debugfs_create_file("ps_timeout", 0600, d, wdev, &wfx_ps_timeout_fops);



	return 0;

}

drivers/staging/wfx/main.c

+0 −1
Original line number Diff line number Diff line
@@ -324,7 +324,6 @@ struct wfx_dev *wfx_init_common(struct device *dev, const struct wfx_platform_da 
	skb_queue_head_init(&wdev->tx_pending);

	init_waitqueue_head(&wdev->tx_dequeue);

	wfx_init_hif_cmd(&wdev->hif_cmd);

	wdev->force_ps_timeout = -1;



	if (devm_add_action_or_reset(dev, wfx_free_common, wdev))

		return NULL;

drivers/staging/wfx/sta.c

+2 −6
Original line number Diff line number Diff line
@@ -171,18 +171,14 @@ static int wfx_get_ps_timeout(struct wfx_vif *wvif, bool *enable_ps) 
		/* It is necessary to enable PS if channels are different. */

		if (enable_ps)

			*enable_ps = true;

		if (wvif->wdev->force_ps_timeout > -1)

			return wvif->wdev->force_ps_timeout;

		else if (wfx_api_older_than(wvif->wdev, 3, 2))

		if (wfx_api_older_than(wvif->wdev, 3, 2))

			return 0;

		else

			return 30;

	}

	if (enable_ps)

		*enable_ps = wvif->vif->bss_conf.ps;

	if (wvif->wdev->force_ps_timeout > -1)

		return wvif->wdev->force_ps_timeout;

	else if (wvif->vif->bss_conf.assoc && wvif->vif->bss_conf.ps)

	if (wvif->vif->bss_conf.assoc && wvif->vif->bss_conf.ps)

		return conf->dynamic_ps_timeout;

	else

		return -1;

drivers/staging/wfx/wfx.h

+0 −1
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ struct wfx_dev { 
	struct mutex               rx_stats_lock;

	struct wfx_hif_tx_power_loop_info tx_power_loop_info;

	struct mutex               tx_power_loop_info_lock;

	int			force_ps_timeout;

};



struct wfx_vif {