iwlwifi: remove messages from queue wake/stop

The only reason we ever stop/wake queues at
the transport level is now that they become
full (or non-full), so the messages aren't
useful any more -- remove them.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-int.h b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-int.h
index dd64e69b1569bcb96a23f92c6442653f9ff7698e..c0e68097fcb5590a1fa39904ead35aabac88d7e3 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-int.h
+++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-int.h
@@ -409,7 +409,7 @@ static inline u8 iwl_get_queue_ac(struct iwl_tx_queue *txq)
 }
 
 static inline void iwl_wake_queue(struct iwl_trans *trans,
-                                 struct iwl_tx_queue *txq, const char *msg)
+                                 struct iwl_tx_queue *txq)
 {
        u8 queue = txq->swq_id;
        u8 ac = queue & 3;
@@ -420,19 +420,19 @@ static inline void iwl_wake_queue(struct iwl_trans *trans,
        if (test_and_clear_bit(hwq, trans_pcie->queue_stopped)) {
                if (atomic_dec_return(&trans_pcie->queue_stop_count[ac]) <= 0) {
                        iwl_op_mode_queue_not_full(trans->op_mode, ac);
-                       IWL_DEBUG_TX_QUEUES(trans, "Wake hwq %d ac %d. %s",
-                                           hwq, ac, msg);
+                       IWL_DEBUG_TX_QUEUES(trans, "Wake hwq %d ac %d",
+                                           hwq, ac);
                } else {
-                       IWL_DEBUG_TX_QUEUES(trans, "Don't wake hwq %d ac %d"
-                                           " stop count %d. %s",
-                                           hwq, ac, atomic_read(&trans_pcie->
-                                           queue_stop_count[ac]), msg);
+                       IWL_DEBUG_TX_QUEUES(trans,
+                               "Don't wake hwq %d ac %d stop count %d",
+                               hwq, ac,
+                               atomic_read(&trans_pcie->queue_stop_count[ac]));
                }
        }
 }
 
 static inline void iwl_stop_queue(struct iwl_trans *trans,
-                                 struct iwl_tx_queue *txq, const char *msg)
+                                 struct iwl_tx_queue *txq)
 {
        u8 queue = txq->swq_id;
        u8 ac = queue & 3;
@@ -443,19 +443,19 @@ static inline void iwl_stop_queue(struct iwl_trans *trans,
        if (!test_and_set_bit(hwq, trans_pcie->queue_stopped)) {
                if (atomic_inc_return(&trans_pcie->queue_stop_count[ac]) > 0) {
                        iwl_op_mode_queue_full(trans->op_mode, ac);
-                       IWL_DEBUG_TX_QUEUES(trans, "Stop hwq %d ac %d"
-                                           " stop count %d. %s",
-                                           hwq, ac, atomic_read(&trans_pcie->
-                                           queue_stop_count[ac]), msg);
+                       IWL_DEBUG_TX_QUEUES(trans,
+                               "Stop hwq %d ac %d stop count %d",
+                               hwq, ac,
+                               atomic_read(&trans_pcie->queue_stop_count[ac]));
                } else {
-                       IWL_DEBUG_TX_QUEUES(trans, "Don't stop hwq %d ac %d"
-                                           " stop count %d. %s",
-                                           hwq, ac, atomic_read(&trans_pcie->
-                                           queue_stop_count[ac]), msg);
+                       IWL_DEBUG_TX_QUEUES(trans,
+                               "Don't stop hwq %d ac %d stop count %d",
+                               hwq, ac,
+                               atomic_read(&trans_pcie->queue_stop_count[ac]));
                }
        } else {
-               IWL_DEBUG_TX_QUEUES(trans, "stop hwq %d, but it is stopped/ %s",
-                                   hwq, msg);
+               IWL_DEBUG_TX_QUEUES(trans, "stop hwq %d, but it is stopped",
+                                   hwq);
        }
 }
 

diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c b/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
index 3b8a5fb771f6380aa309c79157d91d56b44172f6..6172651d7e250ab06562fdabd714742711c02d1c 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
+++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
@@ -1487,7 +1487,7 @@ static int iwl_trans_pcie_tx(struct iwl_trans *trans, struct sk_buff *skb,
                        txq->need_update = 1;
                        iwl_txq_update_write_ptr(trans, txq);
                } else {
-                       iwl_stop_queue(trans, txq, "Queue is full");
+                       iwl_stop_queue(trans, txq);
                }
        }
        spin_unlock(&txq->lock);
@@ -1591,7 +1591,7 @@ static int iwl_trans_pcie_reclaim(struct iwl_trans *trans, int sta_id, int tid,
                                tfd_num, ssn);
                freed = iwl_tx_queue_reclaim(trans, txq_id, tfd_num, skbs);
                if (iwl_queue_space(&txq->q) > txq->q.low_mark)
-                       iwl_wake_queue(trans, txq, "Packets reclaimed");
+                       iwl_wake_queue(trans, txq);
        }
 
        spin_unlock(&txq->lock);