3 files changed, 33 insertions, 33 deletions

diff --git a/src/mainboard/samsung/lumpy/acpi/mainboard.asl b/src/mainboard/samsung/lumpy/acpi/mainboard.asl
index 9b5ae77b4d..d9c9d614a7 100644
--- a/src/mainboard/samsung/lumpy/acpi/mainboard.asl
+++ b/src/mainboard/samsung/lumpy/acpi/mainboard.asl
@@ -8,7 +8,7 @@ Scope (\_SB) {
 		Name(_HID, EisaId("PNP0C0D"))
 		Method(_LID, 0)
 		{
-			Store (\_SB.PCI0.LPCB.EC0.LIDS, \LIDS)
+			\LIDS = \_SB.PCI0.LPCB.EC0.LIDS
 			Return (\LIDS)
 		}
 
diff --git a/src/mainboard/samsung/lumpy/acpi/platform.asl b/src/mainboard/samsung/lumpy/acpi/platform.asl
index 579308de5f..0b83f50d4f 100644
--- a/src/mainboard/samsung/lumpy/acpi/platform.asl
+++ b/src/mainboard/samsung/lumpy/acpi/platform.asl
@@ -6,43 +6,43 @@
 
 Method(_PTS,1)
 {
-	Store (Zero, GP35)  // Disable WLAN
-	Store (Zero, GP38)  // Disable WWAN
+	GP35 = 0  // Disable WLAN
+	GP38 = 0  // Disable WWAN
 
 	If (S33G) {
-		Store (Zero, GP43)  // Enable HSPA
+		GP43 = 0  // Enable HSPA
 	} Else {
-		Store (One, GP43)   // Disable HSPA
+		GP43 = 1   // Disable HSPA
 	}
 
-	If (LEqual (Arg0, 3)) {
+	If (Arg0 == 3) {
 		// NVS has a flag to determine USB policy in S3
 		If (S3U0) {
-			Store (One, GP47)   // Enable USB0
+			GP47 = 1   // Enable USB0
 		} Else {
-			Store (Zero, GP47)  // Disable USB0
+			GP47 = 0  // Disable USB0
 		}
 
 		// NVS has a flag to determine USB policy in S3
 		If (S3U1) {
-			Store (One, GP56)   // Enable USB1
+			GP56 = 1   // Enable USB1
 		} Else {
-			Store (Zero, GP56)  // Disable USB1
+			GP56 = 0  // Disable USB1
 		}
 	}
-	If (LEqual (Arg0, 5)) {
+	If (Arg0 == 5) {
 		// NVS has a flag to determine USB policy in S5
 		If (S5U0) {
-			Store (One, GP47)   // Enable USB0
+			GP47 = 1   // Enable USB0
 		} Else {
-			Store (Zero, GP47)  // Disable USB0
+			GP47 = 0  // Disable USB0
 		}
 
 		// NVS has a flag to determine USB policy in S5
 		If (S5U1) {
-			Store (One, GP56)   // Enable USB1
+			GP56 = 1   // Enable USB1
 		} Else {
-			Store (Zero, GP56)  // Disable USB1
+			GP56 = 0  // Disable USB1
 		}
 	}
 }
@@ -52,10 +52,10 @@ Method(_PTS,1)
 Method(_WAK,1)
 {
 	/* Update in case state changed while asleep */
-	Store (\_SB.PCI0.LPCB.EC0.ACEX, \PWRS)
+	\PWRS = \_SB.PCI0.LPCB.EC0.ACEX
 
 	/* Enable OS control of fan */
-	Store (One, \_SB.PCI0.LPCB.EC0.FCOS)
+	\_SB.PCI0.LPCB.EC0.FCOS = 1
 
 	Return(Package(){0,0})
 }
diff --git a/src/mainboard/samsung/lumpy/acpi/thermal.asl b/src/mainboard/samsung/lumpy/acpi/thermal.asl
index dd85181e6f..55923bd9ca 100644
--- a/src/mainboard/samsung/lumpy/acpi/thermal.asl
+++ b/src/mainboard/samsung/lumpy/acpi/thermal.asl
@@ -26,10 +26,10 @@ Scope (\_TZ)
 		// Convert from Degrees C to 1/10 Kelvin for ACPI
 		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)
 		}
@@ -55,27 +55,27 @@ Scope (\_TZ)
 		Method (_TMP, 0, Serialized)
 		{
 			// Get CPU Temperature from the Embedded Controller
-			Store (\_SB.PCI0.LPCB.EC0.CPUT, Local0)
+			Local0 = \_SB.PCI0.LPCB.EC0.CPUT
 
 			// Re-read from EC if the temperature is very high to
 			// avoid OS shutdown if we got a bad reading.
-			If (LGreaterEqual (Local0, \TCRT)) {
-				Store (\_SB.PCI0.LPCB.EC0.CPUT, Local0)
-				If (LGreaterEqual (Local0, \TCRT)) {
+			If (Local0 >= \TCRT) {
+				Local0 = \_SB.PCI0.LPCB.EC0.CPUT
+				If (Local0 >= \TCRT) {
 					// Check if this is an early read
-					If (LLess (CRDC, IRDC)) {
-						Store (0, Local0)
+					If (CRDC < IRDC) {
+						Local0 = 0
 					}
 				}
 			}
 
 			// Keep track of first few reads by the OS
-			If (LLess (CRDC, IRDC)) {
-				Increment (CRDC)
+			If (CRDC < IRDC) {
+				CRDC++
 			}
 
 			// Invalid reading, ensure fan is spinning
-			If (LGreaterEqual (Local0, 0x80)) {
+			If (Local0 >= 0x80) {
 				Return (CTOK (\F4ON))
 			}
 
@@ -83,7 +83,7 @@ Scope (\_TZ)
 		}
 
 		Method (_AC0) {
-			If (LLessEqual (\FLVL, 0)) {
+			If (\FLVL <= 0) {
 				Return (CTOK (\F0OF))
 			} Else {
 				Return (CTOK (\F0ON))
@@ -91,7 +91,7 @@ Scope (\_TZ)
 		}
 
 		Method (_AC1) {
-			If (LLessEqual (\FLVL, 1)) {
+			If (\FLVL <= 1) {
 				Return (CTOK (\F1OF))
 			} Else {
 				Return (CTOK (\F1ON))
@@ -99,7 +99,7 @@ Scope (\_TZ)
 		}
 
 		Method (_AC2) {
-			If (LLessEqual (\FLVL, 2)) {
+			If (\FLVL <= 2) {
 				Return (CTOK (\F2OF))
 			} Else {
 				Return (CTOK (\F2ON))
@@ -107,7 +107,7 @@ Scope (\_TZ)
 		}
 
 		Method (_AC3) {
-			If (LLessEqual (\FLVL, 3)) {
+			If (\FLVL <= 3) {
 				Return (CTOK (\F3OF))
 			} Else {
 				Return (CTOK (\F3ON))
@@ -115,7 +115,7 @@ Scope (\_TZ)
 		}
 
 		Method (_AC4) {
-			If (LLessEqual (\FLVL, 4)) {
+			If (\FLVL <= 4) {
 				Return (CTOK (\F4OF))
 			} Else {
 				Return (CTOK (\F4ON))