Skip to content

Commit

Permalink
libertas: remove unused cmd_pending waitq
Browse files Browse the repository at this point in the history
Signed-off-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Dan Williams authored and John W. Linville committed Jul 27, 2010
1 parent d06956b commit 97c5e27
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 9 deletions.
1 change: 0 additions & 1 deletion drivers/net/wireless/libertas/dev.h
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,6 @@ struct lbs_private {
struct cmd_ctrl_node *cur_cmd;
struct list_head cmdfreeq; /* free command buffers */
struct list_head cmdpendingq; /* pending command buffers */
wait_queue_head_t cmd_pending;
struct timer_list command_timer;
int cmd_timed_out;

Expand Down
8 changes: 0 additions & 8 deletions drivers/net/wireless/libertas/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -502,12 +502,6 @@ static int lbs_thread(void *data)
if (!priv->dnld_sent && !priv->cur_cmd)
lbs_execute_next_command(priv);

/* Wake-up command waiters which can't sleep in
* lbs_prepare_and_send_command
*/
if (!list_empty(&priv->cmdpendingq))
wake_up_all(&priv->cmd_pending);

spin_lock_irq(&priv->driver_lock);
if (!priv->dnld_sent && priv->tx_pending_len > 0) {
int ret = priv->hw_host_to_card(priv, MVMS_DAT,
Expand All @@ -533,7 +527,6 @@ static int lbs_thread(void *data)

del_timer(&priv->command_timer);
del_timer(&priv->auto_deepsleep_timer);
wake_up_all(&priv->cmd_pending);

lbs_deb_leave(LBS_DEB_THREAD);
return 0;
Expand Down Expand Up @@ -741,7 +734,6 @@ static int lbs_init_adapter(struct lbs_private *priv)
INIT_LIST_HEAD(&priv->cmdpendingq);

spin_lock_init(&priv->driver_lock);
init_waitqueue_head(&priv->cmd_pending);

/* Allocate the command buffers */
if (lbs_allocate_cmd_buffer(priv)) {
Expand Down

0 comments on commit 97c5e27

Please sign in to comment.