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 <[email protected]>
Signed-off-by: Tomas Winkler <[email protected]>
Signed-off-by: John W. Linville <[email protected]>

diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c
index d0f948d2cfab2be71c66372654701b3f6a18ef7d..1a2d3768867ddebb7ab5dabe20664701513d05fc 100644 (file)
--- 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");