diff --git a/src/soc/intel/apollolake/acpi/gpiolib.asl b/src/soc/intel/apollolake/acpi/gpiolib.asl
index eb46df53f0..89f647e0e9 100644
--- a/src/soc/intel/apollolake/acpi/gpiolib.asl
+++ b/src/soc/intel/apollolake/acpi/gpiolib.asl
@@ -60,8 +60,7 @@ Scope (\_SB)
 		Store (0, Local1)
 		Or( Or (ShiftLeft (Arg0, 16), CONFIG_PCR_BASE_ADDRESS),
 					Local1, Local1)
-		Or(PAD_CFG_BASE + Multiply (Arg1, Multiply (
-			GPIO_NUM_PAD_CFG_REGS, 4)), Local1, Local1)
+		Or(PAD_CFG_BASE + Arg1 * GPIO_NUM_PAD_CFG_REGS * 4, Local1, Local1)
 		Return (Local1)
 	}
 
@@ -69,7 +68,7 @@ Scope (\_SB)
 	Method (CHSA, 0x1, Serialized)
 	{
 		/* Arg0 - GPIO pad offset relative to the community */
-		Local1 = HOSTSW_OWN_REG_0 + Multiply (Divide (Arg0, 32), 4)
+		Local1 = HOSTSW_OWN_REG_0 + Divide (Arg0, 32) * 4
 		Return (Local1)
 	}