3 files changed, 21 insertions, 21 deletions
diff --git a/src/mainboard/lenovo/t400/acpi/dock.asl b/src/mainboard/lenovo/t400/acpi/dock.asl
index 9a6d354be9..dce1d1a5a5 100644
--- a/src/mainboard/lenovo/t400/acpi/dock.asl
+++ b/src/mainboard/lenovo/t400/acpi/dock.asl
@@ -12,14 +12,14 @@ Scope (\_SB)
 		{
 			if (Arg0) {
 			   /* connect dock */
-			   Store (1, \GP28)
-			   Store (1, \_SB.PCI0.LPCB.EC.DKR1)
+			   \GP28 = 1
+			   \_SB.PCI0.LPCB.EC.DKR1 = 1
 			} else {
 			   /* disconnect dock */
-			   Store (0, \GP28)
-			   Store (0, \_SB.PCI0.LPCB.EC.DKR1)
+			   \GP28 = 0
+			   \_SB.PCI0.LPCB.EC.DKR1 = 0
 			}
-			Xor(Arg0, \_SB.PCI0.LPCB.EC.DKR1, Local0)
+			Local0 = Arg0 ^ \_SB.PCI0.LPCB.EC.DKR1
 			Return (Local0)
 		}
 
diff --git a/src/mainboard/lenovo/t400/acpi/gpe.asl b/src/mainboard/lenovo/t400/acpi/gpe.asl
index 62e7b37bb4..9984636860 100644
--- a/src/mainboard/lenovo/t400/acpi/gpe.asl
+++ b/src/mainboard/lenovo/t400/acpi/gpe.asl
@@ -5,8 +5,8 @@ Scope (\_GPE)
 	Method(_L18, 0, NotSerialized)
 	{
 		/* Read EC register to clear wake status */
-		Store(\_SB.PCI0.LPCB.EC.WAKE, Local0)
+		Local0 = \_SB.PCI0.LPCB.EC.WAKE
 		/* So that we don't get a warning that Local0 is unused. */
-		Increment (Local0)
+		Local0++
 	}
 }
diff --git a/src/mainboard/lenovo/t400/acpi/graphics.asl b/src/mainboard/lenovo/t400/acpi/graphics.asl
index 8780e2f4db..5559bfcfa7 100644
--- a/src/mainboard/lenovo/t400/acpi/graphics.asl
+++ b/src/mainboard/lenovo/t400/acpi/graphics.asl
@@ -26,19 +26,19 @@ Field (GPCM, ByteAcc, NoLock, Preserve) {
 
 Method(SHYB, 1) {
 	/* Switch hybrid graphics */
-	if (LEqual(Arg0, One))
+	if (Arg0 == One)
 	{
 		/* Discrete graphics requested */
-		Or(GPLV, HYG1, GPLV)
-		Or(GQLV, HYG2, GQLV)
+		GPLV |= HYG1
+		GQLV |= HYG2
 	}
 	else
 	{
 		/* Integrated graphics requested */
-		Xor(HYG1, 0xFFFFFFFF, Local0)
-		And(GPLV, Local0, GPLV)
-		Xor(HYG2, 0xFFFFFFFF, Local0)
-		And(GQLV, Local0, GQLV)
+		Local0 = HYG1 ^ 0xFFFFFFFF
+		GPLV &= Local0
+		Local0 = HYG2 ^ 0xFFFFFFFF
+		GQLV &= Local0
 	}
 }
 
@@ -53,21 +53,21 @@ Method (ATPX, 2, Serialized) {
 	CreateDWordField (ATPR, 0x04, FUNC)
 
 	/* Version request */
-	if (LEqual(Arg0, 0x0))
+	if (Arg0 == 0x0)
 	{
 		/* Assemble and return version information */
-		Store (0x08, SIZE)	/* Response length */
-		Store (0x01, VERS)	/* Version number */
-		Store (0x0F, FUNC)	/* Supported functions? */
+		SIZE = 0x08	/* Response length */
+		VERS = 0x01	/* Version number */
+		FUNC = 0x0F	/* Supported functions? */
 		Return (ATPR)
 	}
 
 	/* Mux select */
-	if (LEqual(Arg0, 0x2))
+	if (Arg0 == 0x2)
 	{
 		CreateByteField (Arg1, 0x02, PWST)
-		Store (PWST, Local0)
-		And (Local0, 0x01, Local0)
+		Local0 = PWST
+		Local0 &= 0x01
 		If (Local0)
 		{
 			/* Enable discrete graphics */