diff --git a/src/soc/intel/cannonlake/lpc.c b/src/soc/intel/cannonlake/lpc.c
index b440d39..0195cef 100644
--- a/src/soc/intel/cannonlake/lpc.c
+++ b/src/soc/intel/cannonlake/lpc.c
@@ -145,6 +145,7 @@
 
 void soc_pch_pirq_init(const struct device *dev)
 {
+	struct device *irq_dev;
 	uint8_t pch_interrupt_routing[MAX_PXRC_CONFIG];
 
 	pch_interrupt_routing[0] = PCH_IRQ11;
@@ -157,11 +158,7 @@
 	pch_interrupt_routing[7] = PCH_IRQ11;
 
 	itss_irq_init(pch_interrupt_routing);
-#if defined(__SIMPLE_DEVICE__)
-	pci_devfn_t irq_dev;
-#else
-	struct device *irq_dev;
-#endif
+
 	for (irq_dev = all_devices; irq_dev; irq_dev = irq_dev->next) {
 		u8 int_pin = 0, int_line = 0;
 
diff --git a/src/soc/intel/icelake/lpc.c b/src/soc/intel/icelake/lpc.c
index 93d543f..9bf1b78 100644
--- a/src/soc/intel/icelake/lpc.c
+++ b/src/soc/intel/icelake/lpc.c
@@ -144,6 +144,7 @@
 
 void soc_pch_pirq_init(const struct device *dev)
 {
+	struct device *irq_dev;
 	uint8_t pch_interrupt_routing[MAX_PXRC_CONFIG];
 
 	pch_interrupt_routing[0] = PCH_IRQ11;
@@ -156,11 +157,7 @@
 	pch_interrupt_routing[7] = PCH_IRQ11;
 
 	itss_irq_init(pch_interrupt_routing);
-#if defined(__SIMPLE_DEVICE__)
-	pci_devfn_t irq_dev;
-#else
-	struct device *irq_dev;
-#endif
+
 	for (irq_dev = all_devices; irq_dev; irq_dev = irq_dev->next) {
 		u8 int_pin = 0, int_line = 0;