aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/pcie
diff options
context:
space:
mode:
authorLiad Kaufman <liad.kaufman@intel.com>2014-09-07 11:41:05 +0300
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>2014-09-14 12:56:39 +0300
commitc2a2b28bb7fbcb8e0e11b84714992750bba7b699 (patch)
tree18d9abb17920a835f7258eb3a2e36280271df612 /drivers/net/wireless/iwlwifi/pcie
parentiwlwifi: trans: don't configure the set_active in SCD for dvm (diff)
downloadlinux-dev-c2a2b28bb7fbcb8e0e11b84714992750bba7b699.tar.xz
linux-dev-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/pcie')
-rw-r--r--drivers/net/wireless/iwlwifi/pcie/trans.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/pcie/trans.c b/drivers/net/wireless/iwlwifi/pcie/trans.c
index 4add964a84f8..ae99240dcde4 100644
--- a/drivers/net/wireless/iwlwifi/pcie/trans.c
+++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
@@ -2190,7 +2190,7 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev,
*/
if (trans->cfg->device_family == IWL_DEVICE_FAMILY_8000)
trans->hw_rev = (trans->hw_rev & 0xfff0) |
- ((trans->hw_rev << 2) & 0xc);
+ (CSR_HW_REV_STEP(trans->hw_rev << 2));
trans->hw_id = (pdev->device << 16) + pdev->subsystem_device;
snprintf(trans->hw_id_str, sizeof(trans->hw_id_str),