3 files changed, 5 insertions, 7 deletions
diff --git a/src/soc/intel/apollolake/acpi/pch_hda.asl b/src/soc/intel/apollolake/acpi/pch_hda.asl
index c3f862ef26..6c9a14a690 100644
--- a/src/soc/intel/apollolake/acpi/pch_hda.asl
+++ b/src/soc/intel/apollolake/acpi/pch_hda.asl
@@ -39,9 +39,7 @@ Device (HDAS)
 				 * NHLT Query only supported for revision 1 and
 				 * if NHLT address and length are set in NVS.
 				 */
-				If (LAnd (LEqual (Arg1, One),
-					LAnd (LNotEqual (NHLA, Zero),
-					     LNotEqual (NHLL, Zero)))) {
+				If (LEqual (Arg1, One) && LNotEqual (NHLA, Zero) && LNotEqual (NHLL, Zero)) {
 					Return (Buffer (One) { 0x03 })
 				}
 				Else {
diff --git a/src/soc/intel/apollolake/acpi/pcie_port.asl b/src/soc/intel/apollolake/acpi/pcie_port.asl
index f0f49f32b5..710051b828 100644
--- a/src/soc/intel/apollolake/acpi/pcie_port.asl
+++ b/src/soc/intel/apollolake/acpi/pcie_port.asl
@@ -49,7 +49,7 @@ PowerResource (PXP, 0, 0)
 
 	Method (_ON, 0, Serialized)
 	{
-		If (LAnd (LEqual (PDST, 1), LNotEqual (\PRT0, 0))) {
+		If (LEqual (PDST, 1) && LNotEqual (\PRT0, 0)) {
 			/* Enter this condition if device
 			 * is connected
 			 */
@@ -83,7 +83,7 @@ PowerResource (PXP, 0, 0)
 	Method (_OFF, 0, Serialized)
 	{
 		/* Set L23_Rdy Entry Request (L23ER) */
-		If (LAnd (LEqual (PDST, 1), LNotEqual (\PRT0, 0))) {
+		If (LEqual (PDST, 1) && LNotEqual (\PRT0, 0)) {
 			/* enter this condition if device
 			 * is connected
 			 */
diff --git a/src/soc/intel/apollolake/acpi/scs.asl b/src/soc/intel/apollolake/acpi/scs.asl
index 1ee70adb21..a5a1f06e60 100644
--- a/src/soc/intel/apollolake/acpi/scs.asl
+++ b/src/soc/intel/apollolake/acpi/scs.asl
@@ -118,7 +118,7 @@ Scope (\_SB.PCI0) {
 		Method (_INI, 0)
 		{
 			/* Check SDCard CD port is valid */
-			If (LAnd (LNotEqual (\SCDP, 0), LNotEqual (\SCDO, 0) ))
+			If (LNotEqual (\SCDP, 0) && LNotEqual (\SCDO, 0))
 			{
 				/* Store DW0 address of SD_CD */
 				Store (GDW0 (\SCDP, \SCDO), SCD0)
@@ -133,7 +133,7 @@ Scope (\_SB.PCI0) {
 		Method (_PS0, 0, NotSerialized)
 		{
 			/* Check SDCard CD port is valid */
-			If (LAnd (LNotEqual (\SCDP, 0), LNotEqual (\SCDO, 0) ))
+			If (LNotEqual (\SCDP, 0) && LNotEqual (\SCDO, 0))
 			{
 				/* Store DW0 into local0 to get rxstate of GPIO */
 				Store (\_SB.GPC0 (SCD0), Local0)