aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKirtika Ruchandani <kirtika.ruchandani@gmail.com>2016-11-09 00:50:48 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-05-14 08:00:16 -0400
commit562c868d94a87af8595541c5b9f2f8944e9bf850 (patch)
treef36dc839ef4560347db4b212f304497b561280db
parent9c8655c0a86099a45669f5ed38120584a9e13b11 (diff)
iwlwifi: pcie: trans: Remove unused 'shift_param'
commit 3ce4a03852d6dd3fd28c2fb2ee9f89bb9ccf9a9b upstream. shift_param is defined and set in iwl_pcie_load_cpu_sections but not used. Fix this to avoid -Wunused-but-set-variable warning. The code using it turned into dead code with commit dcab8ecd5617 ("iwlwifi: mvm: support ucode load for family_8000 B0 only") which added a separate function iwl_pcie_load_given_ucode_8000 (then 8000b) for IWL_DEVICE_FAMILY_8000. Commit 76f8c0e17edc ("iwlwifi: pcie: remove dead code") removed the dead code but left shift_param as is. iwlwifi/pcie/trans.c: In function ‘iwl_pcie_load_cpu_sections’: iwlwifi/pcie/trans.c:871:6: warning: variable ‘shift_param’ set but not used [-Wunused-but-set-variable] Fixes: dcab8ecd5617 ("iwlwifi: mvm: support ucode load for family_8000 B0 only") Fixes: 76f8c0e17edc ("iwlwifi: pcie: remove dead code") Signed-off-by: Kirtika Ruchandani <kirtika@google.com> Cc: Sara Sharon <sara.sharon@intel.com> Cc: Luca Coelho <luciano.coelho@intel.com> Cc: Liad Kaufman <liad.kaufman@intel.com> Cc: Emmanuel Grumbach <emmanuel.grumbach@intel.com> [removed some unnecessary braces] Signed-off-by: Luca Coelho <luciano.coelho@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/net/wireless/intel/iwlwifi/pcie/trans.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
index ae95533e587d..9ba45b089a5d 100644
--- a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
@@ -868,17 +868,13 @@ static int iwl_pcie_load_cpu_sections(struct iwl_trans *trans,
868 int cpu, 868 int cpu,
869 int *first_ucode_section) 869 int *first_ucode_section)
870{ 870{
871 int shift_param;
872 int i, ret = 0; 871 int i, ret = 0;
873 u32 last_read_idx = 0; 872 u32 last_read_idx = 0;
874 873
875 if (cpu == 1) { 874 if (cpu == 1)
876 shift_param = 0;
877 *first_ucode_section = 0; 875 *first_ucode_section = 0;
878 } else { 876 else
879 shift_param = 16;
880 (*first_ucode_section)++; 877 (*first_ucode_section)++;
881 }
882 878
883 for (i = *first_ucode_section; i < IWL_UCODE_SECTION_MAX; i++) { 879 for (i = *first_ucode_section; i < IWL_UCODE_SECTION_MAX; i++) {
884 last_read_idx = i; 880 last_read_idx = i;