From 31cf4f084b26e7fe253f866c6f64d7c938306559 Mon Sep 17 00:00:00 2001
From: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Date: Tue, 19 Feb 2019 10:49:48 +0100
Subject: [PATCH] byt, hsw: call arch_interrupt_clear() directly

Platform interrupt handling code should call arch_interrupt_clear()
directly, no need to use the interrupt_clear() wrapper.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
---
 src/drivers/intel/baytrail/interrupt.c | 18 +++++++++---------
 src/drivers/intel/haswell/interrupt.c  |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/drivers/intel/baytrail/interrupt.c b/src/drivers/intel/baytrail/interrupt.c
index 304e5a1c6..fa17d1535 100644
--- a/src/drivers/intel/baytrail/interrupt.c
+++ b/src/drivers/intel/baytrail/interrupt.c
@@ -29,40 +29,40 @@ void platform_interrupt_clear(uint32_t irq, uint32_t mask)
 	switch (irq) {
 	case IRQ_NUM_EXT_SSP0:
 		shim_write(SHIM_PISR, mask << 3);
-		interrupt_clear(irq);
+		arch_interrupt_clear(irq);
 		break;
 	case IRQ_NUM_EXT_SSP1:
 		shim_write(SHIM_PISR, mask << 4);
-		interrupt_clear(irq);
+		arch_interrupt_clear(irq);
 		break;
 	case IRQ_NUM_EXT_SSP2:
 		shim_write(SHIM_PISR, mask << 5);
-		interrupt_clear(irq);
+		arch_interrupt_clear(irq);
 		break;
 	case IRQ_NUM_EXT_DMAC0:
 		shim_write(SHIM_PISR, mask << 16);
-		interrupt_clear(irq);
+		arch_interrupt_clear(irq);
 		break;
 	case IRQ_NUM_EXT_DMAC1:
 		shim_write(SHIM_PISR, mask << 24);
-		interrupt_clear(irq);
+		arch_interrupt_clear(irq);
 		break;
 #if defined CONFIG_CHERRYTRAIL
 	case IRQ_NUM_EXT_DMAC2:
 		shim_write(SHIM_PISRH, mask << 0);
-		interrupt_clear(irq);
+		arch_interrupt_clear(irq);
 		break;
 	case IRQ_NUM_EXT_SSP3:
 		shim_write(SHIM_PISRH, mask << 8);
-		interrupt_clear(irq);
+		arch_interrupt_clear(irq);
 		break;
 	case IRQ_NUM_EXT_SSP4:
 		shim_write(SHIM_PISRH, mask << 9);
-		interrupt_clear(irq);
+		arch_interrupt_clear(irq);
 		break;
 	case IRQ_NUM_EXT_SSP5:
 		shim_write(SHIM_PISRH, mask << 10);
-		interrupt_clear(irq);
+		arch_interrupt_clear(irq);
 		break;
 #endif
 	default:
diff --git a/src/drivers/intel/haswell/interrupt.c b/src/drivers/intel/haswell/interrupt.c
index 3f37fc5ac..2a6ef1862 100644
--- a/src/drivers/intel/haswell/interrupt.c
+++ b/src/drivers/intel/haswell/interrupt.c
@@ -32,7 +32,7 @@ void platform_interrupt_clear(uint32_t irq, uint32_t mask)
 	case IRQ_NUM_EXT_DMAC1:
 	case IRQ_NUM_EXT_SSP0:
 	case IRQ_NUM_EXT_SSP1:
-		interrupt_clear(irq);
+		arch_interrupt_clear(irq);
 		break;
 	default:
 		break;