diff --git a/src/arch/xtensa/drivers/idc.c b/src/arch/xtensa/drivers/idc.c
index b04d0bc8b..36259845e 100644
--- a/src/arch/xtensa/drivers/idc.c
+++ b/src/arch/xtensa/drivers/idc.c
@@ -52,7 +52,7 @@ void idc_enable_interrupts(int target_core, int source_core)
 {
 	idc_write(IPC_IDCCTL, target_core,
 		  IPC_IDCCTL_IDCTBIE(source_core));
-	platform_interrupt_unmask(PLATFORM_IDC_INTERRUPT(target_core), 0);
+	platform_interrupt_unmask(PLATFORM_IDC_INTERRUPT(target_core));
 }
 
 /**
diff --git a/src/drivers/imx/interrupt.c b/src/drivers/imx/interrupt.c
index 399026773..035d39b18 100644
--- a/src/drivers/imx/interrupt.c
+++ b/src/drivers/imx/interrupt.c
@@ -30,5 +30,5 @@ uint32_t platform_interrupt_get_enabled(void)
 	return 0;
 }
 
-void platform_interrupt_mask(uint32_t irq, uint32_t mask) {}
-void platform_interrupt_unmask(uint32_t irq, uint32_t mask) {}
+void platform_interrupt_mask(uint32_t irq) {}
+void platform_interrupt_unmask(uint32_t irq) {}
diff --git a/src/drivers/intel/baytrail/interrupt.c b/src/drivers/intel/baytrail/interrupt.c
index b8e13c945..50a6ac79f 100644
--- a/src/drivers/intel/baytrail/interrupt.c
+++ b/src/drivers/intel/baytrail/interrupt.c
@@ -84,36 +84,36 @@ uint32_t platform_interrupt_get_enabled(void)
 	return shim_read(SHIM_PIMR);
 }
 
-void platform_interrupt_mask(uint32_t irq, uint32_t mask)
+void platform_interrupt_mask(uint32_t irq)
 {
 	switch (irq) {
 	case IRQ_NUM_EXT_SSP0:
-		shim_write(SHIM_PIMR, mask << 3);
+		shim_write(SHIM_PIMR, 1 << 3);
 		break;
 	case IRQ_NUM_EXT_SSP1:
-		shim_write(SHIM_PIMR, mask << 4);
+		shim_write(SHIM_PIMR, 1 << 4);
 		break;
 	case IRQ_NUM_EXT_SSP2:
-		shim_write(SHIM_PIMR, mask << 5);
+		shim_write(SHIM_PIMR, 1 << 5);
 		break;
 	case IRQ_NUM_EXT_DMAC0:
-		shim_write(SHIM_PIMR, mask << 16);
+		shim_write(SHIM_PIMR, 1 << 16);
 		break;
 	case IRQ_NUM_EXT_DMAC1:
-		shim_write(SHIM_PIMR, mask << 24);
+		shim_write(SHIM_PIMR, 1 << 24);
 		break;
 #if defined CONFIG_CHERRYTRAIL
 	case IRQ_NUM_EXT_DMAC2:
-		shim_write(SHIM_PIMRH, mask << 8);
+		shim_write(SHIM_PIMRH, 1 << 8);
 		break;
 	case IRQ_NUM_EXT_SSP3:
-		shim_write(SHIM_PIMRH, mask << 0);
+		shim_write(SHIM_PIMRH, 1 << 0);
 		break;
 	case IRQ_NUM_EXT_SSP4:
-		shim_write(SHIM_PIMRH, mask << 1);
+		shim_write(SHIM_PIMRH, 1 << 1);
 		break;
 	case IRQ_NUM_EXT_SSP5:
-		shim_write(SHIM_PIMRH, mask << 2);
+		shim_write(SHIM_PIMRH, 1 << 2);
 		break;
 #endif
 	default:
@@ -121,36 +121,36 @@ void platform_interrupt_mask(uint32_t irq, uint32_t mask)
 	}
 }
 
-void platform_interrupt_unmask(uint32_t irq, uint32_t mask)
+void platform_interrupt_unmask(uint32_t irq)
 {
 	switch (irq) {
 	case IRQ_NUM_EXT_SSP0:
-		shim_write(SHIM_PIMR, shim_read(SHIM_PIMR) & ~(mask << 3));
+		shim_write(SHIM_PIMR, shim_read(SHIM_PIMR) & ~(1 << 3));
 		break;
 	case IRQ_NUM_EXT_SSP1:
-		shim_write(SHIM_PIMR, shim_read(SHIM_PIMR) & ~(mask << 4));
+		shim_write(SHIM_PIMR, shim_read(SHIM_PIMR) & ~(1 << 4));
 		break;
 	case IRQ_NUM_EXT_SSP2:
-		shim_write(SHIM_PIMR, shim_read(SHIM_PIMR) & ~(mask << 5));
+		shim_write(SHIM_PIMR, shim_read(SHIM_PIMR) & ~(1 << 5));
 		break;
 	case IRQ_NUM_EXT_DMAC0:
-		shim_write(SHIM_PIMR, shim_read(SHIM_PIMR) & ~(mask << 16));
+		shim_write(SHIM_PIMR, shim_read(SHIM_PIMR) & ~(1 << 16));
 		break;
 	case IRQ_NUM_EXT_DMAC1:
-		shim_write(SHIM_PIMR, shim_read(SHIM_PIMR) & ~(mask << 24));
+		shim_write(SHIM_PIMR, shim_read(SHIM_PIMR) & ~(1 << 24));
 		break;
 #if defined CONFIG_CHERRYTRAIL
 	case IRQ_NUM_EXT_DMAC2:
-		shim_write(SHIM_PIMRH, shim_read(SHIM_PIMRH) & ~(mask << 8));
+		shim_write(SHIM_PIMRH, shim_read(SHIM_PIMRH) & ~(1 << 8));
 		break;
 	case IRQ_NUM_EXT_SSP3:
-		shim_write(SHIM_PIMRH, shim_read(SHIM_PIMRH) & ~(mask << 0));
+		shim_write(SHIM_PIMRH, shim_read(SHIM_PIMRH) & ~(1 << 0));
 		break;
 	case IRQ_NUM_EXT_SSP4:
-		shim_write(SHIM_PIMRH, shim_read(SHIM_PIMRH) & ~(mask << 1));
+		shim_write(SHIM_PIMRH, shim_read(SHIM_PIMRH) & ~(1 << 1));
 		break;
 	case IRQ_NUM_EXT_SSP5:
-		shim_write(SHIM_PIMRH, shim_read(SHIM_PIMRH) & ~(mask << 2));
+		shim_write(SHIM_PIMRH, shim_read(SHIM_PIMRH) & ~(1 << 2));
 		break;
 #endif
 	default:
diff --git a/src/drivers/intel/cavs/dmic.c b/src/drivers/intel/cavs/dmic.c
index f79319557..fdec691f7 100644
--- a/src/drivers/intel/cavs/dmic.c
+++ b/src/drivers/intel/cavs/dmic.c
@@ -1537,7 +1537,7 @@ static int dmic_probe(struct dai *dai)
 	/* Disable dynamic clock gating for dmic before touching any reg */
 	pm_runtime_get_sync(DMIC_CLK, dai->index);
 
