libertas: remove unused cmd_pending waitq

Signed-off-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/libertas/dev.h b/drivers/net/wireless/libertas/dev.h
index 85cdc9a0a637c77a3e52ed29f8dc6d5d751f970d..3c7e255e18c7617e34af21c23af288f68047ab34 100644 (file)
--- a/drivers/net/wireless/libertas/dev.h
+++ b/drivers/net/wireless/libertas/dev.h
@@ -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;
 

diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c
index 2398fc5170ef0d77508a8dc199fa1b760ad46129..258967144b962684a50c5a50c48591b2de14bbe9 100644 (file)
--- a/drivers/net/wireless/libertas/main.c
+++ b/drivers/net/wireless/libertas/main.c
@@ -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,
@@ -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;
@@ -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)) {