summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-io.c
diff options
context:
space:
mode:
authorLiad Kaufman <liad.kaufman@intel.com>2014-09-07 10:41:05 +0200
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>2014-09-14 11:56:39 +0200
commitc2a2b28bb7fbcb8e0e11b84714992750bba7b699 (patch)
tree18d9abb17920a835f7258eb3a2e36280271df612 /drivers/net/wireless/iwlwifi/iwl-io.c
parentiwlwifi: trans: don't configure the set_active in SCD for dvm (diff)
downloadlinux-c2a2b28bb7fbcb8e0e11b84714992750bba7b699.tar.xz
linux-c2a2b28bb7fbcb8e0e11b84714992750bba7b699.zip
iwlwifi: make hw rev checking more readable
Rather than ANDing with a mask - use existing macros, which are more readable. Signed-off-by: Liad Kaufman <liad.kaufman@intel.com> Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-io.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-io.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-io.c b/drivers/net/wireless/iwlwifi/iwl-io.c
index 5eef4ae7333b..7a2cbf6f90db 100644
--- a/drivers/net/wireless/iwlwifi/iwl-io.c
+++ b/drivers/net/wireless/iwlwifi/iwl-io.c
@@ -193,7 +193,7 @@ void iwl_force_nmi(struct iwl_trans *trans)
* DEVICE_SET_NMI_8000B_REG - is used.
*/
if ((trans->cfg->device_family != IWL_DEVICE_FAMILY_8000) ||
- ((trans->hw_rev & 0xc) == 0x0))
+ (CSR_HW_REV_STEP(trans->hw_rev) == SILICON_A_STEP))
iwl_write_prph(trans, DEVICE_SET_NMI_REG, DEVICE_SET_NMI_VAL);
else
iwl_write_prph(trans, DEVICE_SET_NMI_8000B_REG,