iwlwifi: mvm: remove redundant d0i3 flag from the config struct
authorLuca Coelho <luciano.coelho@intel.com>
Thu, 17 Sep 2015 18:55:24 +0000 (21:55 +0300)
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Thu, 26 Nov 2015 14:38:50 +0000 (16:38 +0200)
The d0i3 flag in the device configuration structure is redundant,
because the same information can be determined by checking the
firmware capability flag.

Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
drivers/net/wireless/intel/iwlwifi/iwl-8000.c
drivers/net/wireless/intel/iwlwifi/iwl-config.h
drivers/net/wireless/intel/iwlwifi/mvm/mvm.h

index 9bcc0bf937d8810f42da44656cf6bc7d11df4f5a..dd22b7822bc5d41bf9868ffe3a51fbd41569fa60 100644 (file)
@@ -154,7 +154,6 @@ static const struct iwl_tt_params iwl8000_tt_params = {
        .base_params = &iwl8000_base_params,                            \
        .led_mode = IWL_LED_RF_STATE,                                   \
        .nvm_hw_section_num = NVM_HW_SECTION_NUM_FAMILY_8000,           \
-       .d0i3 = true,                                                   \
        .features = NETIF_F_RXCSUM,                                     \
        .non_shared_ant = ANT_A,                                        \
        .dccm_offset = IWL8260_DCCM_OFFSET,                             \
index 910970858f98c2d04764269603c19fe9be8488cc..652cdfe9cc07cb653ab5d4d7c30e8eb4f71364c9 100644 (file)
@@ -295,7 +295,6 @@ struct iwl_pwr_tx_backoff {
  * @high_temp: Is this NIC is designated to be in high temperature.
  * @host_interrupt_operation_mode: device needs host interrupt operation
  *     mode set
- * @d0i3: device uses d0i3 instead of d3
  * @nvm_hw_section_num: the ID of the HW NVM section
  * @features: hw features, any combination of feature_whitelist
  * @pwr_tx_backoffs: translation table between power limits and backoffs
@@ -342,7 +341,6 @@ struct iwl_cfg {
        const bool internal_wimax_coex;
        const bool host_interrupt_operation_mode;
        bool high_temp;
-       bool d0i3;
        u8   nvm_hw_section_num;
        bool lp_xtal_workaround;
        const struct iwl_pwr_tx_backoff *pwr_tx_backoffs;
index 347d953f5604f3bcbc689edaf1af30bbabda6fe9..897d06f898964e679ef745f51cfa37e23c608780 100644 (file)
@@ -916,11 +916,10 @@ iwl_mvm_sta_from_staid_protected(struct iwl_mvm *mvm, u8 sta_id)
 
 static inline bool iwl_mvm_is_d0i3_supported(struct iwl_mvm *mvm)
 {
-       return mvm->trans->cfg->d0i3 &&
-              mvm->trans->d0i3_mode != IWL_D0I3_MODE_OFF &&
-              !iwlwifi_mod_params.d0i3_disable &&
-              fw_has_capa(&mvm->fw->ucode_capa,
-                          IWL_UCODE_TLV_CAPA_D0I3_SUPPORT);
+       return mvm->trans->d0i3_mode != IWL_D0I3_MODE_OFF &&
+               !iwlwifi_mod_params.d0i3_disable &&
+               fw_has_capa(&mvm->fw->ucode_capa,
+                           IWL_UCODE_TLV_CAPA_D0I3_SUPPORT);
 }
 
 static inline bool iwl_mvm_is_dqa_supported(struct iwl_mvm *mvm)