From 6202aea9220f6a423429cba625c0444f88f9bb58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Fri, 20 Jun 2014 05:41:21 +0300 Subject: [PATCH] PS2 keyboard: Use acpi_is_wakeup_s3() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I812cc40e50a1e7e13caed48a1693feb8658b645c Signed-off-by: Kyösti Mälkki Reviewed-on: http://review.coreboot.org/6073 Tested-by: build bot (Jenkins) Reviewed-by: Edward O'Callaghan Reviewed-by: Patrick Georgi --- src/drivers/pc80/keyboard.c | 6 +----- src/superio/smsc/mec1308/superio.c | 7 ------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/src/drivers/pc80/keyboard.c b/src/drivers/pc80/keyboard.c index 6a573d8e08..06eae463e1 100644 --- a/src/drivers/pc80/keyboard.c +++ b/src/drivers/pc80/keyboard.c @@ -25,9 +25,7 @@ #include #include #include -#if CONFIG_HAVE_ACPI_RESUME #include -#endif #define KBD_DATA 0x60 #define KBD_COMMAND 0x64 @@ -202,10 +200,8 @@ void pc_keyboard_init(void) if (!CONFIG_DRIVERS_PS2_KEYBOARD) return; -#if CONFIG_HAVE_ACPI_RESUME - if (acpi_slp_type == 3) + if (acpi_is_wakeup_s3()) return; -#endif printk(BIOS_DEBUG, "Keyboard init...\n"); diff --git a/src/superio/smsc/mec1308/superio.c b/src/superio/smsc/mec1308/superio.c index 54d99fb5c7..9e293bded8 100644 --- a/src/superio/smsc/mec1308/superio.c +++ b/src/superio/smsc/mec1308/superio.c @@ -29,9 +29,6 @@ #include #include #include "mec1308.h" -#if CONFIG_HAVE_ACPI_RESUME -#include -#endif static void mec1308_init(device_t dev) { @@ -41,10 +38,6 @@ static void mec1308_init(device_t dev) switch(dev->path.pnp.device) { case MEC1308_KBC: -#if CONFIG_HAVE_ACPI_RESUME - if (acpi_slp_type == 3) - return; -#endif pc_keyboard_init(); break; }