3 files changed, 16 insertions, 16 deletions
diff --git a/src/mainboard/google/stout/acpi/mainboard.asl b/src/mainboard/google/stout/acpi/mainboard.asl
index 6cbe92e379..f8cbe2126f 100644
--- a/src/mainboard/google/stout/acpi/mainboard.asl
+++ b/src/mainboard/google/stout/acpi/mainboard.asl
@@ -9,14 +9,14 @@ Scope (\_SB)
 
 		Method (_LID, 0)
 		{
-			Store (\_SB.PCI0.LPCB.EC0.HPLD, \LIDS)
+			\LIDS = \_SB.PCI0.LPCB.EC0.HPLD
 			Return (\LIDS)
 		}
 
 		Method (_PSW, 1)
 		{
 			// Enable/Disable LID as a wake source
-			Store (Arg0, \_SB.PCI0.LPCB.EC0.HWLO)
+			\_SB.PCI0.LPCB.EC0.HWLO = Arg0
 		}
 	}
 }
diff --git a/src/mainboard/google/stout/acpi/platform.asl b/src/mainboard/google/stout/acpi/platform.asl
index 822059961b..b3421d564b 100644
--- a/src/mainboard/google/stout/acpi/platform.asl
+++ b/src/mainboard/google/stout/acpi/platform.asl
@@ -7,7 +7,7 @@
 Method(_PTS,1)
 {
 	// Notify EC to enter S3
-	Store(0x01, \_SB.PCI0.LPCB.EC0.S3FG)
+	\_SB.PCI0.LPCB.EC0.S3FG = 0x01
 }
 
 /* The _WAK method is called on system wakeup */
@@ -15,16 +15,16 @@ Method(_PTS,1)
 Method(_WAK,1)
 {
 	/* Update AC status */
-	Store (\_SB.PCI0.LPCB.EC0.ACPW, Local0)
-	if (LNotEqual (Local0, \PWRS)) {
-		Store (Local0, \PWRS)
+	Local0 = \_SB.PCI0.LPCB.EC0.ACPW
+	if (Local0 != \PWRS) {
+		\PWRS = Local0
 		Notify (\_SB.PCI0.LPCB.EC0.AC, 0x80)
 	}
 
 	/* Update LID status */
-	Store (NOT(\_SB.PCI0.LPCB.EC0.HPLD), Local0)
-	if (LNotEqual (Local0, \LIDS)) {
-		Store (Local0, \LIDS)
+	Local0 = ~\_SB.PCI0.LPCB.EC0.HPLD
+	if (Local0 != \LIDS) {
+		\LIDS = Local0
 		Notify (\_SB.LID0, 0x80)
 	}
 
diff --git a/src/mainboard/google/stout/acpi/thermal.asl b/src/mainboard/google/stout/acpi/thermal.asl
index 24843325ce..de5a7ef926 100644
--- a/src/mainboard/google/stout/acpi/thermal.asl
+++ b/src/mainboard/google/stout/acpi/thermal.asl
@@ -22,10 +22,10 @@ Scope (\_TZ)
 		Method (CTOK, 1)
 		{
 			// 10th of Degrees C
-			Multiply (Arg0, 10, Local0)
+			Local0 = Arg0 * 10
 
 			// Convert to Kelvin
-			Add (Local0, 2732, Local0)
+			Local0 += 2732
 
 			Return (Local0)
 		}
@@ -51,21 +51,21 @@ Scope (\_TZ)
 		Method (_TMP, 0, Serialized)
 		{
 			// Returns Higher of the two readings for CPU & VGA Temperature
-			If (LGreater (\_SB.PCI0.LPCB.EC0.TMP2, \_SB.PCI0.LPCB.EC0.TMP1))
+			If (\_SB.PCI0.LPCB.EC0.TMP2 > \_SB.PCI0.LPCB.EC0.TMP1)
 			{
 				// CPU high temperature
-				Store (\_SB.PCI0.LPCB.EC0.TMP2, Local0)
+				Local0 = \_SB.PCI0.LPCB.EC0.TMP2
 			}
 			Else
 			{
 				// VGA high temperature
-				Store (\_SB.PCI0.LPCB.EC0.TMP1, Local0)
+				Local0 = \_SB.PCI0.LPCB.EC0.TMP1
 			}
 
 			// If temp less 35 or great then 115, set default 35
-			If (Or (LLess (Local0, 35), LGreater (Local0, 115)))
+			If ((Local0 < 35) | (Local0 > 115))
 			{
-				Store (35, Local0)
+				Local0 = 35
 			}
 
 			Return (CTOK (Local0))