Skip to contentSkip to conversation

Patch "iwlwifi: pcie: trans: Remove unused 'shift_param'" has been added to the 4.9-stable tree

PATCH [email protected] 1 participant 1 message May 9, 2017

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

iwlwifi: pcie: trans: Remove unused 'shift_param'

to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
iwlwifi-pcie-trans-remove-unused-shift_param.patch
and it can be found in the queue-4.9 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 3ce4a03852d6dd3fd28c2fb2ee9f89bb9ccf9a9b Mon Sep 17 00:00:00 2001

From: Kirtika Ruchandani <[email protected]>
Date: Tue, 8 Nov 2016 21:50:48 -0800
Subject: iwlwifi: pcie: trans: Remove unused 'shift_param'
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

From: Kirtika Ruchandani <[email protected]>

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")
Cc Sara Sharon <[email protected]>
Cc Luca Coelho <[email protected]>
Cc Liad Kaufman <[email protected]>
Cc Emmanuel Grumbach <[email protected]>
[removed some unnecessary braces]
---
 drivers/net/wireless/intel/iwlwifi/pcie/trans.c |    8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)
drivers/net/wireless/intel/iwlwifi/pcie/trans.c +2 -6
@@ -868,17 +868,13 @@ static int iwl_pcie_load_cpu_sections(st
 				      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;

Patches currently in stable-queue which might be from [email protected] are

queue-4.9/iwlwifi-pcie-trans-remove-unused-shift_param.patch