iwlwifi: pcie: clean iwl_pcie_[rt]xq_inc_wr_ptr a bit

The various code blocks in iwl_pcie_[rt]xq_inc_wr_ptr
finally do the same things, so just merge them
all and make the functions cleaner.

Signed-off-by: Eliad Peller <eliadx.peller@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>

1 files changed, 29 insertions, 34 deletions

diff --git a/drivers/net/wireless/iwlwifi/pcie/tx.c b/drivers/net/wireless/iwlwifi/pcie/tx.c
index 254126447c68..e476d9eda61a 100644
--- a/drivers/net/wireless/iwlwifi/pcie/tx.c
+++ b/drivers/net/wireless/iwlwifi/pcie/tx.c
@@ -296,43 +296,38 @@ void iwl_pcie_txq_inc_wr_ptr(struct iwl_trans *trans, struct iwl_txq *txq)
         if (txq->need_update == 0)
                 return;
 
-        if (trans->cfg->base_params->shadow_reg_enable ||
-            txq_id == trans_pcie->cmd_queue) {
-                /* shadow register enabled */
-                iwl_write32(trans, HBUS_TARG_WRPTR,
-                            txq->q.write_ptr | (txq_id << 8));
-        } else {
-                /* if we're trying to save power */
-                if (test_bit(STATUS_TPOWER_PMI, &trans->status)) {
-                        /* wake up nic if it's powered down ...
-                         * uCode will wake up, and interrupt us again, so next
-                         * time we'll skip this part. */
-                        reg = iwl_read32(trans, CSR_UCODE_DRV_GP1);
-
-                        if (reg & CSR_UCODE_DRV_GP1_BIT_MAC_SLEEP) {
-                                IWL_DEBUG_INFO(trans,
-                                        "Tx queue %d requesting wakeup,"
-                                        " GP1 = 0x%x\n", txq_id, reg);
-                                iwl_set_bit(trans, CSR_GP_CNTRL,
-                                        CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);
-                                return;
-                        }
-
-                        IWL_DEBUG_TX(trans, "Q:%d WR: 0x%x\n", txq_id,
-                                     txq->q.write_ptr);
-
-                        iwl_write_direct32(trans, HBUS_TARG_WRPTR,
-                                     txq->q.write_ptr | (txq_id << 8));
-
+        /*
+         * explicitly wake up the NIC if:
+         * 1. shadow registers aren't enabled
+         * 2. NIC is woken up for CMD regardless of shadow outside this function
+         * 3. there is a chance that the NIC is asleep
+         */
+        if (!trans->cfg->base_params->shadow_reg_enable &&
+            txq_id != trans_pcie->cmd_queue &&
+            test_bit(STATUS_TPOWER_PMI, &trans->status)) {
                 /*
-                 * else not in power-save mode,
-                 * uCode will never sleep when we're
-                 * trying to tx (during RFKILL, we're not trying to tx).
+                 * wake up nic if it's powered down ...
+                 * uCode will wake up, and interrupt us again, so next
+                 * time we'll skip this part.
                  */
-                } else
-                        iwl_write32(trans, HBUS_TARG_WRPTR,
-                                    txq->q.write_ptr | (txq_id << 8));
+                reg = iwl_read32(trans, CSR_UCODE_DRV_GP1);
+
+                if (reg & CSR_UCODE_DRV_GP1_BIT_MAC_SLEEP) {
+                        IWL_DEBUG_INFO(trans, "Tx queue %d requesting wakeup, GP1 = 0x%x\n",
+                                       txq_id, reg);
+                        iwl_set_bit(trans, CSR_GP_CNTRL,
+                                    CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);
+                        return;
+                }
         }
+
+        /*
+         * if not in power-save mode, uCode will never sleep when we're
+         * trying to tx (during RFKILL, we're not trying to tx).
+         */
+        IWL_DEBUG_TX(trans, "Q:%d WR: 0x%x\n", txq_id, txq->q.write_ptr);
+        iwl_write32(trans, HBUS_TARG_WRPTR, txq->q.write_ptr | (txq_id << 8));
+
         txq->need_update = 0;
 }