diff options
author | Martin Roth <martinroth@google.com> | 2015-12-08 15:24:41 -0700 |
---|---|---|
committer | Martin Roth <martinroth@google.com> | 2015-12-10 16:32:56 +0100 |
commit | 3e41ee9847f0acd4a57c0c4cb11156eace16fd05 (patch) | |
tree | 7c6d01a02ce23e9d4d0940c10674e018714489bf | |
parent | f77516cb6dcc4671938475926d2ee55952cd2eec (diff) | |
download | coreboot-staging-3e41ee9847f0acd4a57c0c4cb11156eace16fd05.zip coreboot-staging-3e41ee9847f0acd4a57c0c4cb11156eace16fd05.tar.gz |
ACPI: Fix IASL Warning about unused method for _S3 check
According to the ACPI Spec for CondRefOf, the result argument is
optional. In all of these locations, it was getting set but not
used, creating a warning in new versions of IASL. Since it's
an optional argument, just remove it.
dsdt.aml 640: If (CondRefOf (\_S3, Local0))
Warning 3144 - Method Local is set but never used ^ (Local0)
Change-Id: I758d198c33e585a6a4ad2c1c70f2370a01af5138
Signed-off-by: Martin Roth <martinroth@google.com>
Reviewed-on: https://review.coreboot.org/12693
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
16 files changed, 35 insertions, 35 deletions
diff --git a/src/mainboard/amd/serengeti_cheetah/acpi/amd8111.asl b/src/mainboard/amd/serengeti_cheetah/acpi/amd8111.asl index 7509a34..6e98c24 100644 --- a/src/mainboard/amd/serengeti_cheetah/acpi/amd8111.asl +++ b/src/mainboard/amd/serengeti_cheetah/acpi/amd8111.asl @@ -103,7 +103,7 @@ Method (_PRW, 0, NotSerialized) { - If (CondRefOf (\_S3, Local0)) { Return (Package (0x02) { 0x08, 0x03 }) } + If (CondRefOf (\_S3)) { Return (Package (0x02) { 0x08, 0x03 }) } Else { Return (Package (0x02) { 0x08, 0x01 }) } } @@ -112,7 +112,7 @@ Name (_ADR, 0x00000000) Method (_PRW, 0, NotSerialized) { - If (CondRefOf (\_S3, Local0)) { Return (Package (0x02) { 0x0F, 0x03 }) } + If (CondRefOf (\_S3)) { Return (Package (0x02) { 0x0F, 0x03 }) } Else { Return (Package (0x02) { 0x0F, 0x01 }) } } } @@ -122,7 +122,7 @@ Name (_ADR, 0x00000001) Method (_PRW, 0, NotSerialized) { - If (CondRefOf (\_S3, Local0)) { Return (Package (0x02) { 0x0F, 0x03 }) } + If (CondRefOf (\_S3)) { Return (Package (0x02) { 0x0F, 0x03 }) } Else { Return (Package (0x02) { 0x0F, 0x01 }) } } } diff --git a/src/mainboard/amd/serengeti_cheetah/acpi/amd8131.asl b/src/mainboard/amd/serengeti_cheetah/acpi/amd8131.asl index 172f0bf..ba77557 100644 --- a/src/mainboard/amd/serengeti_cheetah/acpi/amd8131.asl +++ b/src/mainboard/amd/serengeti_cheetah/acpi/amd8131.asl @@ -12,7 +12,7 @@ Method (_PRW, 0, NotSerialized) { - If (CondRefOf (\_S3, Local0)) { Return (Package (0x02) { 0x29, 0x03 }) } + If (CondRefOf (\_S3)) { Return (Package (0x02) { 0x29, 0x03 }) } Else { Return (Package (0x02) { 0x29, 0x01 }) } } @@ -92,7 +92,7 @@ Method (_PRW, 0, NotSerialized) { - If (CondRefOf (\_S3, Local0)) { Return (Package (0x02) { 0x22, 0x03 }) } + If (CondRefOf (\_S3)) { Return (Package (0x02) { 0x22, 0x03 }) } Else { Return (Package (0x02) { 0x22, 0x01 }) } } diff --git a/src/mainboard/amd/serengeti_cheetah/acpi/amd8131_2.asl b/src/mainboard/amd/serengeti_cheetah/acpi/amd8131_2.asl index 8b8bc9f..6eb95ec 100644 --- a/src/mainboard/amd/serengeti_cheetah/acpi/amd8131_2.asl +++ b/src/mainboard/amd/serengeti_cheetah/acpi/amd8131_2.asl @@ -12,7 +12,7 @@ Method (_PRW, 0, NotSerialized) { - If (CondRefOf (\_S3, Local0)) { Return (Package (0x02) { 0x29, 0x03 }) } + If (CondRefOf (\_S3)) { Return (Package (0x02) { 0x29, 0x03 }) } Else { Return (Package (0x02) { 0x29, 0x01 }) } } @@ -68,7 +68,7 @@ Method (_PRW, 0, NotSerialized) { - If (CondRefOf (\_S3, Local0)) { Return (Package (0x02) { 0x22, 0x03 }) } + If (CondRefOf (\_S3)) { Return (Package (0x02) { 0x22, 0x03 }) } Else { Return (Package (0x02) { 0x22, 0x01 }) } } diff --git a/src/mainboard/amd/serengeti_cheetah/acpi/amd8132_2.asl b/src/mainboard/amd/serengeti_cheetah/acpi/amd8132_2.asl index e5cfe3c..9c0629f 100644 --- a/src/mainboard/amd/serengeti_cheetah/acpi/amd8132_2.asl +++ b/src/mainboard/amd/serengeti_cheetah/acpi/amd8132_2.asl @@ -12,7 +12,7 @@ Method (_PRW, 0, NotSerialized) { - If (CondRefOf (\_S3, Local0)) { Return (Package (0x02) { 0x29, 0x03 }) } + If (CondRefOf (\_S3)) { Return (Package (0x02) { 0x29, 0x03 }) } Else { Return (Package (0x02) { 0x29, 0x01 }) } } @@ -68,7 +68,7 @@ Method (_PRW, 0, NotSerialized) { - If (CondRefOf (\_S3, Local0)) { Return (Package (0x02) { 0x22, 0x03 }) } + If (CondRefOf (\_S3)) { Return (Package (0x02) { 0x22, 0x03 }) } Else { Return (Package (0x02) { 0x22, 0x01 }) } } diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8111.asl b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8111.asl index 094adff..46fe121 100644 --- a/src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8111.asl +++ b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8111.asl @@ -107,7 +107,7 @@ Method (_PRW, 0, NotSerialized) { - If (CondRefOf (\_S3, Local0)) { Return (Package (0x02) { 0x08, 0x03 }) } + If (CondRefOf (\_S3)) { Return (Package (0x02) { 0x08, 0x03 }) } Else { Return (Package (0x02) { 0x08, 0x01 }) } } @@ -116,7 +116,7 @@ Name (_ADR, 0x00000000) Method (_PRW, 0, NotSerialized) { - If (CondRefOf (\_S3, Local0)) { Return (Package (0x02) { 0x0F, 0x03 }) } + If (CondRefOf (\_S3)) { Return (Package (0x02) { 0x0F, 0x03 }) } Else { Return (Package (0x02) { 0x0F, 0x01 }) } } } @@ -126,7 +126,7 @@ Name (_ADR, 0x00000001) Method (_PRW, 0, NotSerialized) { - If (CondRefOf (\_S3, Local0)) { Return (Package (0x02) { 0x0F, 0x03 }) } + If (CondRefOf (\_S3)) { Return (Package (0x02) { 0x0F, 0x03 }) } Else { Return (Package (0x02) { 0x0F, 0x01 }) } } } diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8131_2.asl b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8131_2.asl index 9139853..8e40ab0 100644 --- a/src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8131_2.asl +++ b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8131_2.asl @@ -22,7 +22,7 @@ Method (_PRW, 0, NotSerialized) { - If (CondRefOf (\_S3, Local0)) { Return (Package (0x02) { 0x29, 0x03 }) } + If (CondRefOf (\_S3)) { Return (Package (0x02) { 0x29, 0x03 }) } Else { Return (Package (0x02) { 0x29, 0x01 }) } } @@ -75,7 +75,7 @@ Method (_PRW, 0, NotSerialized) { - If (CondRefOf (\_S3, Local0)) { Return (Package (0x02) { 0x22, 0x03 }) } + If (CondRefOf (\_S3)) { Return (Package (0x02) { 0x22, 0x03 }) } Else { Return (Package (0x02) { 0x22, 0x01 }) } } diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8132.asl b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8132.asl index ba0b4e2..e4167e2 100644 --- a/src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8132.asl +++ b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8132.asl @@ -23,7 +23,7 @@ Method (_PRW, 0, NotSerialized) { - If (CondRefOf (\_S3, Local0)) { Return (Package (0x02) { 0x29, 0x03 }) } + If (CondRefOf (\_S3)) { Return (Package (0x02) { 0x29, 0x03 }) } Else { Return (Package (0x02) { 0x29, 0x01 }) } } @@ -103,7 +103,7 @@ Method (_PRW, 0, NotSerialized) { - If (CondRefOf (\_S3, Local0)) { Return (Package (0x02) { 0x22, 0x03 }) } + If (CondRefOf (\_S3)) { Return (Package (0x02) { 0x22, 0x03 }) } Else { Return (Package (0x02) { 0x22, 0x01 }) } } diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8132_2.asl b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8132_2.asl index 8753f2b..30a3fcf 100644 --- a/src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8132_2.asl +++ b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8132_2.asl @@ -23,7 +23,7 @@ Method (_PRW, 0, NotSerialized) { - If (CondRefOf (\_S3, Local0)) { Return (Package (0x02) { 0x29, 0x03 }) } + If (CondRefOf (\_S3)) { Return (Package (0x02) { 0x29, 0x03 }) } Else { Return (Package (0x02) { 0x29, 0x01 }) } } @@ -110,7 +110,7 @@ Method (_PRW, 0, NotSerialized) { - If (CondRefOf (\_S3, Local0)) { Return (Package (0x02) { 0x22, 0x03 }) } + If (CondRefOf (\_S3)) { Return (Package (0x02) { 0x22, 0x03 }) } Else { Return (Package (0x02) { 0x22, 0x01 }) } } diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/acpi/htx_no_ioapic.asl b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/htx_no_ioapic.asl index aae9171..9caa3b2 100644 --- a/src/mainboard/amd/serengeti_cheetah_fam10/acpi/htx_no_ioapic.asl +++ b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/htx_no_ioapic.asl @@ -23,7 +23,7 @@ Method (_PRW, 0, NotSerialized) { - If (CondRefOf (\_S3, Local0)) { Return (Package (0x02) { 0x29, 0x03 }) } + If (CondRefOf (\_S3)) { Return (Package (0x02) { 0x29, 0x03 }) } Else { Return (Package (0x02) { 0x29, 0x01 }) } } diff --git a/src/mainboard/hp/dl145_g1/acpi/amd8111.asl b/src/mainboard/hp/dl145_g1/acpi/amd8111.asl index aa136ff..77389f0 100644 --- a/src/mainboard/hp/dl145_g1/acpi/amd8111.asl +++ b/src/mainboard/hp/dl145_g1/acpi/amd8111.asl @@ -87,7 +87,7 @@ Device (TP2P) { // result : // [0] Bit index into GPEx_EN in the GPE block described by FADT. // [1] The lowest power state from which the system can be awakened. - //If (CondRefOf (\_S3, Local0)) { + //If (CondRefOf (\_S3)) { // Return (Package (0x02) { 0x08, 0x03 }) //} Else { Return (Package (0x02) { 0x08, 0x01 }) @@ -96,7 +96,7 @@ Device (TP2P) { Device (ETHR) { Name (_ADR, 0x00010000) Method (_PRW, 0, NotSerialized) { // Power Resource for Wake - //If (CondRefOf (\_S3, Local0)) { + //If (CondRefOf (\_S3)) { // Return (Package (0x02) { 0x08, 0x03 }) //} Else { Return (Package (0x02) { 0x08, 0x01 }) @@ -109,7 +109,7 @@ Device (TP2P) { And (GNBL, 0x7FFF, GNBL) } Method (_PRW, 0, NotSerialized) { // Power Resource for Wake - //If (CondRefOf (\_S3, Local0)) { + //If (CondRefOf (\_S3)) { // Return (Package (0x02) { 0x0F, 0x03 }) //} Else { Return (Package (0x02) { 0x0F, 0x01 }) @@ -122,7 +122,7 @@ Device (TP2P) { And (GNBL, 0x7FFF, GNBL) } Method (_PRW, 0, NotSerialized) { // Power Resource for Wake - //If (CondRefOf (\_S3, Local0)) { + //If (CondRefOf (\_S3)) { // Return (Package (0x02) { 0x0F, 0x03 }) //} Else { Return (Package (0x02) { 0x0F, 0x01 }) diff --git a/src/mainboard/hp/dl145_g1/acpi/amd8131.asl b/src/mainboard/hp/dl145_g1/acpi/amd8131.asl index 54aae73..29808aa 100644 --- a/src/mainboard/hp/dl145_g1/acpi/amd8131.asl +++ b/src/mainboard/hp/dl145_g1/acpi/amd8131.asl @@ -9,7 +9,7 @@ Device (PG0A) { Return (DADD(GHCD(HCIN, 0), 0x00000000)) } Method (_PRW, 0, NotSerialized) { - //If (CondRefOf (\_S3, Local0)) { + //If (CondRefOf (\_S3)) { // Return (Package (0x02) { 0x29, 0x03 }) //} Else { Return (Package (0x02) { 0x29, 0x01 }) @@ -75,7 +75,7 @@ Device (PG0B) { Return (DADD(GHCD(HCIN, 0), 0x00010000)) } Method (_PRW, 0, NotSerialized) { - //If (CondRefOf (\_S3, Local0)) { + //If (CondRefOf (\_S3)) { // Return (Package (0x02) { 0x22, 0x03 }) //} Else { Return (Package (0x02) { 0x22, 0x01 }) diff --git a/src/mainboard/iwill/dk8_htx/acpi/amd8111.asl b/src/mainboard/iwill/dk8_htx/acpi/amd8111.asl index a470e89..4d41c60 100644 --- a/src/mainboard/iwill/dk8_htx/acpi/amd8111.asl +++ b/src/mainboard/iwill/dk8_htx/acpi/amd8111.asl @@ -103,7 +103,7 @@ Method (_PRW, 0, NotSerialized) { - If (CondRefOf (\_S3, Local0)) { Return (Package (0x02) { 0x08, 0x03 }) } + If (CondRefOf (\_S3)) { Return (Package (0x02) { 0x08, 0x03 }) } Else { Return (Package (0x02) { 0x08, 0x01 }) } } @@ -112,7 +112,7 @@ Name (_ADR, 0x00000000) Method (_PRW, 0, NotSerialized) { - If (CondRefOf (\_S3, Local0)) { Return (Package (0x02) { 0x0F, 0x03 }) } + If (CondRefOf (\_S3)) { Return (Package (0x02) { 0x0F, 0x03 }) } Else { Return (Package (0x02) { 0x0F, 0x01 }) } } } @@ -122,7 +122,7 @@ Name (_ADR, 0x00000001) Method (_PRW, 0, NotSerialized) { - If (CondRefOf (\_S3, Local0)) { Return (Package (0x02) { 0x0F, 0x03 }) } + If (CondRefOf (\_S3)) { Return (Package (0x02) { 0x0F, 0x03 }) } Else { Return (Package (0x02) { 0x0F, 0x01 }) } } } diff --git a/src/mainboard/iwill/dk8_htx/acpi/amd8131.asl b/src/mainboard/iwill/dk8_htx/acpi/amd8131.asl index dd82e38..6d93e02 100644 --- a/src/mainboard/iwill/dk8_htx/acpi/amd8131.asl +++ b/src/mainboard/iwill/dk8_htx/acpi/amd8131.asl @@ -12,7 +12,7 @@ Method (_PRW, 0, NotSerialized) { - If (CondRefOf (\_S3, Local0)) { Return (Package (0x02) { 0x29, 0x03 }) } + If (CondRefOf (\_S3)) { Return (Package (0x02) { 0x29, 0x03 }) } Else { Return (Package (0x02) { 0x29, 0x01 }) } } @@ -92,7 +92,7 @@ Method (_PRW, 0, NotSerialized) { - If (CondRefOf (\_S3, Local0)) { Return (Package (0x02) { 0x22, 0x03 }) } + If (CondRefOf (\_S3)) { Return (Package (0x02) { 0x22, 0x03 }) } Else { Return (Package (0x02) { 0x22, 0x01 }) } } diff --git a/src/mainboard/iwill/dk8_htx/acpi/amd8131_2.asl b/src/mainboard/iwill/dk8_htx/acpi/amd8131_2.asl index 8b8bc9f..6eb95ec 100644 --- a/src/mainboard/iwill/dk8_htx/acpi/amd8131_2.asl +++ b/src/mainboard/iwill/dk8_htx/acpi/amd8131_2.asl @@ -12,7 +12,7 @@ Method (_PRW, 0, NotSerialized) { - If (CondRefOf (\_S3, Local0)) { Return (Package (0x02) { 0x29, 0x03 }) } + If (CondRefOf (\_S3)) { Return (Package (0x02) { 0x29, 0x03 }) } Else { Return (Package (0x02) { 0x29, 0x01 }) } } @@ -68,7 +68,7 @@ Method (_PRW, 0, NotSerialized) { - If (CondRefOf (\_S3, Local0)) { Return (Package (0x02) { 0x22, 0x03 }) } + If (CondRefOf (\_S3)) { Return (Package (0x02) { 0x22, 0x03 }) } Else { Return (Package (0x02) { 0x22, 0x01 }) } } diff --git a/src/mainboard/iwill/dk8_htx/acpi/amd8132_2.asl b/src/mainboard/iwill/dk8_htx/acpi/amd8132_2.asl index e5cfe3c..9c0629f 100644 --- a/src/mainboard/iwill/dk8_htx/acpi/amd8132_2.asl +++ b/src/mainboard/iwill/dk8_htx/acpi/amd8132_2.asl @@ -12,7 +12,7 @@ Method (_PRW, 0, NotSerialized) { - If (CondRefOf (\_S3, Local0)) { Return (Package (0x02) { 0x29, 0x03 }) } + If (CondRefOf (\_S3)) { Return (Package (0x02) { 0x29, 0x03 }) } Else { Return (Package (0x02) { 0x29, 0x01 }) } } @@ -68,7 +68,7 @@ Method (_PRW, 0, NotSerialized) { - If (CondRefOf (\_S3, Local0)) { Return (Package (0x02) { 0x22, 0x03 }) } + If (CondRefOf (\_S3)) { Return (Package (0x02) { 0x22, 0x03 }) } Else { Return (Package (0x02) { 0x22, 0x01 }) } } diff --git a/src/mainboard/iwill/dk8_htx/acpi/htx_no_ioapic.asl b/src/mainboard/iwill/dk8_htx/acpi/htx_no_ioapic.asl index 0162565..7301fef 100644 --- a/src/mainboard/iwill/dk8_htx/acpi/htx_no_ioapic.asl +++ b/src/mainboard/iwill/dk8_htx/acpi/htx_no_ioapic.asl @@ -12,7 +12,7 @@ Method (_PRW, 0, NotSerialized) { - If (CondRefOf (\_S3, Local0)) { Return (Package (0x02) { 0x29, 0x03 }) } + If (CondRefOf (\_S3)) { Return (Package (0x02) { 0x29, 0x03 }) } Else { Return (Package (0x02) { 0x29, 0x01 }) } } |