diff --git a/src/mainboard/google/cyan/acpi/codec_maxim.asl b/src/mainboard/google/cyan/acpi/codec_maxim.asl
index e85e93775c..dd68904f9b 100644
--- a/src/mainboard/google/cyan/acpi/codec_maxim.asl
+++ b/src/mainboard/google/cyan/acpi/codec_maxim.asl
@@ -39,7 +39,7 @@ Scope (\_SB.PCI0.I2C2)
 
 		Method (_STA)
 		{
-			If (LEqual (\S2EN, 1)) {
+			If (\S2EN == 1) {
 				Return (0xF)
 			} Else {
 				Return (0x0)
diff --git a/src/mainboard/google/cyan/acpi/touchscreen_elan.asl b/src/mainboard/google/cyan/acpi/touchscreen_elan.asl
index 3a5d04e6c9..14e5135425 100644
--- a/src/mainboard/google/cyan/acpi/touchscreen_elan.asl
+++ b/src/mainboard/google/cyan/acpi/touchscreen_elan.asl
@@ -29,7 +29,7 @@ Scope (\_SB.PCI0.I2C1)
 
 		Method (_STA)
 		{
-			If (LEqual (\S1EN, 1)) {
+			If (\S1EN == 1) {
 				Return (0xF)
 			} Else {
 				Return (0x0)
diff --git a/src/mainboard/google/cyan/acpi/touchscreen_melfas.asl b/src/mainboard/google/cyan/acpi/touchscreen_melfas.asl
index e972056510..6fc1e107d4 100644
--- a/src/mainboard/google/cyan/acpi/touchscreen_melfas.asl
+++ b/src/mainboard/google/cyan/acpi/touchscreen_melfas.asl
@@ -28,7 +28,7 @@ Scope (\_SB.PCI0.I2C1)
 
 		Method (_STA)
 		{
-			If (LEqual (\S1EN, 1)) {
+			If (\S1EN == 1) {
 				Return (0xF)
 			} Else {
 				Return (0x0)
diff --git a/src/mainboard/google/cyan/acpi/touchscreen_synaptics.asl b/src/mainboard/google/cyan/acpi/touchscreen_synaptics.asl
index a944db6113..4759dbb019 100644
--- a/src/mainboard/google/cyan/acpi/touchscreen_synaptics.asl
+++ b/src/mainboard/google/cyan/acpi/touchscreen_synaptics.asl
@@ -14,13 +14,12 @@ Scope (\_SB.PCI0.I2C1)
 		 */
 		Method (_DSM, 4, NotSerialized)
 		{
-			If (LEqual (Arg0, ToUUID (
-				"3cdff6f7-4267-4555-ad05-b30a3d8938de")))
+			If (Arg0 == ToUUID ("3cdff6f7-4267-4555-ad05-b30a3d8938de"))
 			{
 				// DSM Revision
-				If (LEqual (Arg2, Zero))
+				If (Arg2 == Zero)
 				{
-					If (LEqual (Arg1, One))
+					If (Arg1 == One)
 					{
 						Return (Buffer (One)
 						{
@@ -36,7 +35,7 @@ Scope (\_SB.PCI0.I2C1)
 					}
 				}
 				// HID Function
-				If (LEqual (Arg2, One))
+				If (Arg2 == One)
 				{
 					Return (0x20)
 				}
@@ -71,7 +70,7 @@ Scope (\_SB.PCI0.I2C1)
 
 		Method (_STA)
 		{
-			If (LEqual (\S1EN, 1)) {
+			If (\S1EN == 1) {
 				Return (0xF)
 			} Else {
 				Return (0x0)
diff --git a/src/mainboard/google/cyan/acpi/trackpad_atmel.asl b/src/mainboard/google/cyan/acpi/trackpad_atmel.asl
index 91678de8b8..43180a2bea 100644
--- a/src/mainboard/google/cyan/acpi/trackpad_atmel.asl
+++ b/src/mainboard/google/cyan/acpi/trackpad_atmel.asl
@@ -25,7 +25,7 @@ Scope (\_SB.PCI0.I2C6)
 
 		Method (_STA)
 		{
-			If (LEqual (\S6EN, 1)) {
+			If (\S6EN == 1) {
 				Return (0xF)
 			} Else {
 				Return (0x0)
diff --git a/src/mainboard/google/cyan/acpi/trackpad_elan.asl b/src/mainboard/google/cyan/acpi/trackpad_elan.asl
index aa268b1b5d..93cda3477f 100644
--- a/src/mainboard/google/cyan/acpi/trackpad_elan.asl
+++ b/src/mainboard/google/cyan/acpi/trackpad_elan.asl
@@ -24,7 +24,7 @@ Scope (\_SB.PCI0.I2C6)
 
 		Method (_STA)
 		{
-			If (LEqual (\S6EN, 1)) {
+			If (\S6EN == 1) {
 				Return (0xF)
 			} Else {
 				Return (0x0)
diff --git a/src/mainboard/google/cyan/variants/terra/include/variant/acpi/dptf.asl b/src/mainboard/google/cyan/variants/terra/include/variant/acpi/dptf.asl
index 621e5d3091..19f26097cd 100644
--- a/src/mainboard/google/cyan/variants/terra/include/variant/acpi/dptf.asl
+++ b/src/mainboard/google/cyan/variants/terra/include/variant/acpi/dptf.asl
@@ -156,7 +156,7 @@ Device (DPTF)
 
 	Method (_STA)
 	{
-		If (LEqual (\DPTE, One)) {
+		If (\DPTE == One) {
 			Return (0xF)
 		} Else {
 			Return (0x0)
@@ -173,7 +173,7 @@ Device (DPTF)
 	Method (_OSC, 4, Serialized)
 	{
 		/* Check for Passive Policy UUID */
-		If (LEqual (DeRefOf (IDSP[0]), Arg0)) {
+		If (DeRefOf (IDSP[0]) == Arg0) {
 			/* Initialize Thermal Devices */
 			^TINI ()
 
@@ -192,7 +192,7 @@ Device (DPTF)
 	/* Return TRT table defined by Terra2 or Terra3 mainboard */
 	Method (_TRT)
 	{
-		If (Lequal(\_SB.GPID, TERRA2_PROJECT_ID))
+		If (\_SB.GPID == TERRA2_PROJECT_ID)
 		{
 			Return (\_SB.TRT2)
 		} Else {
diff --git a/src/mainboard/google/cyan/variants/terra/include/variant/acpi/thermal.asl b/src/mainboard/google/cyan/variants/terra/include/variant/acpi/thermal.asl
index 1e2d286378..d8f1170672 100644
--- a/src/mainboard/google/cyan/variants/terra/include/variant/acpi/thermal.asl
+++ b/src/mainboard/google/cyan/variants/terra/include/variant/acpi/thermal.asl
@@ -9,17 +9,17 @@ Method (TEVT, 1, NotSerialized)
 	Store (ToInteger (Arg0), Local0)
 
 #ifdef DPTF_TSR0_SENSOR_ID
-	If (LEqual (Local0, DPTF_TSR0_SENSOR_ID)) {
+	If (Local0 == DPTF_TSR0_SENSOR_ID) {
 		Notify (^TSR0, 0x90)
 	}
 #endif
 #ifdef DPTF_TSR1_SENSOR_ID
-	If (LEqual (Local0, DPTF_TSR1_SENSOR_ID)) {
+	If (Local0 == DPTF_TSR1_SENSOR_ID) {
 		Notify (^TSR1, 0x90)
 	}
 #endif
 #ifdef DPTF_TSR2_SENSOR_ID
-	If (LEqual (Local0, DPTF_TSR2_SENSOR_ID)) {
+	If (Local0 == DPTF_TSR2_SENSOR_ID) {
 		Notify (^TSR2, 0x90)
 	}
 #endif
@@ -52,7 +52,7 @@ Device (TSR0)
 
 	Method (_STA)
 	{
-		If (LEqual (\DPTE, One)) {
+		If (\DPTE == One) {
 			Return (0xF)
 		} Else {
 			Return (0x0)
@@ -67,7 +67,7 @@ Device (TSR0)
 	/* Return passive thermal point defined by Terra2 or Terra3 mainboard */
 	Method (_PSV)
 	{
-		If (LEqual (\_SB.GPID, TERRA2_PROJECT_ID))
+		If (\_SB.GPID == TERRA2_PROJECT_ID)
 		{
 			Return (CTOK (DPTF_TERRA2_TSR0_PASSIVE))
 		} Else {
@@ -78,7 +78,7 @@ Device (TSR0)
 	/* Return critical thermal point defined by Terra2 or Terra3 mainboard */
 	Method (_CRT)
 	{
-		If (LEqual (\_SB.GPID, TERRA2_PROJECT_ID))
+		If (\_SB.GPID == TERRA2_PROJECT_ID)
 		{
 			Return (CTOK (DPTF_TERRA2_TSR0_CRITICAL))
 		} Else {
@@ -120,7 +120,7 @@ Device (TSR1)
 
 	Method (_STA)
 	{
-		If (LEqual (\DPTE, One)) {
+		If (\DPTE == One) {
 			Return (0xF)
 		} Else {
 			Return (0x0)
@@ -135,7 +135,7 @@ Device (TSR1)
 	/* Return passive thermal point defined by Terra2 or Terra3 mainboard */
 	Method (_PSV)
 	{
-		If (LEqual (\_SB.GPID, TERRA2_PROJECT_ID))
+		If (\_SB.GPID == TERRA2_PROJECT_ID)
 		{
 			Return (CTOK (DPTF_TERRA2_TSR1_PASSIVE))
 		} Else {
@@ -146,7 +146,7 @@ Device (TSR1)
 	/* Return critical thermal point defined by Terra2 or Terra3 mainboard */
 	Method (_CRT)
 	{
-		If (LEqual (\_SB.GPID, TERRA2_PROJECT_ID))
+		If (\_SB.GPID == TERRA2_PROJECT_ID)
 		{
 			Return (CTOK (DPTF_TERRA2_TSR1_CRITICAL))
 		} Else {
@@ -188,7 +188,7 @@ Device (TSR2)
 
 	Method (_STA)
 	{
-		If (LEqual (\DPTE, One)) {
+		If (\DPTE == One) {
 			Return (0xF)
 		} Else {
 			Return (0x0)
@@ -203,7 +203,7 @@ Device (TSR2)
 	/* Return passive thermal point defined by Terra2 or Terra3 mainboard */
 	Method (_PSV)
 	{
-		If (LEqual (\_SB.GPID, TERRA2_PROJECT_ID))
+		If (\_SB.GPID == TERRA2_PROJECT_ID)
 		{
 			Return (CTOK (DPTF_TERRA2_TSR2_PASSIVE))
 		} Else {
@@ -214,7 +214,7 @@ Device (TSR2)
 	/* Return critical thermal point defined by Terra2 or Terra3 mainboard */
 	Method (_CRT)
 	{
-		If (LEqual (\_SB.GPID, TERRA2_PROJECT_ID))
+		If (\_SB.GPID == TERRA2_PROJECT_ID)
 		{
 			Return (CTOK (DPTF_TERRA2_TSR2_CRITICAL))
 		} Else {