]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commitdiff
iwlwifi: pcie: trans: Remove unused 'shift_param'
authorKirtika Ruchandani <kirtika.ruchandani@gmail.com>
Wed, 9 Nov 2016 05:50:48 +0000 (21:50 -0800)
committerStefan Bader <stefan.bader@canonical.com>
Tue, 20 Jun 2017 08:46:11 +0000 (10:46 +0200)
BugLink: http://bugs.launchpad.net/bugs/1691369
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>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
drivers/net/wireless/intel/iwlwifi/pcie/trans.c

index b10e3633df1a91ac67061502a332af0bef3c8014..7c0a2849a2b3625832317b779683e6fe2feecdca 100644 (file)
@@ -868,17 +868,13 @@ static int iwl_pcie_load_cpu_sections(struct iwl_trans *trans,
                                      int cpu,
                                      int *first_ucode_section)
 {
-       int shift_param;
        int i, ret = 0;
        u32 last_read_idx = 0;
 
-       if (cpu == 1) {
-               shift_param = 0;
+       if (cpu == 1)
                *first_ucode_section = 0;
-       } else {
-               shift_param = 16;
+       else
                (*first_ucode_section)++;
-       }
 
        for (i = *first_ucode_section; i < IWL_UCODE_SECTION_MAX; i++) {
                last_read_idx = i;