From 7ee6b5a3a58b2677050c571698f563ffc75a3d6e Mon Sep 17 00:00:00 2001
From: Felix Singer <felixsinger@posteo.net>
Date: Sun, 2 Jan 2022 01:40:09 +0100
Subject: [PATCH] arch/x86/acpi: Replace LLess(a,b) with ASL 2.0 syntax

Replace `LLess(a, b)` with `a < b`.

Change-Id: Ief1d069ae0fb19a2179f08c2e9cf416367661e69
Signed-off-by: Felix Singer <felixsinger@posteo.net>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/60674
Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
Reviewed-by: Sean Rhodes <sean@starlabs.systems>
Reviewed-by: Sridhar Siricilla <sridhar.siricilla@intel.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
 src/arch/x86/acpi/debug.asl    |  2 +-
 src/arch/x86/acpi/globutil.asl | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/arch/x86/acpi/debug.asl b/src/arch/x86/acpi/debug.asl
index 41d123520e..728193e44f 100644
--- a/src/arch/x86/acpi/debug.asl
+++ b/src/arch/x86/acpi/debug.asl
@@ -76,7 +76,7 @@ Method(OUTC, 1)
 Method(DBGN, 1)
 {
 	and(Arg0, 0x0f, Local0)
-	if (LLess(Local0, 10)) {
+	if (Local0 < 10) {
 		Local0 += 0x30
 	} else {
 		Local0 += 0x37
diff --git a/src/arch/x86/acpi/globutil.asl b/src/arch/x86/acpi/globutil.asl
index ff247b9ddb..e44eb39917 100644
--- a/src/arch/x86/acpi/globutil.asl
+++ b/src/arch/x86/acpi/globutil.asl
@@ -9,7 +9,7 @@ Scope(\_SB) {
 /* string compare functions */
 Method(MIN, 2)
 {
-	if (LLess(Arg0, Arg1)) {
+	if (Arg0 < Arg1) {
 		Return(Arg0)
 	} else {
 		Return(Arg1)
@@ -40,22 +40,22 @@ Method(SCMP, 2)
 	Store(SLEN(Arg1), Local6)
 	Store(MIN(Local5, Local6), Local7)
 
-	While(LLess(Local4, Local7)) {
+	While(Local4 < Local7) {
 		Store(Derefof(Local0[Local4]), Local2)
 		Store(Derefof(Local1[Local4]), Local3)
 		if (Local2 > Local3) {
 			Return(One)
 		} else {
-			if (LLess(Local2, Local3)) {
+			if (Local2 < Local3) {
 				Return(Ones)
 			}
 		}
 		Local4++
 	}
-	if (LLess(Local4, Local5)) {
+	if (Local4 < Local5) {
 		Return(One)
 	} else {
-		if (LLess(Local4, Local6)) {
+		if (Local4 < Local6) {
 			Return(Ones)
 		} else {
 			Return(Zero)
@@ -71,13 +71,13 @@ Method(WCMP, 2)
 {
 	Store(S2BF(Arg0), Local0)
 	Store(S2BF(Arg1), Local1)
-	if (LLess(SLEN(Arg0), SLEN(Arg1))) {
+	if (SLEN(Arg0) < SLEN(Arg1)) {
 		Return(0)
 	}
 	Store(Zero, Local2)
 	Store(SLEN(Arg1), Local3)
 
-	While(LLess(Local2, Local3)) {
+	While(Local2 < Local3) {
 		if (LNotEqual(Derefof(Local0[Local2]),
 			Derefof(Local1[Local2]))) {
 			Return(0)