diff options
| author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2011-07-10 15:39:57 +0300 |
|---|---|---|
| committer | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2011-07-21 07:29:35 -0700 |
| commit | 0286cee0d2b6357e8e30d817bbce8ff166f358b5 (patch) | |
| tree | 958218c4b25a816b6093f7a8fded0b1bea0c21f2 /drivers/net/wireless/iwlwifi/iwl-trans.c | |
| parent | 392f8b789a4c96b39d527ff8ea5ceba20cd79d56 (diff) | |
| download | lwn-0286cee0d2b6357e8e30d817bbce8ff166f358b5.tar.gz lwn-0286cee0d2b6357e8e30d817bbce8ff166f358b5.zip | |
iwlagn: move iwl_prepare_card_hw to the transport layer
This function is really related to the transport layer - move it.
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-trans.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-trans.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans.c b/drivers/net/wireless/iwlwifi/iwl-trans.c index e9c7de9f8e0f..88ab20abe253 100644 --- a/drivers/net/wireless/iwlwifi/iwl-trans.c +++ b/drivers/net/wireless/iwlwifi/iwl-trans.c @@ -647,11 +647,11 @@ static int iwl_set_hw_ready(struct iwl_priv *priv) } /* Note: returns standard 0/-ERROR code */ -int iwl_prepare_card_hw(struct iwl_priv *priv) +static int iwl_trans_prepare_card_hw(struct iwl_priv *priv) { int ret; - IWL_DEBUG_INFO(priv, "iwl_prepare_card_hw enter\n"); + IWL_DEBUG_INFO(priv, "iwl_trans_prepare_card_hw enter\n"); ret = iwl_set_hw_ready(priv); if (ret >= 0) @@ -682,7 +682,7 @@ static int iwl_trans_start_device(struct iwl_priv *priv) priv->ucode_owner = IWL_OWNERSHIP_DRIVER; if ((priv->cfg->sku & EEPROM_SKU_CAP_AMT_ENABLE) && - iwl_prepare_card_hw(priv)) { + iwl_trans_prepare_card_hw(priv)) { IWL_WARN(priv, "Exit HW not ready\n"); return -EIO; } @@ -1123,7 +1123,9 @@ static void iwl_trans_free(struct iwl_priv *priv) static const struct iwl_trans_ops trans_ops = { .start_device = iwl_trans_start_device, + .prepare_card_hw = iwl_trans_prepare_card_hw, .stop_device = iwl_trans_stop_device, + .tx_start = iwl_trans_tx_start, .rx_free = iwl_trans_rx_free, |