summaryrefslogtreecommitdiff
path: root/src/arch/x86/acpi_s3.c
diff options
context:
space:
mode:
authorMartin Roth <martinroth@google.com>2017-06-01 11:39:59 -0600
committerMartin Roth <martinroth@google.com>2017-07-07 16:05:16 +0000
commit898a77521de97b1e4af9458b82bcc21bc7a6e799 (patch)
tree4565d11cc5bbed7729b580424006e1745dc0cfc9 /src/arch/x86/acpi_s3.c
parent50bda05e46d5f34f6519a7814e843d1e777ecf10 (diff)
downloadcoreboot-898a77521de97b1e4af9458b82bcc21bc7a6e799.tar.xz
arch/*: Update Kconfig symbol usage
- Update all symbols to use IS_ENABLED() - Update non-romcc usage to use 'if' instead of '#if' where it makes sense. Change-Id: I5a84414d2d1631e35ac91efb67a0d4c1f673bf85 Signed-off-by: Martin Roth <martinroth@google.com> Reviewed-on: https://review.coreboot.org/20005 Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'src/arch/x86/acpi_s3.c')
-rw-r--r--src/arch/x86/acpi_s3.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/arch/x86/acpi_s3.c b/src/arch/x86/acpi_s3.c
index 61955f5b8e..a0a790567e 100644
--- a/src/arch/x86/acpi_s3.c
+++ b/src/arch/x86/acpi_s3.c
@@ -247,16 +247,16 @@ void __attribute__((weak)) mainboard_suspend_resume(void)
void acpi_resume(void *wake_vec)
{
-#if CONFIG_HAVE_SMI_HANDLER
- u32 *gnvs_address = cbmem_find(CBMEM_ID_ACPI_GNVS_PTR);
-
- /* Restore GNVS pointer in SMM if found */
- if (gnvs_address && *gnvs_address) {
- printk(BIOS_DEBUG, "Restore GNVS pointer to 0x%08x\n",
- *gnvs_address);
- smm_setup_structures((void *)*gnvs_address, NULL, NULL);
+ if (IS_ENABLED(CONFIG_HAVE_SMI_HANDLER)) {
+ u32 *gnvs_address = cbmem_find(CBMEM_ID_ACPI_GNVS_PTR);
+
+ /* Restore GNVS pointer in SMM if found */
+ if (gnvs_address && *gnvs_address) {
+ printk(BIOS_DEBUG, "Restore GNVS pointer to 0x%08x\n",
+ *gnvs_address);
+ smm_setup_structures((void *)*gnvs_address, NULL, NULL);
+ }
}
-#endif
/* Call mainboard resume handler first, if defined. */
mainboard_suspend_resume();