aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorRon Rindjunsky <ron.rindjunsky@intel.com>2008-05-15 13:53:54 +0800
committerJohn W. Linville <linville@tuxdriver.com>2008-05-21 21:47:51 -0400
commit0b794d63c5db8d010d1584c694eba97f0391fca6 (patch)
tree6da2aeb1a16cedc7f3c000daaaf54b2880346209 /drivers
parent02883017607dfc60ff188980368adbe942823492 (diff)
iwlwifi: remove iwl4965_nic_start function
This patch moves the contant of iwl4965_nic_start to the only place it is being used. Signed-off-by: Ron Rindjunsky <ron.rindjunsky@intel.com> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl4965-base.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c
index d0f948d2cfa..1a2d3768867 100644
--- a/drivers/net/wireless/iwlwifi/iwl4965-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c
@@ -3958,13 +3958,6 @@ static void iwl4965_dealloc_ucode_pci(struct iwl_priv *priv)
iwl_free_fw_desc(priv->pci_dev, &priv->ucode_boot);
}
-static void iwl4965_nic_start(struct iwl_priv *priv)
-{
- /* Remove all resets to allow NIC to operate */
- iwl_write32(priv, CSR_RESET, 0);
-}
-
-
/**
* iwl4965_read_ucode - Read uCode images from disk file.
*
@@ -4454,7 +4447,8 @@ static int __iwl4965_up(struct iwl_priv *priv)
}
/* start card; "initialize" will load runtime ucode */
- iwl4965_nic_start(priv);
+ /* Remove all resets to allow NIC to operate */
+ iwl_write32(priv, CSR_RESET, 0);
IWL_DEBUG_INFO(DRV_NAME " is coming up\n");