diff --git a/src/soc/intel/braswell/acpi/dptf/charger.asl b/src/soc/intel/braswell/acpi/dptf/charger.asl
index 6fe8badfd5..fb258f1cd9 100644
--- a/src/soc/intel/braswell/acpi/dptf/charger.asl
+++ b/src/soc/intel/braswell/acpi/dptf/charger.asl
@@ -9,7 +9,7 @@ Device (TCHG)
 
 	Method (_STA)
 	{
-		If (LEqual (\DPTE, One)) {
+		If (\DPTE == One) {
 			Return (0xF)
 		} Else {
 			Return (0x0)
@@ -30,7 +30,7 @@ Device (TCHG)
 		Local0--
 
 		/* Check if charging is disabled (AC removed) */
-		If (LEqual (\_SB.PCI0.LPCB.EC0.ACEX, Zero)) {
+		If (\_SB.PCI0.LPCB.EC0.ACEX == Zero) {
 			/* Return last power state */
 			Return (Local0)
 		} Else {
diff --git a/src/soc/intel/braswell/acpi/dptf/cpu.asl b/src/soc/intel/braswell/acpi/dptf/cpu.asl
index d2ee0aef10..7af5b6b6b3 100644
--- a/src/soc/intel/braswell/acpi/dptf/cpu.asl
+++ b/src/soc/intel/braswell/acpi/dptf/cpu.asl
@@ -40,7 +40,7 @@ Device (B0DB)
 
 	Method (_STA)
 	{
-		If (LEqual (\DPTE, One)) {
+		If (\DPTE == One) {
 			Return (0xF)
 		} Else {
 			Return (0x0)
diff --git a/src/soc/intel/braswell/acpi/dptf/dptf.asl b/src/soc/intel/braswell/acpi/dptf/dptf.asl
index b41effc7b7..939db166a6 100644
--- a/src/soc/intel/braswell/acpi/dptf/dptf.asl
+++ b/src/soc/intel/braswell/acpi/dptf/dptf.asl
@@ -19,7 +19,7 @@ Device (DPTF)
 
 	Method (_STA)
 	{
-		If (LEqual (\DPTE, One)) {
+		If (\DPTE == One) {
 			Return (0xF)
 		} Else {
 			Return (0x0)
@@ -36,7 +36,7 @@ Device (DPTF)
 	Method (_OSC, 4, Serialized)
 	{
 		/* Check for Passive Policy UUID */
-		If (LEqual (DeRefOf (Index (IDSP, 0)), Arg0)) {
+		If (DeRefOf (Index (IDSP, 0)) == Arg0) {
 			/* Initialize Thermal Devices */
 			^TINI ()
 
diff --git a/src/soc/intel/braswell/acpi/dptf/thermal.asl b/src/soc/intel/braswell/acpi/dptf/thermal.asl
index 3d924879cf..d2991bcf7f 100644
--- a/src/soc/intel/braswell/acpi/dptf/thermal.asl
+++ b/src/soc/intel/braswell/acpi/dptf/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)
@@ -108,7 +108,7 @@ Device (TSR1)
 
 	Method (_STA)
 	{
-		If (LEqual (\DPTE, One)) {
+		If (\DPTE == One) {
 			Return (0xF)
 		} Else {
 			Return (0x0)
@@ -164,7 +164,7 @@ Device (TSR2)
 
 	Method (_STA)
 	{
-		If (LEqual (\DPTE, One)) {
+		If (\DPTE == One) {
 			Return (0xF)
 		} Else {
 			Return (0x0)
diff --git a/src/soc/intel/braswell/acpi/dptf/wifi.asl b/src/soc/intel/braswell/acpi/dptf/wifi.asl
index 0554d61b72..8c0105f038 100644
--- a/src/soc/intel/braswell/acpi/dptf/wifi.asl
+++ b/src/soc/intel/braswell/acpi/dptf/wifi.asl
@@ -9,7 +9,7 @@ Device (WIFI)
 
 	Method (_STA)
 	{
-		If (LEqual (\DPTE, One)) {
+		If (\DPTE == One) {
 			Return (0xF)
 		} Else {
 			Return (0x0)
diff --git a/src/soc/intel/braswell/acpi/dptf/wwan.asl b/src/soc/intel/braswell/acpi/dptf/wwan.asl
index f40889d79e..bef112f906 100644
--- a/src/soc/intel/braswell/acpi/dptf/wwan.asl
+++ b/src/soc/intel/braswell/acpi/dptf/wwan.asl
@@ -9,7 +9,7 @@ Device (WWAN)
 
 	Method (_STA)
 	{
-		If (LEqual (\DPTE, One)) {
+		If (\DPTE == One) {
 			Return (0xF)
 		} Else {
 			Return (0x0)
diff --git a/src/soc/intel/braswell/acpi/lpe.asl b/src/soc/intel/braswell/acpi/lpe.asl
index d655ae8c4f..629070bc61 100644
--- a/src/soc/intel/braswell/acpi/lpe.asl
+++ b/src/soc/intel/braswell/acpi/lpe.asl
@@ -64,7 +64,7 @@ Device (LPEA)
 
 	Method (_STA)
 	{
-		If (LEqual (\LPEN, 1)) {
+		If (\LPEN == 1) {
 			Return (0xF)
 		} Else {
 			Return (0x0)
diff --git a/src/soc/intel/braswell/acpi/lpss.asl b/src/soc/intel/braswell/acpi/lpss.asl
index 2516a9ffc6..09308e2541 100644
--- a/src/soc/intel/braswell/acpi/lpss.asl
+++ b/src/soc/intel/braswell/acpi/lpss.asl
@@ -55,7 +55,7 @@ Device (SDM1)
 
 	Method (_STA)
 	{
-		If (LEqual (\S0EN, 1)) {
+		If (\S0EN == 1) {
 			Return (0xF)
 		} Else {
 			Return (0x0)
@@ -87,7 +87,7 @@ Device (SDM2)
 
 	Method (_STA)
 	{
-		If (LEqual (\S8EN, 1)) {
+		If (\S8EN == 1) {
 			Return (0xF)
 		} Else {
 			Return (0x0)
@@ -127,7 +127,7 @@ Device (I2C1)
 
 	Method (_STA)
 	{
-		If (LEqual (\S1EN, 1)) {
+		If (\S1EN == 1) {
 			Return (0xF)
 		} Else {
 			Return (0x0)
@@ -186,7 +186,7 @@ Device (I2C2)
 
 	Method (_STA)
 	{
-		If (LEqual (\S2EN, 1)) {
+		If (\S2EN == 1) {
 			Return (0xF)
 		} Else {
 			Return (0x0)
@@ -245,7 +245,7 @@ Device (I2C3)
 
 	Method (_STA)
 	{
-		If (LEqual (\S3EN, 1)) {
+		If (\S3EN == 1) {
 			Return (0xF)
 		} Else {
 			Return (0x0)
@@ -304,7 +304,7 @@ Device (I2C4)
 
 	Method (_STA)
 	{
-		If (LEqual (\S4EN, 1)) {
+		If (\S4EN == 1) {
 			Return (0xF)
 		} Else {
 			Return (0x0)
@@ -363,7 +363,7 @@ Device (I2C5)
 
 	Method (_STA)
 	{
-		If (LEqual (\S5EN, 1)) {
+		If (\S5EN == 1) {
 			Return (0xF)
 		} Else {
 			Return (0x0)
@@ -422,7 +422,7 @@ Device (I2C6)
 
 	Method (_STA)
 	{
-		If (LEqual (\S6EN, 1)) {
+		If (\S6EN == 1) {
 			Return (0xF)
 		} Else {
 			Return (0x0)
@@ -481,7 +481,7 @@ Device (I2C7)
 
 	Method (_STA)
 	{
-		If (LEqual (\S7EN, 1)) {
+		If (\S7EN == 1) {
 			Return (0xF)
 		} Else {
 			Return (0x0)
@@ -534,7 +534,7 @@ Device (UAR1)
 
 	Method (_STA)
 	{
-		If (LEqual (\SCEN, 1)) {
+		If (\SCEN == 1) {
 			Return (0xF)
 		} Else {
 			Return (0x0)
@@ -587,7 +587,7 @@ Device (UAR2)
 
 	Method (_STA)
 	{
-		If (LEqual (\SDEN, 1)) {
+		If (\SDEN == 1) {
 			Return (0xF)
 		} Else {
 			Return (0x0)
diff --git a/src/soc/intel/braswell/acpi/scc.asl b/src/soc/intel/braswell/acpi/scc.asl
index 1260d0c7f0..44a0cbb017 100644
--- a/src/soc/intel/braswell/acpi/scc.asl
+++ b/src/soc/intel/braswell/acpi/scc.asl
@@ -25,7 +25,7 @@ Device (EMMC)
 
 	Method (_STA)
 	{
-		If (LEqual (\C0EN, 1)) {
+		If (\C0EN == 1) {
 			Return (0xF)
 		} Else {
 			Return (0x0)
@@ -78,7 +78,7 @@ Device (PEMC)
 
 	Method (_STA, 0, NotSerialized)
 	{
-		If (LEqual (\C0EN, 1)) {
+		If (\C0EN == 1) {
 			Return (0x0)
 		}
 		Else
@@ -126,7 +126,7 @@ Device (SDIO)
 
 	Method (_STA)
 	{
-		If (LEqual (\C1EN, 1)) {
+		If (\C1EN == 1) {
 			Return (0xF)
 		} Else {
 			Return (0x0)
@@ -178,7 +178,7 @@ Device (SDCD)
 
 	Method (_STA)
 	{
-		If (LEqual (\C2EN, 1)) {
+		If (\C2EN == 1) {
 			Return (0xF)
 		} Else {
 			Return (0x0)
diff --git a/src/soc/intel/braswell/acpi/southcluster.asl b/src/soc/intel/braswell/acpi/southcluster.asl
index 2a012e0778..546c699522 100644
--- a/src/soc/intel/braswell/acpi/southcluster.asl
+++ b/src/soc/intel/braswell/acpi/southcluster.asl
@@ -154,7 +154,7 @@ Method (_CRS, 0, Serialized)
 	CreateDWordField (MCRS, LMEM._MIN, LMIN)
 	CreateDWordField (MCRS, LMEM._MAX, LMAX)
 	CreateDWordField (MCRS, LMEM._LEN, LLEN)
-	If (LAnd (LNotEqual (LPFW, Zero), LEqual (LPEN, One)))
+	If (LAnd (LNotEqual (LPFW, Zero), LPEN == One))
 	{
 		Store (LPFW, LMIN)
 		Store (Add (LMIN, 0x001FFFFF), LMAX)
@@ -207,7 +207,7 @@ Device (PDRC)
 Method (_OSC, 4)
 {
 	/* Check for proper GUID */
-	If (LEqual (Arg0, ToUUID("33DB4D5B-1FF7-401C-9657-7441C03DD766")))
+	If (Arg0 == ToUUID("33DB4D5B-1FF7-401C-9657-7441C03DD766"))
 	{
 		/* Let OS control everything */
 		Return (Arg3)