aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-agn.c
diff options
context:
space:
mode:
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>2011-07-03 08:45:34 -0400
committerWey-Yi Guy <wey-yi.w.guy@intel.com>2011-07-21 10:28:03 -0400
commit6bd4dba3d2b8a90d27dfd32b306fa965650599b4 (patch)
treed544647abff27b8cd2751edd0bde5bc38738ad77 /drivers/net/wireless/iwlwifi/iwl-agn.c
parent8d30119346d52516f289016e1c57f853a835cb4a (diff)
iwlagn: kill iwlagn_setup_deferred_work
Since iwlagn_setup_deferred_work is always called, fold it into iwl_setup_deferred_work. BT related works are setup by the new bt_setup_deferred_work lib_ops. Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Wey-Yi Guy <wey-yi.guy@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index d50c68a072a..503c78606bd 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -2845,8 +2845,8 @@ static void iwl_setup_deferred_work(struct iwl_priv *priv)
2845 2845
2846 iwl_setup_scan_deferred_work(priv); 2846 iwl_setup_scan_deferred_work(priv);
2847 2847
2848 if (priv->cfg->lib->setup_deferred_work) 2848 if (priv->cfg->lib->bt_setup_deferred_work)
2849 priv->cfg->lib->setup_deferred_work(priv); 2849 priv->cfg->lib->bt_setup_deferred_work(priv);
2850 2850
2851 init_timer(&priv->statistics_periodic); 2851 init_timer(&priv->statistics_periodic);
2852 priv->statistics_periodic.data = (unsigned long)priv; 2852 priv->statistics_periodic.data = (unsigned long)priv;