aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi
diff options
context:
space:
mode:
authorBen Cahill <ben.m.cahill@intel.com>2009-10-09 16:20:27 -0400
committerJohn W. Linville <linville@tuxdriver.com>2009-10-27 16:47:59 -0400
commit008a9e3e3c37abd7f56d2478fe92d5874de3630a (patch)
tree751da4ddaf477733deee67759a95aa3b166448a6 /drivers/net/wireless/iwlwifi
parent743cdf1b65656faf1e6f1f74278c52b89a0b7360 (diff)
iwl3945: move iwl_power_initialize()
iwl_power_initialize() initializes driver data (not device hardware), and does not need to execute more than once (when the driver initializes). Therefore, it does not belong in iwl3945_apm_init(), which initializes hardware, and may run more than once. Move it to iwl3945_pci_probe(), where it will run only once. This agrees with similar placement in iwl-agn.c's iwl_pci_probe(), although placement under "services" seemed more appropriate than under "mac80211". Signed-off-by: Ben Cahill <ben.m.cahill@intel.com> Signed-off-by: Reinette Chatre <reinette.chatre@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-3945.c2
-rw-r--r--drivers/net/wireless/iwlwifi/iwl3945-base.c1
2 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wireless/iwlwifi/iwl-3945.c
index f8ce96c94c6b..4e15a8e20d09 100644
--- a/drivers/net/wireless/iwlwifi/iwl-3945.c
+++ b/drivers/net/wireless/iwlwifi/iwl-3945.c
@@ -991,8 +991,6 @@ static int iwl3945_apm_init(struct iwl_priv *priv)
991{ 991{
992 int ret; 992 int ret;
993 993
994 iwl_power_initialize(priv);
995
996 /* Configure chip clock phase-lock-loop */ 994 /* Configure chip clock phase-lock-loop */
997 iwl_set_bit(priv, CSR_ANA_PLL_CFG, CSR39_ANA_PLL_CFG_VAL); 995 iwl_set_bit(priv, CSR_ANA_PLL_CFG, CSR39_ANA_PLL_CFG_VAL);
998 996
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index 2406b73e9093..e0e566c932c5 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -4064,6 +4064,7 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
4064 &priv->bands[IEEE80211_BAND_2GHZ].channels[5]); 4064 &priv->bands[IEEE80211_BAND_2GHZ].channels[5]);
4065 iwl3945_setup_deferred_work(priv); 4065 iwl3945_setup_deferred_work(priv);
4066 iwl3945_setup_rx_handlers(priv); 4066 iwl3945_setup_rx_handlers(priv);
4067 iwl_power_initialize(priv);
4067 4068
4068 /********************************* 4069 /*********************************
4069 * 8. Setup and Register mac80211 4070 * 8. Setup and Register mac80211