diff options
| author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2015-03-05 12:06:13 +0100 |
|---|---|---|
| committer | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2015-03-26 08:15:36 +0100 |
| commit | 5dd9c68a854a77da2091b08d8fb7717b04667c6d (patch) | |
| tree | 7081f4b229c04e5b5a2257b2aa6b4ef189428d0b /drivers/net/wireless/iwlwifi/iwl-drv.c | |
| parent | iwlwifi: mvm: use debugfs_create_bool() for enable_scan_iteration_notif (diff) | |
| download | linux-5dd9c68a854a77da2091b08d8fb7717b04667c6d.tar.xz linux-5dd9c68a854a77da2091b08d8fb7717b04667c6d.zip | |
iwlwifi: drop support for early versions of 8000
These early versions are no longer supported.
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-drv.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-drv.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-drv.c b/drivers/net/wireless/iwlwifi/iwl-drv.c index 66ca000f0da1..885c78708639 100644 --- a/drivers/net/wireless/iwlwifi/iwl-drv.c +++ b/drivers/net/wireless/iwlwifi/iwl-drv.c @@ -241,16 +241,10 @@ static int iwl_request_firmware(struct iwl_drv *drv, bool first) * previous name and uses the new format. */ if (drv->trans->cfg->device_family == IWL_DEVICE_FAMILY_8000) { - char rev_step[2] = { - 'A' + CSR_HW_REV_STEP(drv->trans->hw_rev), 0 - }; - - /* A-step doesn't have an indication */ - if (CSR_HW_REV_STEP(drv->trans->hw_rev) == SILICON_A_STEP) - rev_step[0] = 0; + char rev_step = 'A' + CSR_HW_REV_STEP(drv->trans->hw_rev); snprintf(drv->firmware_name, sizeof(drv->firmware_name), - "%s%s-%s.ucode", name_pre, rev_step, tag); + "%s%c-%s.ucode", name_pre, rev_step, tag); } IWL_DEBUG_INFO(drv, "attempting to load firmware %s'%s'\n", |