diff --git a/src/soc/intel/cannonlake/acpi/gpio.asl b/src/soc/intel/cannonlake/acpi/gpio.asl
index a1bc375714..375a6a3068 100644
--- a/src/soc/intel/cannonlake/acpi/gpio.asl
+++ b/src/soc/intel/cannonlake/acpi/gpio.asl
@@ -91,7 +91,7 @@ Method (GADD, 1, NotSerialized)
 		Local1 = Arg0 - GPP_C0
 	}
 	Store (PCRB (Local0), Local2)
-	Add (Local2, PAD_CFG_BASE, Local2)
+	Local2 += PAD_CFG_BASE
 	Return (Add (Local2, Multiply (Local1, 16)))
 }
 
diff --git a/src/soc/intel/cannonlake/acpi/gpio_cnp_h.asl b/src/soc/intel/cannonlake/acpi/gpio_cnp_h.asl
index 5007d96c22..db4b53d511 100644
--- a/src/soc/intel/cannonlake/acpi/gpio_cnp_h.asl
+++ b/src/soc/intel/cannonlake/acpi/gpio_cnp_h.asl
@@ -91,6 +91,6 @@ Method (GADD, 1, NotSerialized)
 		Local1 = Arg0 - GPP_I0
 	}
 	Store (PCRB (Local0), Local2)
-	Add (Local2, PAD_CFG_BASE, Local2)
+	Local2 += PAD_CFG_BASE
 	Return (Add (Local2, Multiply (Local1, 16)))
 }