aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
diff options
context:
space:
mode:
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>2011-05-31 01:52:10 -0400
committerWey-Yi Guy <wey-yi.w.guy@intel.com>2011-06-18 11:06:24 -0400
commit3599d39a8525b01540e2c7ec8c5d0df0dd11d6cf (patch)
treefb9c0b512ac042c1b483d6ff754cd1fd8af5e135 /drivers/net/wireless/iwlwifi/iwl-agn-lib.c
parenta48709c5d076aa3a3f9b6426f462abe6bf432b11 (diff)
iwlagn: add get_dev to iwl_bus_ops
Bus specific layer must know how to return the struct device* of the device. Implement that as a callback of iwl_bus_ops and use that callback instead of using the priv->pdev pointer which is meant to disappear soon. Since the struct device * is needed in hot path, iwl_bus holds a pointer to it instead of calling get_dev all the time. Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn-lib.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn-lib.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
index 99d473f527d5..4c11edcb4e61 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
@@ -966,9 +966,10 @@ void iwlagn_rx_queue_free(struct iwl_priv *priv, struct iwl_rx_queue *rxq)
966 } 966 }
967 } 967 }
968 968
969 dma_free_coherent(&priv->pci_dev->dev, 4 * RX_QUEUE_SIZE, rxq->bd, 969 dma_free_coherent(priv->bus.dev, 4 * RX_QUEUE_SIZE,
970 rxq->bd_dma); 970 rxq->bd, rxq->bd_dma);
971 dma_free_coherent(&priv->pci_dev->dev, sizeof(struct iwl_rb_status), 971 dma_free_coherent(priv->bus.dev,
972 sizeof(struct iwl_rb_status),
972 rxq->rb_stts, rxq->rb_stts_dma); 973 rxq->rb_stts, rxq->rb_stts_dma);
973 rxq->bd = NULL; 974 rxq->bd = NULL;
974 rxq->rb_stts = NULL; 975 rxq->rb_stts = NULL;