diff --git a/src/soc/intel/cannonlake/acpi/gpio.asl b/src/soc/intel/cannonlake/acpi/gpio.asl
index 6b15f809eb..a1bc375714 100644
--- a/src/soc/intel/cannonlake/acpi/gpio.asl
+++ b/src/soc/intel/cannonlake/acpi/gpio.asl
@@ -64,31 +64,31 @@ Method (GADD, 1, NotSerialized)
 	If (LGreaterEqual (Arg0, GPP_A0) && LLessEqual (Arg0, SPI0_CLK_LOOPBK))
 	{
 		Store (PID_GPIOCOM0, Local0)
-		Subtract (Arg0, GPP_A0, Local1)
+		Local1 = Arg0 - GPP_A0
 	}
 	/* GPIO Community 1 */
 	If (LGreaterEqual (Arg0, GPP_D0) && LLessEqual (Arg0, vSD3_CD_B))
 	{
 		Store (PID_GPIOCOM1, Local0)
-		Subtract (Arg0, GPP_D0, Local1)
+		Local1 = Arg0 - GPP_D0
 	}
 	/* GPIO Community 2 */
 	If (LGreaterEqual (Arg0, GPD0) && LLessEqual (Arg0, DRAM_RESET_B))
 	{
 		Store (PID_GPIOCOM2, Local0)
-		Subtract (Arg0, GPD0, Local1)
+		Local1 = Arg0 - GPD0
 	}
 	/* GPIO Community 3 */
 	If (LGreaterEqual (Arg0, HDA_BCLK) && LLessEqual (Arg0, TRIGGER_OUT))
 	{
 		Store (PID_GPIOCOM3, Local0)
-		Subtract (Arg0, HDA_BCLK, Local1)
+		Local1 = Arg0 - HDA_BCLK
 	}
 	/* GPIO Community 4*/
 	If (LGreaterEqual (Arg0, GPP_C0) && LLessEqual (Arg0, CL_RST_B))
 	{
 		Store (PID_GPIOCOM4, Local0)
-		Subtract (Arg0, GPP_C0, Local1)
+		Local1 = Arg0 - GPP_C0
 	}
 	Store (PCRB (Local0), Local2)
 	Add (Local2, PAD_CFG_BASE, Local2)
diff --git a/src/soc/intel/cannonlake/acpi/gpio_cnp_h.asl b/src/soc/intel/cannonlake/acpi/gpio_cnp_h.asl
index db2b22cbe4..5007d96c22 100644
--- a/src/soc/intel/cannonlake/acpi/gpio_cnp_h.asl
+++ b/src/soc/intel/cannonlake/acpi/gpio_cnp_h.asl
@@ -70,25 +70,25 @@ Method (GADD, 1, NotSerialized)
 	If (LGreaterEqual (Arg0, GPP_A0) && LLessEqual (Arg0, GSPI1_CLK_LOOPBK))
 	{
 		Store (PID_GPIOCOM0, Local0)
-		Subtract (Arg0, GPP_A0, Local1)
+		Local1 = Arg0 - GPP_A0
 	}
 	/* GPIO Community 1 */
 	If (LGreaterEqual (Arg0, GPP_C0) && LLessEqual (Arg0, vSSP2_RXD))
 	{
 		Store (PID_GPIOCOM1, Local0)
-		Subtract (Arg0, GPP_C0, Local1)
+		Local1 = Arg0 - GPP_C0
 	}
 	/* GPIO Community 3*/
 	If (LGreaterEqual (Arg0, GPP_K0) && LLessEqual (Arg0, SPI0_CLK_LOOPBK))
 	{
 		Store (PID_GPIOCOM3, Local0)
-		Subtract (Arg0, GPP_K0, Local1)
+		Local1 = Arg0 - GPP_K0
 	}
 	/* GPIO Community 4*/
 	If (LGreaterEqual (Arg0, HDACPU_SDI) && LLessEqual (Arg0, GPP_J11))
 	{
 		Store (PID_GPIOCOM4, Local0)
-		Subtract (Arg0, GPP_I0, Local1)
+		Local1 = Arg0 - GPP_I0
 	}
 	Store (PCRB (Local0), Local2)
 	Add (Local2, PAD_CFG_BASE, Local2)