[coreboot-gerrit] Change in coreboot[master]: soc/intel/apollolake/acpi: Replace LAnd() operations with ACPI 2.0 sy...

[Felix Singer (Code Review)]

Attention is currently required from: Andrey Petrov, Patrick Rudolph.
 Felix Singer has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/60466 )

Change subject: soc/intel/apollolake/acpi: Replace LAnd() operations with ACPI 2.0 syntax
......................................................................

soc/intel/apollolake/acpi: Replace LAnd() operations with ACPI 2.0 syntax

Replace `LAnd (a, b)` with `a && b`.

Change-Id: I4bbbc4888fc134b3862bb956b2ee17a72f282584
Signed-off-by: Felix Singer 
---
M src/soc/intel/apollolake/acpi/pch_hda.asl
M src/soc/intel/apollolake/acpi/pcie_port.asl
M src/soc/intel/apollolake/acpi/scs.asl
3 files changed, 5 insertions(+), 7 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/66/60466/1

diff --git a/src/soc/intel/apollolake/acpi/pch_hda.asl b/src/soc/intel/apollolake/acpi/pch_hda.asl
index c3f862e..6c9a14a 100644
--- a/src/soc/intel/apollolake/acpi/pch_hda.asl
+++ b/src/soc/intel/apollolake/acpi/pch_hda.asl
@@ -39,9 +39,7 @@
    			 * 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 f0f49f3..710051b 100644
--- a/src/soc/intel/apollolake/acpi/pcie_port.asl
+++ b/src/soc/intel/apollolake/acpi/pcie_port.asl
@@ -49,7 +49,7 @@

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 @@
    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 1ee70ad..a5a1f06 100644
--- a/src/soc/intel/apollolake/acpi/scs.asl
+++ b/src/soc/intel/apollolake/acpi/scs.asl
@@ -118,7 +118,7 @@
    	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 @@
    	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)