intel boards: Use acpi_is_wakeup_s3()

Change-Id: Icab0aeb2d5bf19b4029ca29b8a1e7564ef59a538
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/6071
Tested-by: build bot (Jenkins)
Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Reviewed-by: Patrick Georgi <patrick@georgi-clan.de>

src/southbridge/intel/ibexpeak/me.c

@@ -436,12 +436,9 @@ static me_bios_path intel_me_path(device_t dev)
 	struct me_hfs hfs;
 	struct me_gmes gmes;
 
-#if CONFIG_HAVE_ACPI_RESUME
 	/* S3 wake skips all MKHI messages */
-	if (acpi_slp_type == 3) {
+	if (acpi_is_wakeup_s3())
 		return ME_S3WAKE_BIOS_PATH;
-	}
-#endif
 
 	pci_read_dword_ptr(dev, &hfs, PCI_ME_HFS);
 	pci_read_dword_ptr(dev, &gmes, PCI_ME_GMES);