iwlwifi: move shared pointers to iwl_priv

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 25 insertions, 30 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c
index 04fed5e0724..a10a6e81769 100644
--- a/drivers/net/wireless/iwlwifi/iwl-4965.c
+++ b/drivers/net/wireless/iwlwifi/iwl-4965.c
@@ -274,6 +274,18 @@ static int iwl4965_init_drv(struct iwl_priv *priv)
         spin_lock_init(&priv->hcmd_lock);
         spin_lock_init(&priv->lq_mngr.lock);
 
+        priv->shared_virt = pci_alloc_consistent(priv->pci_dev,
+                                        sizeof(struct iwl4965_shared),
+                                        &priv->shared_phys);
+
+        if (!priv->shared_virt) {
+                ret = -ENOMEM;
+                goto err;
+        }
+
+        memset(priv->shared_virt, 0, sizeof(struct iwl4965_shared));
+
+
         for (i = 0; i < IWL_IBSS_MAC_HASH_SIZE; i++)
                 INIT_LIST_HEAD(&priv->ibss_mac_hash[i]);
 
@@ -546,15 +558,15 @@ static int iwl4965_nic_set_pwr_src(struct iwl_priv *priv, int pwr_max)
 
 static int iwl4965_rx_init(struct iwl_priv *priv, struct iwl4965_rx_queue *rxq)
 {
-        int rc;
+        int ret;
         unsigned long flags;
         unsigned int rb_size;
 
         spin_lock_irqsave(&priv->lock, flags);
-        rc = iwl_grab_nic_access(priv);
-        if (rc) {
+        ret = iwl_grab_nic_access(priv);
+        if (ret) {
                 spin_unlock_irqrestore(&priv->lock, flags);
-                return rc;
+                return ret;
         }
 
         if (priv->cfg->mod_params->amsdu_size_8K)
@@ -574,15 +586,15 @@ static int iwl4965_rx_init(struct iwl_priv *priv, struct iwl4965_rx_queue *rxq)
 
         /* Tell device where in DRAM to update its Rx status */
         iwl_write_direct32(priv, FH_RSCSR_CHNL0_STTS_WPTR_REG,
-                           (priv->hw_setting.shared_phys +
-                                offsetof(struct iwl4965_shared, val0)) >> 4);
+                           (priv->shared_phys +
+                            offsetof(struct iwl4965_shared, rb_closed)) >> 4);
 
         /* Enable Rx DMA, enable host interrupt, Rx buffer size 4k, 256 RBDs */
         iwl_write_direct32(priv, FH_MEM_RCSR_CHNL0_CONFIG_REG,
                            FH_RCSR_RX_CONFIG_CHNL_EN_ENABLE_VAL |
                            FH_RCSR_CHNL0_RX_CONFIG_IRQ_DEST_INT_HOST_VAL |
                            rb_size |
-                             /*0x10 << 4 | */
+                             /* 0x10 << 4 | */
                            (RX_QUEUE_SIZE_LOG <<
                               FH_RCSR_RX_CONFIG_RBDCB_SIZE_BITSHIFT));
 
@@ -1966,7 +1978,7 @@ int iwl4965_alive_notify(struct iwl_priv *priv)
 
         /* Tel 4965 where to find Tx byte count tables */
         iwl_write_prph(priv, IWL49_SCD_DRAM_BASE_ADDR,
-                (priv->hw_setting.shared_phys +
+                (priv->shared_phys +
                  offsetof(struct iwl4965_shared, queues_byte_cnt_tbls)) >> 10);
 
         /* Disable chain mode for all queues */
@@ -2024,29 +2036,14 @@ int iwl4965_alive_notify(struct iwl_priv *priv)
  */
 int iwl4965_hw_set_hw_setting(struct iwl_priv *priv)
 {
-        int ret = 0;
 
         if ((priv->cfg->mod_params->num_of_queues > IWL_MAX_NUM_QUEUES) ||
             (priv->cfg->mod_params->num_of_queues < IWL_MIN_NUM_QUEUES)) {
                 IWL_ERROR("invalid queues_num, should be between %d and %d\n",
                           IWL_MIN_NUM_QUEUES, IWL_MAX_NUM_QUEUES);
-                ret = -EINVAL;
-                goto out;
-        }
-
-        /* Allocate area for Tx byte count tables and Rx queue status */
-        priv->hw_setting.shared_virt =
-            pci_alloc_consistent(priv->pci_dev,
-                                 sizeof(struct iwl4965_shared),
-                                 &priv->hw_setting.shared_phys);
-
-        if (!priv->hw_setting.shared_virt) {
-                ret = -ENOMEM;
-                goto out;
+                return -EINVAL;
         }
 
-        memset(priv->hw_setting.shared_virt, 0, sizeof(struct iwl4965_shared));
-
         priv->hw_setting.max_txq_num = priv->cfg->mod_params->num_of_queues;
         priv->hw_setting.tx_cmd_len = sizeof(struct iwl4965_tx_cmd);
         priv->hw_setting.max_rxq_size = RX_QUEUE_SIZE;
@@ -2061,8 +2058,7 @@ int iwl4965_hw_set_hw_setting(struct iwl_priv *priv)
 
         priv->hw_setting.tx_ant_num = 2;
 
-out:
-        return ret;
+        return 0;
 }
 
 /**
@@ -3014,9 +3010,8 @@ void iwl4965_hw_build_tx_cmd_rate(struct iwl_priv *priv,
 
 int iwl4965_hw_get_rx_read(struct iwl_priv *priv)
 {
-        struct iwl4965_shared *shared_data = priv->hw_setting.shared_virt;
-
-        return IWL_GET_BITS(*shared_data, rb_closed_stts_rb_num);
+        struct iwl4965_shared *s = priv->shared_virt;
+        return le32_to_cpu(s->rb_closed) & 0xFFF;
 }
 
 int iwl4965_hw_get_temperature(struct iwl_priv *priv)
@@ -3149,7 +3144,7 @@ static void iwl4965_txq_update_byte_cnt_tbl(struct iwl_priv *priv,
 {
         int len;
         int txq_id = txq->q.id;
-        struct iwl4965_shared *shared_data = priv->hw_setting.shared_virt;
+        struct iwl4965_shared *shared_data = priv->shared_virt;
 
         len = byte_cnt + IWL_TX_CRC_SIZE + IWL_TX_DELIMITER_SIZE;