diff --git a/src/soc/intel/baytrail/acpi/dptf/charger.asl b/src/soc/intel/baytrail/acpi/dptf/charger.asl
index b8c6d143e1..4169b94f69 100644
--- a/src/soc/intel/baytrail/acpi/dptf/charger.asl
+++ b/src/soc/intel/baytrail/acpi/dptf/charger.asl
@@ -27,7 +27,7 @@ Device (TCHG)
 	{
 		/* Convert size of PPSS table to index */
 		Store (SizeOf (\_SB.CHPS), Local0)
-		Decrement (Local0)
+		Local0--
 
 		/* Check if charging is disabled (AC removed) */
 		If (LEqual (\PWRS, Zero)) {
diff --git a/src/soc/intel/baytrail/acpi/dptf/cpu.asl b/src/soc/intel/baytrail/acpi/dptf/cpu.asl
index cd6a572a1f..8e43f6736f 100644
--- a/src/soc/intel/baytrail/acpi/dptf/cpu.asl
+++ b/src/soc/intel/baytrail/acpi/dptf/cpu.asl
@@ -74,7 +74,7 @@ Device (TCPU)
 	{
 		If (CondRefOf (\_SB.CP00._TSS)) {
 			Store (SizeOf (\_SB.CP00._TSS ()), Local0)
-			Decrement (Local0)
+			Local0--
 			Return (Local0)
 		} Else {
 			Return (0)
@@ -117,7 +117,7 @@ Device (TCPU)
 			Return (\_SB.MPDL)
 		} ElseIf (CondRefOf (\_SB.CP00._PSS)) {
 			Store (SizeOf (\_SB.CP00._PSS ()), Local0)
-			Decrement (Local0)
+			Local0--
 			Return (Local0)
 		} Else {
 			Return (0)
diff --git a/src/soc/intel/baytrail/acpi/irqlinks.asl b/src/soc/intel/baytrail/acpi/irqlinks.asl
index ef3bdd4bcf..a2f75fad8b 100644
--- a/src/soc/intel/baytrail/acpi/irqlinks.asl
+++ b/src/soc/intel/baytrail/acpi/irqlinks.asl
@@ -44,7 +44,7 @@ Device (LNKA)
 		/* Which bit is set? */
 		FindSetRightBit(IRQ0, Local0)
 
-		Decrement(Local0)
+		Local0--
 		Store(Local0, PRTA)
 	}
 
@@ -103,7 +103,7 @@ Device (LNKB)
 		/* Which bit is set? */
 		FindSetRightBit(IRQ0, Local0)
 
-		Decrement(Local0)
+		Local0--
 		Store(Local0, PRTB)
 	}
 
@@ -162,7 +162,7 @@ Device (LNKC)
 		/* Which bit is set? */
 		FindSetRightBit(IRQ0, Local0)
 
-		Decrement(Local0)
+		Local0--
 		Store(Local0, PRTC)
 	}
 
@@ -221,7 +221,7 @@ Device (LNKD)
 		/* Which bit is set? */
 		FindSetRightBit(IRQ0, Local0)
 
-		Decrement(Local0)
+		Local0--
 		Store(Local0, PRTD)
 	}
 
@@ -280,7 +280,7 @@ Device (LNKE)
 		/* Which bit is set? */
 		FindSetRightBit(IRQ0, Local0)
 
-		Decrement(Local0)
+		Local0--
 		Store(Local0, PRTE)
 	}
 
@@ -339,7 +339,7 @@ Device (LNKF)
 		/* Which bit is set? */
 		FindSetRightBit(IRQ0, Local0)
 
-		Decrement(Local0)
+		Local0--
 		Store(Local0, PRTF)
 	}
 
@@ -398,7 +398,7 @@ Device (LNKG)
 		/* Which bit is set? */
 		FindSetRightBit(IRQ0, Local0)
 
-		Decrement(Local0)
+		Local0--
 		Store(Local0, PRTG)
 	}
 
@@ -457,7 +457,7 @@ Device (LNKH)
 		/* Which bit is set? */
 		FindSetRightBit(IRQ0, Local0)
 
-		Decrement(Local0)
+		Local0--
 		Store(Local0, PRTH)
 	}
 
