[coreboot-gerrit] Change in coreboot[master]: soc/intel/{skylake,common}/acpi/dptf/thermal.asl: Prevent iasl remarks

[Patrick Georgi (Code Review)]

Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/38428 )

Change subject: soc/intel/{skylake,common}/acpi/dptf/thermal.asl: Prevent iasl remarks
......................................................................

soc/intel/{skylake,common}/acpi/dptf/thermal.asl: Prevent iasl remarks

Prevent iasl remarks about unused parameters.

BUG=N/A
TEST=build

Change-Id: I54fa4712e618038fdd5a96c2012c2ec64ca34706
Signed-off-by: Wim Vervoorn 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/38428
Tested-by: build bot (Jenkins) 
Reviewed-by: Frans Hendriks 
---
M src/ec/google/chromeec/acpi/ec.asl
M src/soc/intel/common/acpi/dptf/thermal.asl
M src/soc/intel/skylake/acpi/dptf/thermal.asl
3 files changed, 21 insertions(+), 17 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Frans Hendriks: Looks good to me, approved

diff --git a/src/ec/google/chromeec/acpi/ec.asl b/src/ec/google/chromeec/acpi/ec.asl
index 962988e..bf792d3 100644
--- a/src/ec/google/chromeec/acpi/ec.asl
+++ b/src/ec/google/chromeec/acpi/ec.asl
@@ -510,6 +510,7 @@
    	Return (^TBMD)
    }

+#ifdef EC_ENABLE_MULTIPLE_DPTF_PROFILES
    /* Read current Device DPTF Profile Number */
    Method (RCDP, 0, NotSerialized)
    {
@@ -524,7 +525,7 @@
    		Return (Local0)
    	}
    }
-
+#endif
 #if CONFIG(EC_GOOGLE_CHROMEEC_ACPI_USB_PORT_POWER)
    /*
     * Enable USB Port Power
diff --git a/src/soc/intel/common/acpi/dptf/thermal.asl b/src/soc/intel/common/acpi/dptf/thermal.asl
index 7058b27..6e361dc 100644
--- a/src/soc/intel/common/acpi/dptf/thermal.asl
+++ b/src/soc/intel/common/acpi/dptf/thermal.asl
@@ -79,6 +79,10 @@
 #endif
 }

+#ifndef EC_ENABLE_MULTIPLE_DPTF_PROFILES
+External (_SB.PCI0.LPCB.EC0.RCDP, MethodObj)
+#endif
+
 /*
  * Method to return trip temperature value depending upon the device mode.
  * Arg0 --> Value to return when device is in tablet mode
@@ -86,15 +90,12 @@
  */
 Method (DTRP, 2, Serialized)
 {
-#ifdef EC_ENABLE_MULTIPLE_DPTF_PROFILES
-	If (LEqual (_SB.PCI0.LPCB.EC0.RCDP, One)) {
-		Return (CTOK (Arg0))
-	} Else {
-#endif
-		Return (CTOK (Arg1))
-#ifdef EC_ENABLE_MULTIPLE_DPTF_PROFILES
+	If (CondRefOf (_SB.PCI0.LPCB.EC0.RCDP)) {
+		If (LEqual (_SB.PCI0.LPCB.EC0.RCDP, One)) {
+			Return (CTOK (Arg0))
+		}
    }
-#endif
+	Return (CTOK (Arg1))
 }

#ifdef DPTF_TSR0_SENSOR_ID
diff --git a/src/soc/intel/skylake/acpi/dptf/thermal.asl b/src/soc/intel/skylake/acpi/dptf/thermal.asl
index 742b092..f73d366 100644
--- a/src/soc/intel/skylake/acpi/dptf/thermal.asl
+++ b/src/soc/intel/skylake/acpi/dptf/thermal.asl
@@ -79,6 +79,11 @@
 }

#if defined(DPTF_TSR0_SENSOR_ID) || defined(DPTF_TSR1_SENSOR_ID) || defined(DPTF_TSR2_SENSOR_ID)
+
+#ifndef EC_ENABLE_MULTIPLE_DPTF_PROFILES
+External (_SB.PCI0.LPCB.EC0.RCDP, MethodObj)
+#endif
+
 /*
  * Method to return trip temperature value depending upon the device mode.
  * Arg0 --> Value to return when device is in tablet mode
@@ -86,15 +91,12 @@
  */
 Method (DTRP, 2, Serialized)
 {
-#ifdef EC_ENABLE_MULTIPLE_DPTF_PROFILES
-	If (LEqual (_SB.PCI0.LPCB.EC0.RCDP, One)) {
-		Return (CTOK (Arg0))
-	} Else {
-#endif
-		Return (CTOK (Arg1))
-#ifdef EC_ENABLE_MULTIPLE_DPTF_PROFILES
+	If (CondRefOf (_SB.PCI0.LPCB.EC0.RCDP)) {
+		If (LEqual (_SB.PCI0.LPCB.EC0.RCDP, One)) {
+			Return (CTOK (Arg0))
+		}
    }
-#endif
+	Return (CTOK (Arg1))
 }
 #endif