aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>2008-06-11 21:47:19 -0400
committerJohn W. Linville <linville@tuxdriver.com>2008-06-14 12:18:10 -0400
commit58d0f3610e0c1fd31a2ff3b89879211727292771 (patch)
treee260c4adc2b9e7e3427b26a7a22bac4b83eac722 /drivers/net
parentbe1f3ab6e5e9788fd2985117b40755130058a2be (diff)
iwlwifi: remove iwlcore_low_level_notify
This patch removes the iwlcore_low_level_notify. The notification chain is not required in this level. Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Zhu Yi <yi.zhu@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-core.c31
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-core.h9
-rw-r--r--drivers/net/wireless/iwlwifi/iwl4965-base.c14
3 files changed, 7 insertions, 47 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c
index 80964635842..fa17cd9838c 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.c
+++ b/drivers/net/wireless/iwlwifi/iwl-core.c
@@ -965,37 +965,6 @@ void iwl_uninit_drv(struct iwl_priv *priv)
965} 965}
966EXPORT_SYMBOL(iwl_uninit_drv); 966EXPORT_SYMBOL(iwl_uninit_drv);
967 967
968
969
970/* Low level driver call this function to update iwlcore with
971 * driver status.
972 */
973int iwlcore_low_level_notify(struct iwl_priv *priv,
974 enum iwlcore_card_notify notify)
975{
976 int ret;
977 switch (notify) {
978 case IWLCORE_INIT_EVT:
979 ret = iwl_rfkill_init(priv);
980 if (ret)
981 IWL_ERROR("Unable to initialize RFKILL system. "
982 "Ignoring error: %d\n", ret);
983 iwl_power_initialize(priv);
984 break;
985 case IWLCORE_START_EVT:
986 iwl_power_update_mode(priv, 1);
987 break;
988 case IWLCORE_STOP_EVT:
989 break;
990 case IWLCORE_REMOVE_EVT:
991 iwl_rfkill_unregister(priv);
992 break;
993 }
994
995 return 0;
996}
997EXPORT_SYMBOL(iwlcore_low_level_notify);
998
999int iwl_send_statistics_request(struct iwl_priv *priv, u8 flags) 968int iwl_send_statistics_request(struct iwl_priv *priv, u8 flags)
1000{ 969{
1001 u32 stat_flags = 0; 970 u32 stat_flags = 0;
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.h b/drivers/net/wireless/iwlwifi/iwl-core.h
index 054ab7cb421..66266655317 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.h
+++ b/drivers/net/wireless/iwlwifi/iwl-core.h
@@ -359,15 +359,6 @@ static inline int iwl_is_ready_rf(struct iwl_priv *priv)
359 return iwl_is_ready(priv); 359 return iwl_is_ready(priv);
360} 360}
361 361
362enum iwlcore_card_notify {
363 IWLCORE_INIT_EVT = 0,
364 IWLCORE_START_EVT = 1,
365 IWLCORE_STOP_EVT = 2,
366 IWLCORE_REMOVE_EVT = 3,
367};
368
369int iwlcore_low_level_notify(struct iwl_priv *priv,
370 enum iwlcore_card_notify notify);
371extern int iwl_send_statistics_request(struct iwl_priv *priv, u8 flags); 362extern int iwl_send_statistics_request(struct iwl_priv *priv, u8 flags);
372extern int iwl_verify_ucode(struct iwl_priv *priv); 363extern int iwl_verify_ucode(struct iwl_priv *priv);
373extern void iwl_rf_kill_ct_config(struct iwl_priv *priv); 364extern void iwl_rf_kill_ct_config(struct iwl_priv *priv);
diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c
index 5aec7d5fb9c..81a1c22874a 100644
--- a/drivers/net/wireless/iwlwifi/iwl4965-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c
@@ -2271,7 +2271,7 @@ static void iwl_alive_start(struct iwl_priv *priv)
2271 if (priv->error_recovering) 2271 if (priv->error_recovering)
2272 iwl4965_error_recovery(priv); 2272 iwl4965_error_recovery(priv);
2273 2273
2274 iwlcore_low_level_notify(priv, IWLCORE_START_EVT); 2274 iwl_power_update_mode(priv, 1);
2275 ieee80211_notify_mac(priv->hw, IEEE80211_NOTIFY_RE_ASSOC); 2275 ieee80211_notify_mac(priv->hw, IEEE80211_NOTIFY_RE_ASSOC);
2276 2276
2277 if (test_and_clear_bit(STATUS_MODE_PENDING, &priv->status)) 2277 if (test_and_clear_bit(STATUS_MODE_PENDING, &priv->status))
@@ -2297,8 +2297,6 @@ static void __iwl4965_down(struct iwl_priv *priv)
2297 2297
2298 iwl_leds_unregister(priv); 2298 iwl_leds_unregister(priv);
2299 2299
2300 iwlcore_low_level_notify(priv, IWLCORE_STOP_EVT);
2301
2302 iwlcore_clear_stations_table(priv); 2300 iwlcore_clear_stations_table(priv);
2303 2301
2304 /* Unblock any waiting calls */ 2302 /* Unblock any waiting calls */
@@ -4460,8 +4458,11 @@ static int iwl4965_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
4460 if (err) 4458 if (err)
4461 IWL_ERROR("failed to create debugfs files\n"); 4459 IWL_ERROR("failed to create debugfs files\n");
4462 4460
4463 /* notify iwlcore to init */ 4461 err = iwl_rfkill_init(priv);
4464 iwlcore_low_level_notify(priv, IWLCORE_INIT_EVT); 4462 if (err)
4463 IWL_ERROR("Unable to initialize RFKILL system. "
4464 "Ignoring error: %d\n", err);
4465 iwl_power_initialize(priv);
4465 return 0; 4466 return 0;
4466 4467
4467 out_remove_sysfs: 4468 out_remove_sysfs:
@@ -4524,8 +4525,7 @@ static void __devexit iwl4965_pci_remove(struct pci_dev *pdev)
4524 } 4525 }
4525 } 4526 }
4526 4527
4527 iwlcore_low_level_notify(priv, IWLCORE_REMOVE_EVT); 4528 iwl_rfkill_unregister(priv);
4528
4529 iwl4965_dealloc_ucode_pci(priv); 4529 iwl4965_dealloc_ucode_pci(priv);
4530 4530
4531 if (priv->rxq.bd) 4531 if (priv->rxq.bd)