diff --git a/src/soc/intel/braswell/acpi/dptf/charger.asl b/src/soc/intel/braswell/acpi/dptf/charger.asl
index fca9590c37..6fe8badfd5 100644
--- a/src/soc/intel/braswell/acpi/dptf/charger.asl
+++ b/src/soc/intel/braswell/acpi/dptf/charger.asl
@@ -27,7 +27,7 @@ Device (TCHG)
 	{
 		/* Convert size of PPSS table to index */
 		Store (SizeOf (\_SB.CHPS), Local0)
-		Decrement (Local0)
+		Local0--
 
 		/* Check if charging is disabled (AC removed) */
 		If (LEqual (\_SB.PCI0.LPCB.EC0.ACEX, Zero)) {
diff --git a/src/soc/intel/braswell/acpi/dptf/cpu.asl b/src/soc/intel/braswell/acpi/dptf/cpu.asl
index e219c990b3..d2ee0aef10 100644
--- a/src/soc/intel/braswell/acpi/dptf/cpu.asl
+++ b/src/soc/intel/braswell/acpi/dptf/cpu.asl
@@ -101,7 +101,7 @@ Device (B0DB)
 	{
 		If (CondRefOf (\_SB.CP00._TSS)) {
 			Store (SizeOf (\_SB.CP00._TSS ()), Local0)
-			Decrement (Local0)
+			Local0--
 			Return (Local0)
 		} Else {
 			Return (0)
@@ -144,7 +144,7 @@ Device (B0DB)
 			Return (\_SB.MPDL)
 		} ElseIf (CondRefOf (\_SB.CP00._PSS)) {
 			Store (SizeOf (\_SB.CP00._PSS ()), Local0)
-			Decrement (Local0)
+			Local0--
 			Return (Local0)
 		} Else {
 			Return (0)
diff --git a/src/soc/intel/braswell/acpi/irqlinks.asl b/src/soc/intel/braswell/acpi/irqlinks.asl
index 6f88459fef..508a7218fe 100644
--- a/src/soc/intel/braswell/acpi/irqlinks.asl
+++ b/src/soc/intel/braswell/acpi/irqlinks.asl
@@ -44,7 +44,7 @@ Device (LNKA)
 		/* Which bit is set? */
 		FindSetRightBit(IRQ0, Local0)
 
-		Decrement(Local0)
+		Local0--
 		Store(Local0, PRTA)
 	}
 
@@ -103,7 +103,7 @@ Device (LNKB)
 		/* Which bit is set? */
 		FindSetRightBit(IRQ0, Local0)
 
-		Decrement(Local0)
+		Local0--
 		Store(Local0, PRTB)
 	}
 
@@ -162,7 +162,7 @@ Device (LNKC)
 		/* Which bit is set? */
 		FindSetRightBit(IRQ0, Local0)
 
-		Decrement(Local0)
+		Local0--
 		Store(Local0, PRTC)
 	}
 
@@ -221,7 +221,7 @@ Device (LNKD)
 		/* Which bit is set? */
 		FindSetRightBit(IRQ0, Local0)
 
-		Decrement(Local0)
+		Local0--
 		Store(Local0, PRTD)
 	}
 
@@ -280,7 +280,7 @@ Device (LNKE)
 		/* Which bit is set? */
 		FindSetRightBit(IRQ0, Local0)
 
-		Decrement(Local0)
+		Local0--
 		Store(Local0, PRTE)
 	}
 
@@ -339,7 +339,7 @@ Device (LNKF)
 		/* Which bit is set? */
 		FindSetRightBit(IRQ0, Local0)
 
-		Decrement(Local0)
+		Local0--
 		Store(Local0, PRTF)
 	}
 
@@ -398,7 +398,7 @@ Device (LNKG)
 		/* Which bit is set? */
 		FindSetRightBit(IRQ0, Local0)
 
-		Decrement(Local0)
+		Local0--
 		Store(Local0, PRTG)
 	}
 
@@ -457,7 +457,7 @@ Device (LNKH)
 		/* Which bit is set? */
 		FindSetRightBit(IRQ0, Local0)
 
-		Decrement(Local0)
+		Local0--
 		Store(Local0, PRTH)
 	}