From 9d9eb1ec8d6f30fa000aa87246310757214337d5 Mon Sep 17 00:00:00 2001 From: Kyösti Mälkki Date: Fri, 20 Jun 2014 05:38:07 +0300 Subject: PC80 RTC: Use acpi_is_wakeup_s3() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Idc4c47f3802019c2853ec71f8e9c057c3ab8d3ee Signed-off-by: Kyösti Mälkki Reviewed-on: http://review.coreboot.org/6074 Tested-by: build bot (Jenkins) Reviewed-by: Edward O'Callaghan Reviewed-by: Patrick Georgi --- src/drivers/pc80/mc146818rtc.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/drivers/pc80/mc146818rtc.c b/src/drivers/pc80/mc146818rtc.c index 6f8a4eb350..c54f6cefa5 100644 --- a/src/drivers/pc80/mc146818rtc.c +++ b/src/drivers/pc80/mc146818rtc.c @@ -8,10 +8,7 @@ #include "option_table.h" #include #endif -#if CONFIG_HAVE_ACPI_RESUME #include -#endif - static void rtc_update_cmos_date(u8 has_century) { @@ -72,16 +69,14 @@ void rtc_init(int invalid) #endif #ifndef __PRE_RAM__ -#if CONFIG_HAVE_ACPI_RESUME /* * Avoid clearing pending interrupts and resetting the RTC control * register in the resume path because the Linux kernel relies on * this to know if it should restart the RTC timer queue if the wake * was due to the RTC alarm. */ - if (acpi_slp_type == 3) + if (acpi_is_wakeup_s3()) return; -#endif /* CONFIG_HAVE_ACPI_RESUME */ #endif /* __PRE_RAM__ */ printk(BIOS_DEBUG, "RTC Init\n"); -- cgit v1.2.3