summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-ucode.c
diff options
context:
space:
mode:
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>2012-01-04 14:23:20 +0200
committerWey-Yi Guy <wey-yi.w.guy@intel.com>2012-02-02 14:35:53 -0800
commitea4caade104490de0fadb64660f9e228c050fb3d (patch)
tree8a73bba4502ea5865f969b567d6689e7bc01e60b /drivers/net/wireless/iwlwifi/iwl-ucode.c
parent1042db2af183b96cdce5972014d85e8bca0634ad (diff)
downloadop-kernel-dev-ea4caade104490de0fadb64660f9e228c050fb3d.zip
op-kernel-dev-ea4caade104490de0fadb64660f9e228c050fb3d.tar.gz
iwlwifi: remove the pointer to dev from the bus layer
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-ucode.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-ucode.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-ucode.c b/drivers/net/wireless/iwlwifi/iwl-ucode.c
index 5de8b5b..08483d7 100644
--- a/drivers/net/wireless/iwlwifi/iwl-ucode.c
+++ b/drivers/net/wireless/iwlwifi/iwl-ucode.c
@@ -83,7 +83,7 @@ static struct iwl_wimax_coex_event_entry cu_priorities[COEX_NUM_OF_EVENTS] = {
static void iwl_free_fw_desc(struct iwl_bus *bus, struct fw_desc *desc)
{
if (desc->v_addr)
- dma_free_coherent(bus->dev, desc->len,
+ dma_free_coherent(trans(bus)->dev, desc->len,
desc->v_addr, desc->p_addr);
desc->v_addr = NULL;
desc->len = 0;
@@ -110,7 +110,7 @@ int iwl_alloc_fw_desc(struct iwl_bus *bus, struct fw_desc *desc,
return -EINVAL;
}
- desc->v_addr = dma_alloc_coherent(bus->dev, len,
+ desc->v_addr = dma_alloc_coherent(trans(bus)->dev, len,
&desc->p_addr, GFP_KERNEL);
if (!desc->v_addr)
return -ENOMEM;
OpenPOWER on IntegriCloud