From: "thermal-bot for Randy Dunlap" <tip-bot2@linutronix.de>
To: linux-pm@vger.kernel.org
Cc: Randy Dunlap <rdunlap@infradead.org>,
Sumeet Pawnikar <sumeet.r.pawnikar@intel.com>,
Daniel Lezcano <daniel.lezcano@linaro.org>,
Zhang Rui <rui.zhang@intel.com>, Amit Kucheria <amitk@kernel.org>,
linux-pm@vger.kernel.org
Subject: [thermal: thermal/next] thermal: intel_pch_thermal: fix build for ACPI not enabled
Date: Mon, 07 Dec 2020 13:47:14 -0000 [thread overview]
Message-ID: <160734883428.3364.5035247709632805604.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20201117023807.8266-1-rdunlap@infradead.org>
The following commit has been merged into the thermal/next branch of thermal:
Commit-ID: be133722df5168d2f304cc59b80d3d21d6ea9433
Gitweb: https://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git//be133722df5168d2f304cc59b80d3d21d6ea9433
Author: Randy Dunlap <rdunlap@infradead.org>
AuthorDate: Mon, 16 Nov 2020 18:38:07 -08:00
Committer: Daniel Lezcano <daniel.lezcano@linaro.org>
CommitterDate: Tue, 17 Nov 2020 10:05:43 +01:00
thermal: intel_pch_thermal: fix build for ACPI not enabled
The reference to acpi_gbl_FADT causes a build error when ACPI is not
enabled. Fix by making that conditional on CONFIG_ACPI.
../drivers/thermal/intel/intel_pch_thermal.c: In function 'pch_wpt_suspend':
../drivers/thermal/intel/intel_pch_thermal.c:217:8: error: 'acpi_gbl_FADT' undeclared (first use in this function); did you mean 'acpi_get_type'?
if (!(acpi_gbl_FADT.flags & ACPI_FADT_LOW_POWER_S0))
^~~~~~~~~~~~~
Fixes: ef63b043ac86 ("thermal: intel: pch: fix S0ix failure due to PCH temperature above threshold")
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Cc: Sumeet Pawnikar <sumeet.r.pawnikar@intel.com>
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: Zhang Rui <rui.zhang@intel.com>
Cc: Amit Kucheria <amitk@kernel.org>
Cc: linux-pm@vger.kernel.org
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/20201117023807.8266-1-rdunlap@infradead.org
---
drivers/thermal/intel/intel_pch_thermal.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/thermal/intel/intel_pch_thermal.c b/drivers/thermal/intel/intel_pch_thermal.c
index 32e1b28..d7c05c0 100644
--- a/drivers/thermal/intel/intel_pch_thermal.c
+++ b/drivers/thermal/intel/intel_pch_thermal.c
@@ -214,8 +214,12 @@ static int pch_wpt_suspend(struct pch_thermal_device *ptd)
}
/* Do not check temperature if it is not a S0ix capable platform */
+#ifdef CONFIG_ACPI
if (!(acpi_gbl_FADT.flags & ACPI_FADT_LOW_POWER_S0))
return 0;
+#else
+ return 0;
+#endif
/* Do not check temperature if it is not s2idle */
if (pm_suspend_via_firmware())
next prev parent reply other threads:[~2020-12-07 13:47 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-17 2:38 [PATCH -next] thermal: intel_pch_thermal: fix build for ACPI not enabled Randy Dunlap
2020-12-07 13:47 ` thermal-bot for Randy Dunlap [this message]
2020-12-08 14:01 ` Pawnikar, Sumeet R
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=160734883428.3364.5035247709632805604.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=amitk@kernel.org \
--cc=daniel.lezcano@linaro.org \
--cc=linux-pm@vger.kernel.org \
--cc=rdunlap@infradead.org \
--cc=rui.zhang@intel.com \
--cc=sumeet.r.pawnikar@intel.com \
/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;
as well as URLs for NNTP newsgroup(s).