summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSubrata Banik <subrata.banik@intel.com>2018-11-17 15:17:38 +0530
committerNico Huber <nico.h@gmx.de>2018-11-18 20:57:11 +0000
commit47df66d7654f515594bdc6e60d8a87a8ebe7a3c6 (patch)
tree172ca8524576b33d58f9ca9b8bff683c43f2a6c5
parentd4b89091d2f7c31d80e15d779f6190b7c9883d36 (diff)
soc/intel/{cnl, icl}: Remove unnecessary __SIMPLE_DEVICE__ check
soc_pch_pirq_init() function is only getting compiled for RAMSTAGE hence remove unused __SIMPLE_DEVICE__ check. Change-Id: I7f0ca62170f0af12a251c8c97155de8433a31854 Signed-off-by: Subrata Banik <subrata.banik@intel.com> Reviewed-on: https://review.coreboot.org/29643 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Nico Huber <nico.h@gmx.de>
-rw-r--r--src/soc/intel/cannonlake/lpc.c7
-rw-r--r--src/soc/intel/icelake/lpc.c7
2 files changed, 4 insertions, 10 deletions
diff --git a/src/soc/intel/cannonlake/lpc.c b/src/soc/intel/cannonlake/lpc.c
index b440d392e4..0195cefb84 100644
--- a/src/soc/intel/cannonlake/lpc.c
+++ b/src/soc/intel/cannonlake/lpc.c
@@ -145,6 +145,7 @@ static void pch_enable_ioapic(const struct device *dev)
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 @@ void soc_pch_pirq_init(const struct device *dev)
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 93d543f444..9bf1b789dd 100644
--- a/src/soc/intel/icelake/lpc.c
+++ b/src/soc/intel/icelake/lpc.c
@@ -144,6 +144,7 @@ static void pch_enable_ioapic(const struct device *dev)
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 @@ void soc_pch_pirq_init(const struct device *dev)
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;