diff options
author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2012-01-04 07:23:20 -0500 |
---|---|---|
committer | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2012-02-02 17:35:53 -0500 |
commit | ea4caade104490de0fadb64660f9e228c050fb3d (patch) | |
tree | 8a73bba4502ea5865f969b567d6689e7bc01e60b /drivers/net/wireless/iwlwifi/iwl-ucode.c | |
parent | 1042db2af183b96cdce5972014d85e8bca0634ad (diff) |
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.c | 4 |
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 5de8b5beb091..08483d785e2c 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] = { | |||
83 | static void iwl_free_fw_desc(struct iwl_bus *bus, struct fw_desc *desc) | 83 | static void iwl_free_fw_desc(struct iwl_bus *bus, struct fw_desc *desc) |
84 | { | 84 | { |
85 | if (desc->v_addr) | 85 | if (desc->v_addr) |
86 | dma_free_coherent(bus->dev, desc->len, | 86 | dma_free_coherent(trans(bus)->dev, desc->len, |
87 | desc->v_addr, desc->p_addr); | 87 | desc->v_addr, desc->p_addr); |
88 | desc->v_addr = NULL; | 88 | desc->v_addr = NULL; |
89 | desc->len = 0; | 89 | desc->len = 0; |
@@ -110,7 +110,7 @@ int iwl_alloc_fw_desc(struct iwl_bus *bus, struct fw_desc *desc, | |||
110 | return -EINVAL; | 110 | return -EINVAL; |
111 | } | 111 | } |
112 | 112 | ||
113 | desc->v_addr = dma_alloc_coherent(bus->dev, len, | 113 | desc->v_addr = dma_alloc_coherent(trans(bus)->dev, len, |
114 | &desc->p_addr, GFP_KERNEL); | 114 | &desc->p_addr, GFP_KERNEL); |
115 | if (!desc->v_addr) | 115 | if (!desc->v_addr) |
116 | return -ENOMEM; | 116 | return -ENOMEM; |