-	platform_interrupt_unmask(dmic_irq(dai), 1);
+	platform_interrupt_unmask(dmic_irq(dai));
 	interrupt_enable(dmic_irq(dai));
 
 	return 0;
@@ -1548,7 +1548,7 @@ static int dmic_remove(struct dai *dai)
 	int i;
 
 	interrupt_disable(dmic_irq(dai));
-	platform_interrupt_mask(dmic_irq(dai), 0);
+	platform_interrupt_mask(dmic_irq(dai));
 	interrupt_unregister(dmic_irq(dai), dai);
 
 	pm_runtime_put_sync(DMIC_CLK, dai->index);
diff --git a/src/drivers/intel/cavs/interrupt.c b/src/drivers/intel/cavs/interrupt.c
index 44d08b5a7..c9dc8b083 100644
--- a/src/drivers/intel/cavs/interrupt.c
+++ b/src/drivers/intel/cavs/interrupt.c
@@ -164,7 +164,7 @@ uint32_t platform_interrupt_get_enabled(void)
 	return 0;
 }
 
-void platform_interrupt_mask(uint32_t irq, uint32_t mask)
+void platform_interrupt_mask(uint32_t irq)
 {
 	int core = SOF_IRQ_CPU(irq);
 
@@ -187,7 +187,7 @@ void platform_interrupt_mask(uint32_t irq, uint32_t mask)
 	}
 }
 
