From 251d86bad1f3fb78eaa0fd93798644c5f8bb295c Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Fri, 16 Dec 2022 04:15:14 +0100 Subject: [PATCH] tree: Replace LAnd(a,b) with ASL 2.0 syntax Replace `LAnd (a, b)` with `a && b`. Change-Id: I6b7b958e2d2a43926663a8dc8755613abb07e949 Signed-off-by: Felix Singer Reviewed-on: https://review.coreboot.org/c/coreboot/+/70844 Reviewed-by: Eric Lai Tested-by: build bot (Jenkins) Reviewed-by: Elyes Haouas --- src/soc/intel/baytrail/acpi/southcluster.asl | 2 +- src/soc/intel/braswell/acpi/southcluster.asl | 2 +- src/soc/intel/icelake/acpi/pch_hda.asl | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/soc/intel/baytrail/acpi/southcluster.asl b/src/soc/intel/baytrail/acpi/southcluster.asl index d3b3902961..37ae3cad2e 100644 --- a/src/soc/intel/baytrail/acpi/southcluster.asl +++ b/src/soc/intel/baytrail/acpi/southcluster.asl @@ -155,7 +155,7 @@ Method (_CRS, 0, Serialized) CreateDWordField (MCRS, ^LMEM._MIN, LMIN) CreateDWordField (MCRS, ^LMEM._MAX, LMAX) CreateDWordField (MCRS, ^LMEM._LEN, LLEN) - If (LAnd (LPFW != Zero, LPEN == One)) + If (LPFW != Zero && LPEN == One) { LMIN = LPFW LLEN = 0x00100000 diff --git a/src/soc/intel/braswell/acpi/southcluster.asl b/src/soc/intel/braswell/acpi/southcluster.asl index c8fcf0d33f..96145704c9 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 (LPFW != Zero, LPEN == One)) + If (LPFW != Zero && LPEN == One) { LMIN = LPFW LMAX = LMIN + 0x001FFFFF diff --git a/src/soc/intel/icelake/acpi/pch_hda.asl b/src/soc/intel/icelake/acpi/pch_hda.asl index 1073f37ae8..b3b5270186 100644 --- a/src/soc/intel/icelake/acpi/pch_hda.asl +++ b/src/soc/intel/icelake/acpi/pch_hda.asl @@ -36,8 +36,7 @@ Device (HDAS) * NHLT Query only supported for revision 1 and * if NHLT address and length are set in NVS. */ - If (LAnd (Arg1 == One, - LAnd (NHLA != Zero, NHLL != Zero))) { + If (Arg1 == One && NHLA != Zero && NHLL != Zero) { Return (Buffer (One) { 0x03 }) } Else { Return (Buffer (One) { 0x01 })