3 files changed, 3 insertions, 57 deletions
diff --git a/src/mainboard/google/cyan/smihandler.c b/src/mainboard/google/cyan/smihandler.c
index 4dd2e0e804..944d033cfa 100644
--- a/src/mainboard/google/cyan/smihandler.c
+++ b/src/mainboard/google/cyan/smihandler.c
@@ -5,7 +5,6 @@
 #include <console/console.h>
 #include <cpu/x86/smm.h>
 #include "ec.h"
-#include <ec/google/chromeec/ec.h>
 #include <ec/google/chromeec/smm.h>
 #include <soc/pm.h>
 #include <soc/gpio.h>
@@ -52,24 +51,7 @@ void mainboard_smi_sleep(uint8_t slp_typ)
 		break;
 	}
 
-	switch (slp_typ) {
-	case ACPI_S3:
-		/* Enable wake events */
-		google_chromeec_set_wake_mask(MAINBOARD_EC_S3_WAKE_EVENTS);
-		break;
-	case ACPI_S5:
-		/* Enable wake events */
-		google_chromeec_set_wake_mask(MAINBOARD_EC_S5_WAKE_EVENTS);
-		break;
-	}
-
-	/* Disable SCI and SMI events */
-	google_chromeec_set_smi_mask(0);
-	google_chromeec_set_sci_mask(0);
-
-	/* Clear pending events that may trigger immediate wake */
-	while (google_chromeec_get_event() != EC_HOST_EVENT_NONE)
-		;
+	chromeec_smi_sleep(slp_typ, MAINBOARD_EC_S3_WAKE_EVENTS, MAINBOARD_EC_S5_WAKE_EVENTS);
 
 	/* Set LPC lines to low power in S3/S5. */
 	if ((slp_typ == ACPI_S3) || (slp_typ == ACPI_S5)) {
diff --git a/src/mainboard/google/rambi/smihandler.c b/src/mainboard/google/rambi/smihandler.c
index 3c0743a4f4..6f652ed1c4 100644
--- a/src/mainboard/google/rambi/smihandler.c
+++ b/src/mainboard/google/rambi/smihandler.c
@@ -4,7 +4,6 @@
 #include <console/console.h>
 #include <cpu/x86/smm.h>
 
-#include <ec/google/chromeec/ec.h>
 #include <ec/google/chromeec/smm.h>
 #include "ec.h"
 
@@ -33,24 +32,7 @@ void mainboard_smi_sleep(uint8_t slp_typ)
 		break;
 	}
 
-	switch (slp_typ) {
-	case ACPI_S3:
-		/* Enable wake events */
-		google_chromeec_set_wake_mask(MAINBOARD_EC_S3_WAKE_EVENTS);
-		break;
-	case ACPI_S5:
-		/* Enable wake events */
-		google_chromeec_set_wake_mask(MAINBOARD_EC_S5_WAKE_EVENTS);
-		break;
-	}
-
-	/* Disable SCI and SMI events */
-	google_chromeec_set_smi_mask(0);
-	google_chromeec_set_sci_mask(0);
-
-	/* Clear pending events that may trigger immediate wake */
-	while (google_chromeec_get_event() != EC_HOST_EVENT_NONE)
-		;
+	chromeec_smi_sleep(slp_typ, MAINBOARD_EC_S3_WAKE_EVENTS, MAINBOARD_EC_S5_WAKE_EVENTS);
 }
 
 int mainboard_smi_apmc(uint8_t apmc)
diff --git a/src/mainboard/intel/strago/smihandler.c b/src/mainboard/intel/strago/smihandler.c
index 40a85448a8..d592fdcaa5 100644
--- a/src/mainboard/intel/strago/smihandler.c
+++ b/src/mainboard/intel/strago/smihandler.c
@@ -5,7 +5,6 @@
 #include <cpu/x86/smm.h>
 #include "ec.h"
 
-#include <ec/google/chromeec/ec.h>
 #include <ec/google/chromeec/smm.h>
 
 #include <soc/pm.h>
@@ -38,24 +37,7 @@ void mainboard_smi_sleep(uint8_t slp_typ)
 		break;
 	}
 
-	switch (slp_typ) {
-	case ACPI_S3:
-		/* Enable wake events */
-		google_chromeec_set_wake_mask(MAINBOARD_EC_S3_WAKE_EVENTS);
-		break;
-	case ACPI_S5:
-		/* Enable wake events */
-		google_chromeec_set_wake_mask(MAINBOARD_EC_S5_WAKE_EVENTS);
-		break;
-	}
-
-	/* Disable SCI and SMI events */
-	google_chromeec_set_smi_mask(0);
-	google_chromeec_set_sci_mask(0);
-
-	/* Clear pending events that may trigger immediate wake */
-	while (google_chromeec_get_event() != EC_HOST_EVENT_NONE)
-		;
+	chromeec_smi_sleep(slp_typ, MAINBOARD_EC_S3_WAKE_EVENTS, MAINBOARD_EC_S5_WAKE_EVENTS);
 
 	/* Set LPC lines to low power in S3/S5. */
 	if ((slp_typ == ACPI_S3) || (slp_typ == ACPI_S5))