diff options
author | Stanislaw Gruszka <sgruszka@redhat.com> | 2010-07-30 10:41:08 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-08-16 15:26:36 -0400 |
commit | c240879f3488ae0904a7ba5bdaaa54638b2d8852 (patch) | |
tree | 40de89ddc714e17dfe7db5b538b2c7c0cc233245 | |
parent | fc88518916793af8ad6a02e05ff254d95c36d875 (diff) |
iwlwifi: make scan workqueue functions static
We do not need export iwl_bg.*scan.*() functions just for initialize
workqueue in other module. Making that functions static helps with
iwl-scan.c code review a bit.
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-core.h | 4 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-scan.c | 12 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl3945-base.c | 6 |
3 files changed, 6 insertions, 16 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.h b/drivers/net/wireless/iwlwifi/iwl-core.h index 4a71dfb10a1..a8fa31f360e 100644 --- a/drivers/net/wireless/iwlwifi/iwl-core.h +++ b/drivers/net/wireless/iwlwifi/iwl-core.h | |||
@@ -530,7 +530,6 @@ int iwl_scan_cancel_timeout(struct iwl_priv *priv, unsigned long ms); | |||
530 | int iwl_mac_hw_scan(struct ieee80211_hw *hw, | 530 | int iwl_mac_hw_scan(struct ieee80211_hw *hw, |
531 | struct ieee80211_vif *vif, | 531 | struct ieee80211_vif *vif, |
532 | struct cfg80211_scan_request *req); | 532 | struct cfg80211_scan_request *req); |
533 | void iwl_bg_start_internal_scan(struct work_struct *work); | ||
534 | void iwl_internal_short_hw_scan(struct iwl_priv *priv); | 533 | void iwl_internal_short_hw_scan(struct iwl_priv *priv); |
535 | int iwl_force_reset(struct iwl_priv *priv, int mode, bool external); | 534 | int iwl_force_reset(struct iwl_priv *priv, int mode, bool external); |
536 | u16 iwl_fill_probe_req(struct iwl_priv *priv, struct ieee80211_mgmt *frame, | 535 | u16 iwl_fill_probe_req(struct iwl_priv *priv, struct ieee80211_mgmt *frame, |
@@ -542,9 +541,6 @@ u16 iwl_get_active_dwell_time(struct iwl_priv *priv, | |||
542 | u16 iwl_get_passive_dwell_time(struct iwl_priv *priv, | 541 | u16 iwl_get_passive_dwell_time(struct iwl_priv *priv, |
543 | enum ieee80211_band band, | 542 | enum ieee80211_band band, |
544 | struct ieee80211_vif *vif); | 543 | struct ieee80211_vif *vif); |
545 | void iwl_bg_scan_check(struct work_struct *data); | ||
546 | void iwl_bg_abort_scan(struct work_struct *work); | ||
547 | void iwl_bg_scan_completed(struct work_struct *work); | ||
548 | void iwl_setup_scan_deferred_work(struct iwl_priv *priv); | 544 | void iwl_setup_scan_deferred_work(struct iwl_priv *priv); |
549 | 545 | ||
550 | /* For faster active scanning, scan will move to the next channel if fewer than | 546 | /* For faster active scanning, scan will move to the next channel if fewer than |
diff --git a/drivers/net/wireless/iwlwifi/iwl-scan.c b/drivers/net/wireless/iwlwifi/iwl-scan.c index a4b3663a262..ac510840519 100644 --- a/drivers/net/wireless/iwlwifi/iwl-scan.c +++ b/drivers/net/wireless/iwlwifi/iwl-scan.c | |||
@@ -378,7 +378,7 @@ void iwl_internal_short_hw_scan(struct iwl_priv *priv) | |||
378 | queue_work(priv->workqueue, &priv->start_internal_scan); | 378 | queue_work(priv->workqueue, &priv->start_internal_scan); |
379 | } | 379 | } |
380 | 380 | ||
381 | void iwl_bg_start_internal_scan(struct work_struct *work) | 381 | static void iwl_bg_start_internal_scan(struct work_struct *work) |
382 | { | 382 | { |
383 | struct iwl_priv *priv = | 383 | struct iwl_priv *priv = |
384 | container_of(work, struct iwl_priv, start_internal_scan); | 384 | container_of(work, struct iwl_priv, start_internal_scan); |
@@ -418,9 +418,8 @@ void iwl_bg_start_internal_scan(struct work_struct *work) | |||
418 | unlock: | 418 | unlock: |
419 | mutex_unlock(&priv->mutex); | 419 | mutex_unlock(&priv->mutex); |
420 | } | 420 | } |
421 | EXPORT_SYMBOL(iwl_bg_start_internal_scan); | ||
422 | 421 | ||
423 | void iwl_bg_scan_check(struct work_struct *data) | 422 | static void iwl_bg_scan_check(struct work_struct *data) |
424 | { | 423 | { |
425 | struct iwl_priv *priv = | 424 | struct iwl_priv *priv = |
426 | container_of(data, struct iwl_priv, scan_check.work); | 425 | container_of(data, struct iwl_priv, scan_check.work); |
@@ -439,7 +438,6 @@ void iwl_bg_scan_check(struct work_struct *data) | |||
439 | } | 438 | } |
440 | mutex_unlock(&priv->mutex); | 439 | mutex_unlock(&priv->mutex); |
441 | } | 440 | } |
442 | EXPORT_SYMBOL(iwl_bg_scan_check); | ||
443 | 441 | ||
444 | /** | 442 | /** |
445 | * iwl_fill_probe_req - fill in all required fields and IE for probe request | 443 | * iwl_fill_probe_req - fill in all required fields and IE for probe request |
@@ -489,7 +487,7 @@ u16 iwl_fill_probe_req(struct iwl_priv *priv, struct ieee80211_mgmt *frame, | |||
489 | } | 487 | } |
490 | EXPORT_SYMBOL(iwl_fill_probe_req); | 488 | EXPORT_SYMBOL(iwl_fill_probe_req); |
491 | 489 | ||
492 | void iwl_bg_abort_scan(struct work_struct *work) | 490 | static void iwl_bg_abort_scan(struct work_struct *work) |
493 | { | 491 | { |
494 | struct iwl_priv *priv = container_of(work, struct iwl_priv, abort_scan); | 492 | struct iwl_priv *priv = container_of(work, struct iwl_priv, abort_scan); |
495 | 493 | ||
@@ -504,9 +502,8 @@ void iwl_bg_abort_scan(struct work_struct *work) | |||
504 | iwl_send_scan_abort(priv); | 502 | iwl_send_scan_abort(priv); |
505 | mutex_unlock(&priv->mutex); | 503 | mutex_unlock(&priv->mutex); |
506 | } | 504 | } |
507 | EXPORT_SYMBOL(iwl_bg_abort_scan); | ||
508 | 505 | ||
509 | void iwl_bg_scan_completed(struct work_struct *work) | 506 | static void iwl_bg_scan_completed(struct work_struct *work) |
510 | { | 507 | { |
511 | struct iwl_priv *priv = | 508 | struct iwl_priv *priv = |
512 | container_of(work, struct iwl_priv, scan_completed); | 509 | container_of(work, struct iwl_priv, scan_completed); |
@@ -555,7 +552,6 @@ void iwl_bg_scan_completed(struct work_struct *work) | |||
555 | if (!internal) | 552 | if (!internal) |
556 | ieee80211_scan_completed(priv->hw, false); | 553 | ieee80211_scan_completed(priv->hw, false); |
557 | } | 554 | } |
558 | EXPORT_SYMBOL(iwl_bg_scan_completed); | ||
559 | 555 | ||
560 | void iwl_setup_scan_deferred_work(struct iwl_priv *priv) | 556 | void iwl_setup_scan_deferred_work(struct iwl_priv *priv) |
561 | { | 557 | { |
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c index bb955d2013e..de6d592af74 100644 --- a/drivers/net/wireless/iwlwifi/iwl3945-base.c +++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c | |||
@@ -3737,10 +3737,8 @@ static void iwl3945_setup_deferred_work(struct iwl_priv *priv) | |||
3737 | INIT_DELAYED_WORK(&priv->init_alive_start, iwl3945_bg_init_alive_start); | 3737 | INIT_DELAYED_WORK(&priv->init_alive_start, iwl3945_bg_init_alive_start); |
3738 | INIT_DELAYED_WORK(&priv->alive_start, iwl3945_bg_alive_start); | 3738 | INIT_DELAYED_WORK(&priv->alive_start, iwl3945_bg_alive_start); |
3739 | INIT_DELAYED_WORK(&priv->_3945.rfkill_poll, iwl3945_rfkill_poll); | 3739 | INIT_DELAYED_WORK(&priv->_3945.rfkill_poll, iwl3945_rfkill_poll); |
3740 | INIT_WORK(&priv->scan_completed, iwl_bg_scan_completed); | 3740 | |
3741 | INIT_WORK(&priv->abort_scan, iwl_bg_abort_scan); | 3741 | iwl_setup_scan_deferred_work(priv); |
3742 | INIT_WORK(&priv->start_internal_scan, iwl_bg_start_internal_scan); | ||
3743 | INIT_DELAYED_WORK(&priv->scan_check, iwl_bg_scan_check); | ||
3744 | 3742 | ||
3745 | iwl3945_hw_setup_deferred_work(priv); | 3743 | iwl3945_hw_setup_deferred_work(priv); |
3746 | 3744 | ||