openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Ron Rindjunsky 2008-05-15 13:53:54 +08:00 committed by John W. Linville
parent 0288301760
commit 0b794d63c5
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/net/wireless/iwlwifi/iwl4965-base.c
View File

@ -3958,13 +3958,6 @@ static void iwl4965_dealloc_ucode_pci(struct iwl_priv *priv)
iwl_free_fw_desc(priv->pci_dev, &priv->ucode_boot); 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. * 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 */ /* 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"); IWL_DEBUG_INFO(DRV_NAME " is coming up\n");