From ad882c3b171ccd71d84ddc971ab0c4ae563190de Mon Sep 17 00:00:00 2001 From: Kyösti Mälkki Date: Tue, 2 Jun 2020 05:05:30 +0300 Subject: sb/intel: Remove spurious HAVE_SMI_HANDLER test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There are no side-effects in calling acpi_is_wakeup_s3() and apm_control() is a no-op with HAVE_SMI_HANDLER=n. Change-Id: Ia9195781955cc5fa96d0690aa7735fc590e527e4 Signed-off-by: Kyösti Mälkki Reviewed-on: https://review.coreboot.org/c/coreboot/+/41986 Reviewed-by: Angel Pons Reviewed-by: Paul Menzel Reviewed-by: Patrick Rudolph Tested-by: build bot (Jenkins) --- src/soc/intel/broadwell/lpc.c | 2 +- src/soc/intel/common/block/pmc/pmc.c | 2 +- src/soc/intel/denverton_ns/pmc.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/soc/intel') diff --git a/src/soc/intel/broadwell/lpc.c b/src/soc/intel/broadwell/lpc.c index d5f8451272..b841291086 100644 --- a/src/soc/intel/broadwell/lpc.c +++ b/src/soc/intel/broadwell/lpc.c @@ -409,7 +409,7 @@ static void pch_cg_init(struct device *dev) static void pch_set_acpi_mode(void) { - if (CONFIG(HAVE_SMI_HANDLER) && !acpi_is_wakeup_s3()) { + if (!acpi_is_wakeup_s3()) { apm_control(APM_CNT_ACPI_DISABLE); } } diff --git a/src/soc/intel/common/block/pmc/pmc.c b/src/soc/intel/common/block/pmc/pmc.c index cc004191ef..84e22a2585 100644 --- a/src/soc/intel/common/block/pmc/pmc.c +++ b/src/soc/intel/common/block/pmc/pmc.c @@ -93,7 +93,7 @@ static void pch_pmc_read_resources(struct device *dev) void pmc_set_acpi_mode(void) { - if (CONFIG(HAVE_SMI_HANDLER) && !acpi_is_wakeup_s3()) { + if (!acpi_is_wakeup_s3()) { apm_control(APM_CNT_ACPI_DISABLE); } } diff --git a/src/soc/intel/denverton_ns/pmc.c b/src/soc/intel/denverton_ns/pmc.c index 3c592fe05f..64121449f5 100644 --- a/src/soc/intel/denverton_ns/pmc.c +++ b/src/soc/intel/denverton_ns/pmc.c @@ -24,7 +24,7 @@ static void pch_power_options(struct device *dev) { /* TODO */ } static void pch_set_acpi_mode(void) { - if (CONFIG(HAVE_SMI_HANDLER) && !acpi_is_wakeup_s3()) { + if (!acpi_is_wakeup_s3()) { apm_control(APM_CNT_ACPI_DISABLE); } } -- cgit v1.2.3