diff options
| author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2011-07-03 15:45:34 +0300 |
|---|---|---|
| committer | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2011-07-21 07:28:03 -0700 |
| commit | 6bd4dba3d2b8a90d27dfd32b306fa965650599b4 (patch) | |
| tree | d544647abff27b8cd2751edd0bde5bc38738ad77 /drivers/net/wireless/iwlwifi/iwl-agn.c | |
| parent | 8d30119346d52516f289016e1c57f853a835cb4a (diff) | |
| download | lwn-6bd4dba3d2b8a90d27dfd32b306fa965650599b4.tar.gz lwn-6bd4dba3d2b8a90d27dfd32b306fa965650599b4.zip | |
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.c | 4 |
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 d50c68a072ab..503c78606bdc 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) iwl_setup_scan_deferred_work(priv); - if (priv->cfg->lib->setup_deferred_work) - priv->cfg->lib->setup_deferred_work(priv); + if (priv->cfg->lib->bt_setup_deferred_work) + priv->cfg->lib->bt_setup_deferred_work(priv); init_timer(&priv->statistics_periodic); priv->statistics_periodic.data = (unsigned long)priv; |