From: Luca Coelho <luca@coelho.fi>
To: kvalo@codeaurora.org
Cc: linux-wireless@vger.kernel.org
Subject: [PATCH 12/12] iwlwifi: mvm: fix non-ACPI function
Date: Sun, 20 Oct 2019 11:55:45 +0300 [thread overview]
Message-ID: <20191020085545.16407-11-luca@coelho.fi> (raw)
In-Reply-To: <20191020085545.16407-1-luca@coelho.fi>
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(-)
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 */
--
2.23.0
next prev parent reply other threads:[~2019-10-20 8:56 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-20 8:55 [PATCH 00/12] iwlwifi: updates intended for v5.5 2019-20 Luca Coelho
2019-10-20 8:55 ` [PATCH 01/12] iwlwifi: remove redundant assignment to variable bufsz Luca Coelho
2019-10-20 8:55 ` [PATCH 02/12] iwlwifi: mvm: fix unaligned read of rx_pkt_status Luca Coelho
2019-10-20 8:55 ` [PATCH 03/12] iwlwifi: scan: make new scan req versioning flow Luca Coelho
2019-10-20 14:41 ` [PATCH v2 " Luca Coelho
2019-10-20 8:55 ` [PATCH 04/12] iwlwifi: scan: support scan req cmd ver 12 Luca Coelho
2019-10-20 8:55 ` [PATCH 05/12] iwlwifi: refactor the SAR tables from mvm to acpi Luca Coelho
2019-10-20 8:55 ` [PATCH 06/12] iwlwifi: mvm: scan: enable adaptive dwell in p2p Luca Coelho
2019-10-20 8:55 ` [PATCH 07/12] iwlwifi: mvm: don't skip mgmt tid when flushing all tids Luca Coelho
2019-10-25 8:04 ` Kalle Valo
2019-10-20 8:55 ` [PATCH 08/12] iwlwifi: mvm: start CTDP budget from 2400mA Luca Coelho
2019-10-20 8:55 ` [PATCH 09/12] iwlwifi: mvm: sync the iwl_mvm_session_prot_notif layout Luca Coelho
2019-10-20 8:55 ` [PATCH 10/12] iwlwifi: remove IWL_DEVICE_22560/IWL_DEVICE_FAMILY_22560 Luca Coelho
2019-10-20 8:55 ` [PATCH 11/12] iwlwifi: 22000: fix some indentation Luca Coelho
2019-10-20 8:55 ` Luca Coelho [this message]
2020-01-23 4:02 ` Stable Backport Request: iwlwifi: mvm: fix non-ACPI function Jiaxun Yang
2020-01-23 5:42 ` Jiaxun Yang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191020085545.16407-11-luca@coelho.fi \
--to=luca@coelho.fi \
--cc=kvalo@codeaurora.org \
--cc=linux-wireless@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox