diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2019-02-10 16:38:30 +0200 |
|---|---|---|
| committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2019-02-12 05:00:55 +0000 |
| commit | 79cc577ba241582a36fa138904fbcde7473437e1 (patch) | |
| tree | 37ce804897f68219a0c5629e8d27727a0ec735a1 | |
| parent | ce1a9289b525259e1c4ea208d33cb4df207db734 (diff) | |
google/kahlee: Remove unneeded HAVE_ACPI_RESUME guard
We leave it to linker garbage collection to drop
unreferenced code and symbols from final object files.
Function declarations and definitions are to be guarded
with preprocessor directives only as a last resort.
Change-Id: Ie8748ccddc8e31569c58deba5d08c98a04326fa8
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/31317
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Richard Spiegel <richard.spiegel@silverbackltd.com>
Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com>
3 files changed, 0 insertions, 8 deletions
diff --git a/src/mainboard/google/kahlee/mainboard.c b/src/mainboard/google/kahlee/mainboard.c index ebdcc935e9..ed48593282 100644 --- a/src/mainboard/google/kahlee/mainboard.c +++ b/src/mainboard/google/kahlee/mainboard.c @@ -195,12 +195,10 @@ int mainboard_get_ehci_oc_map(uint16_t *map) 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 @@ uint8_t __weak variant_board_sku(void) 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 da65bd87ab..e3cde3ef17 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_early_gpio_table(size_t *size); 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 d1a349283e..71aca7381b 100644 --- a/src/mainboard/google/kahlee/variants/baseboard/mainboard.c +++ b/src/mainboard/google/kahlee/variants/baseboard/mainboard.c @@ -32,13 +32,11 @@ uint8_t variant_board_sku(void) 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) { |