Skip to content

Commit

Permalink
iwlwifi: remove iwl4965_nic_start function
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Ron Rindjunsky authored and John W. Linville committed May 22, 2008
1 parent 0288301 commit 0b794d6
Showing 1 changed file with 2 additions and 8 deletions.
10 changes: 2 additions & 8 deletions drivers/net/wireless/iwlwifi/iwl4965-base.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*
Expand Down Expand Up @@ -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");

Expand Down

0 comments on commit 0b794d6

Please sign in to comment.