From: Zhu Yi <yi.zhu@intel.com>
To: linville@tuxdriver.com
Cc: linux-wireless@vger.kernel.org,
Ron Rindjunsky <ron.rindjunsky@intel.com>,
Tomas Winkler <tomas.winkler@intel.com>
Subject: [PATCH] iwlwifi: remove iwl4965_nic_start function
Date: Fri, 23 May 2008 10:08:40 +0800 [thread overview]
Message-ID: <1211508569-3163-3-git-send-email-yi.zhu@intel.com> (raw)
In-Reply-To: <1211508569-3163-2-git-send-email-yi.zhu@intel.com>
From: Ron Rindjunsky <ron.rindjunsky@intel.com>
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>
---
drivers/net/wireless/iwlwifi/iwl4965-base.c | 10 ++--------
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 d0f948d..1a2d376 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");
--
1.5.3.6
next prev parent reply other threads:[~2008-05-23 2:11 UTC|newest]
Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-05-23 2:08 [PATCH 00/51] iwlwifi driver 05/23 updates Zhu Yi
2008-05-23 2:08 ` [PATCH] iwlwifi: changing irrelevant comment Zhu Yi
2008-05-23 2:08 ` Zhu Yi [this message]
2008-05-23 2:08 ` [PATCH] mac80211: separate Tx and Rx MCS when configuring HT Zhu Yi
2008-05-23 2:08 ` [PATCH] iwlwifi: filling Tx MCS set Zhu Yi
2008-05-23 2:08 ` [PATCH] iwlwifi: rename iwl4965_queue to iwl_queue Zhu Yi
2008-05-23 2:08 ` [PATCH] iwlwifi: rename iwl4965_tx_info to iwl_tx_info Zhu Yi
2008-05-23 2:08 ` [PATCH] iwlwifi: get_hw_cmd_size Zhu Yi
2008-05-23 2:08 ` [PATCH] iwlwifi: remove 4965 from iwl4965_tx_queue_update_write_ptr Zhu Yi
2008-05-23 2:08 ` [PATCH] iwlwifi: remove 4965 prefix from iwl4965_frame Zhu Yi
2008-05-23 2:08 ` [PATCH] iwlwifi: remove 4965 from iwl4965_rate_info Zhu Yi
2008-05-23 2:08 ` [PATCH] iwlwifi: move iwl_bcast_addr to iwlcore Zhu Yi
2008-05-23 2:08 ` [PATCH] iwlwifi: move more station managment into iwl-sta.c Zhu Yi
2008-05-23 2:08 ` [PATCH] iwlwifi: remove 4956 form iwl4965_tx_cmd Zhu Yi
2008-05-23 2:08 ` [PATCH] iwlwifi: refactor ieee80211_get_qos_ctrl Zhu Yi
2008-05-23 2:08 ` [PATCH] iwlwifi: move TX code into iwl-tx.c Zhu Yi
2008-05-23 2:08 ` [PATCH] iwlwifi: don't switch to SGI if not supported by AP Zhu Yi
2008-05-23 2:08 ` [PATCH] iwlwifi: clean up and bug fix for security Zhu Yi
2008-05-23 2:08 ` [PATCH] iwlwifi: rename and move Tx queue activation/deactivation Zhu Yi
2008-05-23 2:08 ` [PATCH] iwlwifi: add rx_handlers stub for iwl5000 Zhu Yi
2008-05-23 2:08 ` [PATCH] iwlwifi: add ucode loaders " Zhu Yi
2008-05-23 2:08 ` [PATCH] iwlwifi: add ucode init flow handling " Zhu Yi
2008-05-23 2:09 ` [PATCH] iwlwifi: iwl5000 WiFi/WiMax coexistence Zhu Yi
2008-05-23 2:09 ` [PATCH] iwlwifi: remove 4965 remainings in iwl-eeprom.c file Zhu Yi
2008-05-23 2:09 ` [PATCH] iwlwifi: add debugfs to disable/enable run time calibration Zhu Yi
2008-05-23 2:09 ` [PATCH] iwlwifi: refactor pci prob flow Zhu Yi
2008-05-23 2:09 ` [PATCH] iwlwifi: trigger event log from debugfs Zhu Yi
2008-05-23 2:09 ` [PATCH] iwlwifi: move iwl_dump_nic_error_log to iwlcore module Zhu Yi
2008-05-23 2:09 ` [PATCH] iwlwifi: add RTC data address for iwl5000 Zhu Yi
2008-05-23 2:09 ` [PATCH] iwlwifi: use uCode error and event tables pointer w.r.t loaded image Zhu Yi
2008-05-23 2:09 ` [PATCH] iwlwifi: increase max payload of iwl_cmd Zhu Yi
2008-05-23 2:09 ` [PATCH] iwlwifi: create drivers debugfs dir under wiphy->debugfsdir Zhu Yi
2008-05-23 2:09 ` [PATCH] iwlwifi: mark 4965 ucode types Zhu Yi
2008-05-23 2:09 ` [PATCH] iwlwifi: remove unused variable form __iwl4965_down Zhu Yi
2008-05-23 2:09 ` [PATCH] iwlwifi: remove notif_missed_beacons variable Zhu Yi
2008-05-23 2:09 ` [PATCH] iwlwifi: clean up alive_start routine Zhu Yi
2008-05-23 2:09 ` [PATCH] iwlwifi: remove 4965 from alive_resp structures Zhu Yi
2008-05-23 2:09 ` [PATCH] iwlwifi: setup correctly L1 L0S pi link values Zhu Yi
2008-05-23 2:09 ` [PATCH] iwlwifi: implement apm reset flow Zhu Yi
2008-05-23 2:09 ` [PATCH] iwlwifi: implement apm stop function Zhu Yi
2008-05-23 2:09 ` [PATCH] iwlwifi: refactor stop master function Zhu Yi
2008-05-23 2:09 ` [PATCH] iwlwifi: move txq_ctx_stop into iwl-tx.c Zhu Yi
2008-05-23 2:09 ` [PATCH] iwlwifi: move iwl_rxq_stop into iwl-rx.c Zhu Yi
2008-05-23 2:09 ` [PATCH] iwlwifi: add remove station functionality Zhu Yi
2008-05-23 2:09 ` [PATCH] iwlwifi: move add sta handler to iwl-sta.c Zhu Yi
2008-05-23 2:09 ` [PATCH] iwlwifi: move iwl_rx_missed_beacon_notif to iwl-rx.c Zhu Yi
2008-05-23 2:09 ` [PATCH] iwlwifi-5000: implement initial calibration for 5000 Zhu Yi
2008-05-23 2:09 ` [PATCH] iwlwifi: activate status ready timeout only for run time ucode Zhu Yi
2008-05-23 2:09 ` [PATCH] iwlwifi: add iwl5000_tx_response structure Zhu Yi
2008-05-23 2:09 ` [PATCH] iwlwifi: move tx response common handlers to iwlcore Zhu Yi
2008-05-23 2:09 ` [PATCH] iwlwifi: impelemnt 5000 tx response path Zhu Yi
2008-05-23 2:09 ` [PATCH] iwlwifi: move 4965 tx response into iwl-4965.c Zhu Yi
2008-05-23 5:44 ` [PATCH] iwlwifi: impelemnt 5000 tx response path Harvey Harrison
2008-05-23 5:59 ` Tomas Winkler
2008-05-23 2:45 ` [PATCH 00/51] iwlwifi driver 05/23 updates Zhu Yi
2008-05-23 12:32 ` John W. Linville
2008-05-23 13:26 ` Holger Schurig
2008-05-23 13:54 ` John W. Linville
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1211508569-3163-3-git-send-email-yi.zhu@intel.com \
--to=yi.zhu@intel.com \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=ron.rindjunsky@intel.com \
--cc=tomas.winkler@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).