iwlwifi: remove BT handlers from lib_ops
authorJohannes Berg <johannes.berg@intel.com>
Wed, 7 Mar 2012 17:52:18 +0000 (09:52 -0800)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 8 Mar 2012 18:59:48 +0000 (13:59 -0500)
There's no need to have operations for
these as they simply depend on whether
the device has built-in bluetooth, so
just duplicate the information already
there (whether bt_params is present or
not).

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/iwlwifi/iwl-2000.c
drivers/net/wireless/iwlwifi/iwl-6000.c
drivers/net/wireless/iwlwifi/iwl-agn-rx.c
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/iwlwifi/iwl-core.h

index 446d010..d6ba841 100644 (file)
@@ -156,9 +156,6 @@ static struct iwl_lib_ops iwl2000_lib = {
 
 static struct iwl_lib_ops iwl2030_lib = {
        .set_hw_params = iwl2000_hw_set_hw_params,
-       .bt_rx_handler_setup = iwlagn_bt_rx_handler_setup,
-       .bt_setup_deferred_work = iwlagn_bt_setup_deferred_work,
-       .cancel_deferred_work = iwlagn_bt_cancel_deferred_work,
        .nic_config = iwl2000_nic_config,
        .eeprom_ops = {
                .regulatory_bands = {
index d299f05..904c50a 100644 (file)
@@ -252,9 +252,6 @@ static struct iwl_lib_ops iwl6000_lib = {
 
 static struct iwl_lib_ops iwl6030_lib = {
        .set_hw_params = iwl6000_hw_set_hw_params,
-       .bt_rx_handler_setup = iwlagn_bt_rx_handler_setup,
-       .bt_setup_deferred_work = iwlagn_bt_setup_deferred_work,
-       .cancel_deferred_work = iwlagn_bt_cancel_deferred_work,
        .set_channel_switch = iwl6000_hw_channel_switch,
        .nic_config = iwl6000_nic_config,
        .eeprom_ops = {
index a9bdbad..e504675 100644 (file)
@@ -1143,9 +1143,8 @@ void iwl_setup_rx_handlers(struct iwl_priv *priv)
        iwl_notification_wait_init(&priv->notif_wait);
 
        /* Set up BT Rx handlers */
-       if (cfg(priv)->lib->bt_rx_handler_setup)
-               cfg(priv)->lib->bt_rx_handler_setup(priv);
-
+       if (cfg(priv)->bt_params)
+               iwlagn_bt_rx_handler_setup(priv);
 }
 
 int iwl_rx_dispatch(struct iwl_op_mode *op_mode, struct iwl_rx_cmd_buffer *rxb,
index 29f40ea..5f390f8 100644 (file)
@@ -976,8 +976,8 @@ static void iwl_setup_deferred_work(struct iwl_priv *priv)
 
        iwl_setup_scan_deferred_work(priv);
 
-       if (cfg(priv)->lib->bt_setup_deferred_work)
-               cfg(priv)->lib->bt_setup_deferred_work(priv);
+       if (cfg(priv)->bt_params)
+               iwlagn_bt_setup_deferred_work(priv);
 
        init_timer(&priv->statistics_periodic);
        priv->statistics_periodic.data = (unsigned long)priv;
@@ -994,8 +994,8 @@ static void iwl_setup_deferred_work(struct iwl_priv *priv)
 
 void iwl_cancel_deferred_work(struct iwl_priv *priv)
 {
-       if (cfg(priv)->lib->cancel_deferred_work)
-               cfg(priv)->lib->cancel_deferred_work(priv);
+       if (cfg(priv)->bt_params)
+               iwlagn_bt_cancel_deferred_work(priv);
 
        cancel_work_sync(&priv->run_time_calib_work);
        cancel_work_sync(&priv->beacon_update);
index e0423c4..95f6b7b 100644 (file)
@@ -77,12 +77,6 @@ struct iwl_cmd;
 struct iwl_lib_ops {
        /* set hw dependent parameters */
        void (*set_hw_params)(struct iwl_priv *priv);
-       /* setup BT Rx handler */
-       void (*bt_rx_handler_setup)(struct iwl_priv *priv);
-       /* setup BT related deferred work */
-       void (*bt_setup_deferred_work)(struct iwl_priv *priv);
-       /* cancel deferred work */
-       void (*cancel_deferred_work)(struct iwl_priv *priv);
        int (*set_channel_switch)(struct iwl_priv *priv,
                                  struct ieee80211_channel_switch *ch_switch);
        /* device specific configuration */