[coreboot-gerrit] Change in ...coreboot[master]: google/kahlee: No need to guard with HAVE_ACPI_RESUME

[Kyösti Mälkki (Code Review)]

Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/31317

Change subject: google/kahlee: No need to guard with HAVE_ACPI_RESUME
......................................................................

google/kahlee: No need to guard with HAVE_ACPI_RESUME

Change-Id: Ie8748ccddc8e31569c58deba5d08c98a04326fa8
Signed-off-by: Kyösti Mälkki 
---
M src/mainboard/google/kahlee/mainboard.c
M src/mainboard/google/kahlee/variants/baseboard/include/baseboard/variants.h
M src/mainboard/google/kahlee/variants/baseboard/mainboard.c
3 files changed, 0 insertions(+), 8 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/17/31317/1

diff --git a/src/mainboard/google/kahlee/mainboard.c b/src/mainboard/google/kahlee/mainboard.c
index ebdcc93..ed48593 100644
--- a/src/mainboard/google/kahlee/mainboard.c
+++ b/src/mainboard/google/kahlee/mainboard.c
@@ -195,12 +195,10 @@
    return variant_get_ehci_oc_map(map);
 }

-#if IS_ENABLED(CONFIG_HAVE_ACPI_RESUME)
 void mainboard_suspend_resume(void)
 {
    variant_mainboard_suspend_resume();
 }
-#endif

struct chip_operations mainboard_ops = {
    .init = mainboard_init,
@@ -214,11 +212,9 @@
    return 0;
 }

-#if IS_ENABLED(CONFIG_HAVE_ACPI_RESUME)
 void __weak variant_mainboard_suspend_resume(void)
 {
 }
-#endif

const char *smbios_mainboard_sku(void)
 {
diff --git a/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/variants.h b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/variants.h
index da65bd8..e3cde3e 100644
--- a/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/variants.h
+++ b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/variants.h
@@ -31,8 +31,6 @@
 const struct soc_amd_gpio *variant_romstage_gpio_table(size_t *size);
 const struct soc_amd_gpio *variant_gpio_table(size_t *size);
 void variant_romstage_entry(int s3_resume);
-#if IS_ENABLED(CONFIG_HAVE_ACPI_RESUME)
 void variant_mainboard_suspend_resume(void);
-#endif

#endif /* __BASEBOARD_VARIANTS_H__ */
diff --git a/src/mainboard/google/kahlee/variants/baseboard/mainboard.c b/src/mainboard/google/kahlee/variants/baseboard/mainboard.c
index d1a3492..71aca73 100644
--- a/src/mainboard/google/kahlee/variants/baseboard/mainboard.c
+++ b/src/mainboard/google/kahlee/variants/baseboard/mainboard.c
@@ -32,13 +32,11 @@
    return sku;
 }

-#if IS_ENABLED(CONFIG_HAVE_ACPI_RESUME)
 void variant_mainboard_suspend_resume(void)
 {
    /* Enable backlight - GPIO 133 active low */
    gpio_set(GPIO_133, 0);
 }
-#endif

void board_bh720(struct device *dev)
 {