diff mbox series

[12/12] iwlwifi: mvm: fix non-ACPI function

Message ID 20191020085545.16407-11-luca@coelho.fi (mailing list archive)
State Accepted
Delegated to: Luca Coelho
Headers show
Series iwlwifi: updates intended for v5.5 2019-20 | expand

Commit Message

Luca Coelho Oct. 20, 2019, 8:55 a.m. UTC 
From: Johannes Berg <johannes.berg@intel.com>

The code now compiles without ACPI, but there's a warning since
iwl_mvm_get_ppag_table() isn't used, and iwl_mvm_ppag_init() must
not unconditionally fail but return success instead.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
---
 drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

Comments

Jiaxun Yang Jan. 23, 2020, 4:02 a.m. UTC | #1 
在 2019年10月20日星期日 CST 下午4:55:45，Luca Coelho 写道:
Hi  Stable and wireless:

I believe that Upstream Commit:

7937fd3227055892e169f4b34d21157e57d919e2
iwlwifi: mvm: fix non-ACPI function

Should be backported to 5.4-stable as iwlwifi failed to initialize
8200AC card on Loongson systems without ACPI support.

Thanks.

--
Jiaxun Yang
Jiaxun Yang Jan. 23, 2020, 5:42 a.m. UTC | #2 
Hi  Stable and wireless:

I believe that Upstream Commit:

7937fd3227055892e169f4b34d21157e57d919e2
iwlwifi: mvm: fix non-ACPI function

Should be backported to 5.4-stable as iwlwifi failed to initialize
8200AC card on Loongson systems without ACPI support.

Thanks.

--
Jiaxun Yang
diff mbox series

Patch

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
index e842133779f4..18b62727b6d7 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
@@ -889,11 +889,6 @@  static int iwl_mvm_sar_geo_init(struct iwl_mvm *mvm)
 	return 0;
 }
 
-static int iwl_mvm_get_ppag_table(struct iwl_mvm *mvm)
-{
-	return -ENOENT;
-}
-
 int iwl_mvm_ppag_send_cmd(struct iwl_mvm *mvm)
 {
 	return -ENOENT;
@@ -901,7 +896,7 @@  int iwl_mvm_ppag_send_cmd(struct iwl_mvm *mvm)
 
 static int iwl_mvm_ppag_init(struct iwl_mvm *mvm)
 {
-	return -ENOENT;
+	return 0;
 }
 #endif /* CONFIG_ACPI */