summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-5000.c
diff options
context:
space:
mode:
authorEmmanuel Grumbach2011-07-03 14:45:34 +0200
committerWey-Yi Guy2011-07-21 16:28:03 +0200
commit6bd4dba3d2b8a90d27dfd32b306fa965650599b4 (patch)
treed544647abff27b8cd2751edd0bde5bc38738ad77 /drivers/net/wireless/iwlwifi/iwl-5000.c
parentiwlagn: kill iwlagn_rx_handler_setup (diff)
downloadkernel-qcow2-linux-6bd4dba3d2b8a90d27dfd32b306fa965650599b4.tar.gz
kernel-qcow2-linux-6bd4dba3d2b8a90d27dfd32b306fa965650599b4.tar.xz
kernel-qcow2-linux-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-5000.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-5000.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c
index 4e1204a5ff68..8c6fbd74b8da 100644
--- a/drivers/net/wireless/iwlwifi/iwl-5000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-5000.c
@@ -320,7 +320,6 @@ static int iwl5000_hw_channel_switch(struct iwl_priv *priv,
static struct iwl_lib_ops iwl5000_lib = {
.set_hw_params = iwl5000_hw_set_hw_params,
- .setup_deferred_work = iwlagn_setup_deferred_work,
.set_channel_switch = iwl5000_hw_channel_switch,
.nic_config = iwl5000_nic_config,
.eeprom_ops = {
@@ -339,7 +338,6 @@ static struct iwl_lib_ops iwl5000_lib = {
static struct iwl_lib_ops iwl5150_lib = {
.set_hw_params = iwl5150_hw_set_hw_params,
- .setup_deferred_work = iwlagn_setup_deferred_work,
.set_channel_switch = iwl5000_hw_channel_switch,
.nic_config = iwl5000_nic_config,
.eeprom_ops = {