-void platform_interrupt_unmask(uint32_t irq, uint32_t mask)
+void platform_interrupt_unmask(uint32_t irq)
 {
 	int core = SOF_IRQ_CPU(irq);
 
diff --git a/src/drivers/intel/cavs/timer.c b/src/drivers/intel/cavs/timer.c
index 75b075a45..3b57f85a9 100644
--- a/src/drivers/intel/cavs/timer.c
+++ b/src/drivers/intel/cavs/timer.c
@@ -170,7 +170,7 @@ void timer_enable(struct timer *timer)
 		interrupt_enable(timer->irq);
 		break;
 	case TIMER3:
-		platform_interrupt_unmask(timer->irq, 0);
+		platform_interrupt_unmask(timer->irq);
 		break;
 	}
 }
@@ -184,7 +184,7 @@ void timer_disable(struct timer *timer)
 		interrupt_disable(timer->irq);
 		break;
 	case TIMER3:
-		platform_interrupt_mask(timer->irq, 0);
+		platform_interrupt_mask(timer->irq);
 		break;
 	}
 }
diff --git a/src/drivers/intel/haswell/interrupt.c b/src/drivers/intel/haswell/interrupt.c
index 091ea749f..b85e2268b 100644
--- a/src/drivers/intel/haswell/interrupt.c
+++ b/src/drivers/intel/haswell/interrupt.c
@@ -48,7 +48,7 @@ uint32_t platform_interrupt_get_enabled(void)
 	return shim_read(SHIM_IMRD);
 }
 
-void platform_interrupt_mask(uint32_t irq, uint32_t mask)
+void platform_interrupt_mask(uint32_t irq)
 {
 	switch (irq) {
 	case IRQ_NUM_EXT_SSP0:
@@ -68,7 +68,7 @@ void platform_interrupt_mask(uint32_t irq, uint32_t mask)
 	}
 }
 
-void platform_interrupt_unmask(uint32_t irq, uint32_t mask)
+void platform_interrupt_unmask(uint32_t irq)
 {
 	switch (irq) {
 	case IRQ_NUM_EXT_SSP0:
diff --git a/src/drivers/interrupt.c b/src/drivers/interrupt.c
index 3ac7784ef..12a16f956 100644
--- a/src/drivers/interrupt.c
+++ b/src/drivers/interrupt.c
@@ -138,7 +138,7 @@ static uint32_t irq_enable_child(struct irq_desc *parent, int irq)
 			parent->enabled_count++;
 
 			/* enable the child interrupt */
-			platform_interrupt_unmask(irq, 0);
+			platform_interrupt_unmask(irq);
 		}
 	}
 
@@ -165,7 +165,7 @@ static uint32_t irq_disable_child(struct irq_desc *parent, int irq)
 			parent->enabled_count--;
 
 			/* disable the child interrupt */
-			platform_interrupt_mask(irq, 0);
+			platform_interrupt_mask(irq);
 		}
 	}
 
diff --git a/src/include/sof/drivers/interrupt.h b/src/include/sof/drivers/interrupt.h
index 74d2b6b6c..7741a03e2 100644
--- a/src/include/sof/drivers/interrupt.h
+++ b/src/include/sof/drivers/interrupt.h
@@ -66,8 +66,8 @@ struct irq_desc *platform_irq_get_parent(uint32_t irq);
 void platform_interrupt_set(uint32_t irq);
 void platform_interrupt_clear(uint32_t irq, uint32_t mask);
 uint32_t platform_interrupt_get_enabled(void);
-void platform_interrupt_mask(uint32_t irq, uint32_t mask);
-void platform_interrupt_unmask(uint32_t irq, uint32_t mask);
+void platform_interrupt_mask(uint32_t irq);
+void platform_interrupt_unmask(uint32_t irq);
 
 static inline void interrupt_set(int irq)
 {