3 files changed, 7 insertions, 8 deletions

diff --git a/src/soc/intel/apollolake/acpi.c b/src/soc/intel/apollolake/acpi.c
index 16f6090d10..96a142a89e 100644
--- a/src/soc/intel/apollolake/acpi.c
+++ b/src/soc/intel/apollolake/acpi.c
@@ -4,6 +4,7 @@
 #include <acpi/acpi_gnvs.h>
 #include <acpi/acpigen.h>
 #include <console/console.h>
+#include <device/device.h>
 #include <device/mmio.h>
 #include <arch/smp/mpspec.h>
 #include <assert.h>
@@ -170,7 +171,7 @@ static unsigned long soc_fill_dmar(unsigned long current)
 	unsigned long tmp;
 
 	/* IGD has to be enabled, GFXVTBAR set and enabled. */
-	if (igfx_dev && igfx_dev->enabled && gfxvtbar && gfxvten) {
+	if (is_dev_enabled(igfx_dev) && gfxvtbar && gfxvten) {
 		tmp = current;
 
 		current += acpi_create_dmar_drhd(current, 0, 0, gfxvtbar);
diff --git a/src/soc/intel/apollolake/chip.c b/src/soc/intel/apollolake/chip.c
index b1b3ee8bda..d6e6187b76 100644
--- a/src/soc/intel/apollolake/chip.c
+++ b/src/soc/intel/apollolake/chip.c
@@ -554,7 +554,7 @@ static void glk_fsp_silicon_init_params_cb(
 	}
 
 	dev = pcidev_path_on_root(SA_GLK_DEVFN_GMM);
-	silconfig->Gmm = dev ? dev->enabled : 0;
+	silconfig->Gmm = is_dev_enabled(dev);
 
 	/* On Geminilake, we need to override the default FSP PCIe de-emphasis
 	 * settings using the device tree settings. This is because PCIe
@@ -696,10 +696,7 @@ void platform_fsp_silicon_init_params_cb(FSPS_UPD *silupd)
 	silconfig->VtdEnable = cfg->enable_vtd;
 
 	dev = pcidev_path_on_root(SA_DEVFN_IGD);
-	if (CONFIG(RUN_FSP_GOP) && dev && dev->enabled)
-		silconfig->PeiGraphicsPeimInit = 1;
-	else
-		silconfig->PeiGraphicsPeimInit = 0;
+	silconfig->PeiGraphicsPeimInit = CONFIG(RUN_FSP_GOP) && is_dev_enabled(dev);
 
 	mainboard_silicon_init_params(silconfig);
 }
diff --git a/src/soc/intel/apollolake/romstage.c b/src/soc/intel/apollolake/romstage.c
index c5b060f70e..54bdd2e24b 100644
--- a/src/soc/intel/apollolake/romstage.c
+++ b/src/soc/intel/apollolake/romstage.c
@@ -6,6 +6,7 @@
 #include <assert.h>
 #include <cf9_reset.h>
 #include <console/console.h>
+#include <device/device.h>
 #include <cpu/x86/pae.h>
 #include <delay.h>
 #include <device/pci_def.h>
@@ -258,9 +259,9 @@ static void parse_devicetree_setting(FSPM_UPD *m_upd)
 	DEVTREE_CONST struct device *dev = pcidev_path_on_root(PCH_DEVFN_NPK);
 
 #if CONFIG(SOC_INTEL_GLK)
-	m_upd->FspmConfig.TraceHubEn = dev ? dev->enabled : 0;
+	m_upd->FspmConfig.TraceHubEn = is_dev_enabled(dev);
 #else
-	m_upd->FspmConfig.NpkEn = dev ? dev->enabled : 0;
+	m_upd->FspmConfig.NpkEn = is_dev_enabled(dev);
 #endif
 }