diff options
author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2008-06-11 21:47:19 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-06-14 12:18:10 -0400 |
commit | 58d0f3610e0c1fd31a2ff3b89879211727292771 (patch) | |
tree | e260c4adc2b9e7e3427b26a7a22bac4b83eac722 /drivers/net/wireless/iwlwifi/iwl4965-base.c | |
parent | be1f3ab6e5e9788fd2985117b40755130058a2be (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/wireless/iwlwifi/iwl4965-base.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl4965-base.c | 14 |
1 files changed, 7 insertions, 7 deletions
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) |