Commit 107c2be8 authored by Dr. David Alan Gilbert's avatar Dr. David Alan Gilbert Committed by Kalle Valo
Browse files

wifi: libertas: Remove unused auto deep sleep code 



With the recent removal of the uncalled
  lbs_(enter|exit)_auto_deep_sleep()
functions, it's no longer possible to set
  priv->is_auto_deep_sleep_enabled
so we can remove all tests of it and the variable itself.

With that gone, priv->wakeup_dev_required also doesn't
get set, so we can remove any testing of it.

Now the timer itself, and the function it calls goes.
The timer used the apparently unset auto_deep_sleep_timeout
member, which can also go.

Signed-off-by: default avatarDr. David Alan Gilbert <linux@treblig.org>
Signed-off-by: default avatarKalle Valo <kvalo@kernel.org>
Link: https://patch.msgid.link/20250121013300.433538-4-linux@treblig.org
parent 5a7148ba

drivers/net/wireless/marvell/libertas/cmd.c

+4 −10
Original line number Diff line number Diff line
@@ -903,10 +903,6 @@ static void lbs_submit_command(struct lbs_private *priv, 
	}



	if (command == CMD_802_11_DEEP_SLEEP) {

		if (priv->is_auto_deep_sleep_enabled) {

			priv->wakeup_dev_required = 1;

			priv->dnld_sent = 0;

		}

		priv->is_deep_sleep = 1;

		lbs_complete_command(priv, cmdnode, 0);

	} else {
@@ -1391,13 +1387,11 @@ struct cmd_ctrl_node *__lbs_cmd_async(struct lbs_private *priv, 
	/* No commands are allowed in Deep Sleep until we toggle the GPIO

	 * to wake up the card and it has signaled that it's ready.

	 */

	if (!priv->is_auto_deep_sleep_enabled) {

	if (priv->is_deep_sleep) {

		lbs_deb_cmd("command not allowed in deep sleep\n");

		cmdnode = ERR_PTR(-EBUSY);

		goto done;

	}

	}



	cmdnode = lbs_get_free_cmd_node(priv);

	if (cmdnode == NULL) {

drivers/net/wireless/marvell/libertas/cmdresp.c

+0 −1
Original line number Diff line number Diff line
@@ -279,7 +279,6 @@ void lbs_process_event(struct lbs_private *priv, u32 event) 
			priv->reset_deep_sleep_wakeup(priv);

		lbs_deb_cmd("EVENT: ds awake\n");

		priv->is_deep_sleep = 0;

		priv->wakeup_dev_required = 0;

		wake_up_interruptible(&priv->ds_awake_q);

		break;

drivers/net/wireless/marvell/libertas/dev.h

+0 −4
Original line number Diff line number Diff line
@@ -83,12 +83,8 @@ struct lbs_private { 
	/* Deep sleep */

	int is_deep_sleep;

	int deep_sleep_required;

	int is_auto_deep_sleep_enabled;

	int wakeup_dev_required;

	int is_activity_detected;

	int auto_deep_sleep_timeout; /* in ms */

	wait_queue_head_t ds_awake_q;

	struct timer_list auto_deepsleep_timer;



	/* Host sleep*/

	int is_host_sleep_configured;

drivers/net/wireless/marvell/libertas/main.c

+2 −46
Original line number Diff line number Diff line
@@ -256,7 +256,6 @@ void lbs_host_to_card_done(struct lbs_private *priv) 


	/* Wake main thread if commands are pending */

	if (!priv->cur_cmd || priv->tx_pending_len > 0) {

		if (!priv->wakeup_dev_required)

		wake_up(&priv->waitq);

	}
@@ -448,8 +447,7 @@ static int lbs_thread(void *data) 
			shouldsleep = 0;	/* We have a command response */

		else if (priv->cur_cmd)

			shouldsleep = 1;	/* Can't send a command; one already running */

		else if (!list_empty(&priv->cmdpendingq) &&

					!(priv->wakeup_dev_required))

		else if (!list_empty(&priv->cmdpendingq))

			shouldsleep = 0;	/* We have a command to send */

		else if (kfifo_len(&priv->event_fifo))

			shouldsleep = 0;	/* We have an event to process */
@@ -516,14 +514,6 @@ static int lbs_thread(void *data) 
		}

		spin_unlock_irq(&priv->driver_lock);



		if (priv->wakeup_dev_required) {

			lbs_deb_thread("Waking up device...\n");

			/* Wake up device */

			if (priv->exit_deep_sleep(priv))

				lbs_deb_thread("Wakeup device failed\n");

			continue;

		}



		/* command timeout stuff */

		if (priv->cmd_timed_out && priv->cur_cmd) {

			struct cmd_ctrl_node *cmdnode = priv->cur_cmd;
@@ -606,7 +596,6 @@ static int lbs_thread(void *data) 


	del_timer(&priv->command_timer);

	del_timer(&priv->tx_lockup_timer);

	del_timer(&priv->auto_deepsleep_timer);



	return 0;

}
@@ -753,35 +742,6 @@ static void lbs_tx_lockup_handler(struct timer_list *t) 
	spin_unlock_irqrestore(&priv->driver_lock, flags);

}



/**

 * auto_deepsleep_timer_fn - put the device back to deep sleep mode when

 * timer expires and no activity (command, event, data etc.) is detected.

 * @t: Context from which to retrieve a &struct lbs_private pointer

 * returns:	N/A

 */

static void auto_deepsleep_timer_fn(struct timer_list *t)

{

	struct lbs_private *priv = from_timer(priv, t, auto_deepsleep_timer);



	if (priv->is_activity_detected) {

		priv->is_activity_detected = 0;

	} else {

		if (priv->is_auto_deep_sleep_enabled &&

		    (!priv->wakeup_dev_required) &&

		    (priv->connect_status != LBS_CONNECTED)) {

			struct cmd_header cmd;



			lbs_deb_main("Entering auto deep sleep mode...\n");

			memset(&cmd, 0, sizeof(cmd));

			cmd.size = cpu_to_le16(sizeof(cmd));

			lbs_cmd_async(priv, CMD_802_11_DEEP_SLEEP, &cmd,

					sizeof(cmd));

		}

	}

	mod_timer(&priv->auto_deepsleep_timer , jiffies +

				(priv->auto_deep_sleep_timeout * HZ)/1000);

}



static int lbs_init_adapter(struct lbs_private *priv)

{

	int ret;
@@ -795,9 +755,7 @@ static int lbs_init_adapter(struct lbs_private *priv) 
	priv->psmode = LBS802_11POWERMODECAM;

	priv->psstate = PS_STATE_FULL_POWER;

	priv->is_deep_sleep = 0;

	priv->is_auto_deep_sleep_enabled = 0;

	priv->deep_sleep_required = 0;

	priv->wakeup_dev_required = 0;

	init_waitqueue_head(&priv->ds_awake_q);

	init_waitqueue_head(&priv->scan_q);

	priv->authtype_auto = 1;
@@ -809,7 +767,6 @@ static int lbs_init_adapter(struct lbs_private *priv) 


	timer_setup(&priv->command_timer, lbs_cmd_timeout_handler, 0);

	timer_setup(&priv->tx_lockup_timer, lbs_tx_lockup_handler, 0);

	timer_setup(&priv->auto_deepsleep_timer, auto_deepsleep_timer_fn, 0);



	INIT_LIST_HEAD(&priv->cmdfreeq);

	INIT_LIST_HEAD(&priv->cmdpendingq);
@@ -843,7 +800,6 @@ static void lbs_free_adapter(struct lbs_private *priv) 
	kfifo_free(&priv->event_fifo);

	del_timer(&priv->command_timer);

	del_timer(&priv->tx_lockup_timer);

	del_timer(&priv->auto_deepsleep_timer);

}



static const struct net_device_ops lbs_netdev_ops = {