diff options
author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2011-05-31 01:52:10 -0400 |
---|---|---|
committer | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2011-06-18 11:06:24 -0400 |
commit | 3599d39a8525b01540e2c7ec8c5d0df0dd11d6cf (patch) | |
tree | fb9c0b512ac042c1b483d6ff754cd1fd8af5e135 /drivers/net/wireless/iwlwifi/iwl-sv-open.c | |
parent | a48709c5d076aa3a3f9b6426f462abe6bf432b11 (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-sv-open.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-sv-open.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-sv-open.c b/drivers/net/wireless/iwlwifi/iwl-sv-open.c index 6f626425144e..c00aa5a1b8b8 100644 --- a/drivers/net/wireless/iwlwifi/iwl-sv-open.c +++ b/drivers/net/wireless/iwlwifi/iwl-sv-open.c | |||
@@ -180,7 +180,7 @@ void iwl_testmode_init(struct iwl_priv *priv) | |||
180 | 180 | ||
181 | static void iwl_trace_cleanup(struct iwl_priv *priv) | 181 | static void iwl_trace_cleanup(struct iwl_priv *priv) |
182 | { | 182 | { |
183 | struct device *dev = &priv->pci_dev->dev; | 183 | struct device *dev = priv->bus.dev; |
184 | 184 | ||
185 | if (priv->testmode_trace.trace_enabled) { | 185 | if (priv->testmode_trace.trace_enabled) { |
186 | if (priv->testmode_trace.cpu_addr && | 186 | if (priv->testmode_trace.cpu_addr && |
@@ -484,7 +484,7 @@ static int iwl_testmode_trace(struct ieee80211_hw *hw, struct nlattr **tb) | |||
484 | struct iwl_priv *priv = hw->priv; | 484 | struct iwl_priv *priv = hw->priv; |
485 | struct sk_buff *skb; | 485 | struct sk_buff *skb; |
486 | int status = 0; | 486 | int status = 0; |
487 | struct device *dev = &priv->pci_dev->dev; | 487 | struct device *dev = priv->bus.dev; |
488 | 488 | ||
489 | switch (nla_get_u32(tb[IWL_TM_ATTR_COMMAND])) { | 489 | switch (nla_get_u32(tb[IWL_TM_ATTR_COMMAND])) { |
490 | case IWL_TM_CMD_APP2DEV_BEGIN_TRACE: | 490 | case IWL_TM_CMD_APP2DEV_BEGIN_TRACE: |