diff --git a/src/soc/intel/tigerlake/acpi/pch_hda.asl b/src/soc/intel/tigerlake/acpi/pch_hda.asl
index f292901b05..08fce8c1f1 100644
--- a/src/soc/intel/tigerlake/acpi/pch_hda.asl
+++ b/src/soc/intel/tigerlake/acpi/pch_hda.asl
@@ -26,19 +26,17 @@ Device (HDAS)
 	 */
 	Method (_DSM, 4)
 	{
-		If (LEqual (Arg0, ^UUID)) {
+		If (Arg0 == ^UUID) {
 			/*
 			 * Function 0: Function Support Query
 			 * Returns a bitmask of functions supported.
 			 */
-			If (LEqual (Arg2, Zero)) {
+			If (Arg2 == 0) {
 				/*
 				 * 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 ((Arg1 == 1) && (NHLA != 0) && (NHLL != 0)) {
 					Return (Buffer (One) { 0x03 })
 				} Else {
 					Return (Buffer (One) { 0x01 })
@@ -57,9 +55,9 @@ Device (HDAS)
 				CreateQWordField (NBUF, ^NHLT._MAX, NMAS)
 				CreateQWordField (NBUF, ^NHLT._LEN, NLEN)
 
-				Store (NHLA, NBAS)
-				Store (NHLA, NMAS)
-				Store (NHLL, NLEN)
+				NBAS = NHLA
+				NMAS = NHLA
+				NLEN = NHLL
 
 				Return (NBUF)
 			}