ACPI: Fix IASL Warning about unused method for _OSI 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     22:   if(CondRefOf(\_OSI,Local1))
Warning  3144 -                           ^
Method Local is set but never used (Local1)

Change-Id: I07f49ac5a3708838d1c4a7216dfb11acc415c881
Signed-off-by: Martin Roth <martinroth@google.com>
Reviewed-on: https://review.coreboot.org/12692
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
This commit is contained in:
Martin Roth
2015-12-08 15:04:23 -07:00
parent 5a98bf2c0a
commit 91d9cbc2fb
40 changed files with 41 additions and 41 deletions

View File

@@ -410,7 +410,7 @@ DefinitionBlock (
if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */ if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */
if(CondRefOf(\_OSI,Local1)) if(CondRefOf(\_OSI))
{ {
Store(1, OSVR) /* Assume some form of XP */ Store(1, OSVR) /* Assume some form of XP */
if (\_OSI("Windows 2006")) /* Vista */ if (\_OSI("Windows 2006")) /* Vista */

View File

@@ -410,7 +410,7 @@ DefinitionBlock (
if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */ if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */
if(CondRefOf(\_OSI,Local1)) if(CondRefOf(\_OSI))
{ {
Store(1, OSVR) /* Assume some form of XP */ Store(1, OSVR) /* Assume some form of XP */
if (\_OSI("Windows 2006")) /* Vista */ if (\_OSI("Windows 2006")) /* Vista */

View File

@@ -374,7 +374,7 @@ DefinitionBlock (
if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */ if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */
if(CondRefOf(\_OSI,Local1)) if(CondRefOf(\_OSI))
{ {
Store(1, OSVR) /* Assume some form of XP */ Store(1, OSVR) /* Assume some form of XP */
if (\_OSI("Windows 2006")) /* Vista */ if (\_OSI("Windows 2006")) /* Vista */

View File

@@ -35,7 +35,7 @@ Scope(\_SB) {
if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */ if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */
if(CondRefOf(\_OSI,Local1)) if(CondRefOf(\_OSI))
{ {
Store(1, OSVR) /* Assume some form of XP */ Store(1, OSVR) /* Assume some form of XP */
if (\_OSI("Windows 2006")) /* Vista */ if (\_OSI("Windows 2006")) /* Vista */

View File

@@ -373,7 +373,7 @@ DefinitionBlock (
if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */ if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */
if(CondRefOf(\_OSI,Local1)) if(CondRefOf(\_OSI))
{ {
Store(1, OSVR) /* Assume some form of XP */ Store(1, OSVR) /* Assume some form of XP */
if (\_OSI("Windows 2006")) /* Vista */ if (\_OSI("Windows 2006")) /* Vista */

View File

@@ -415,7 +415,7 @@ DefinitionBlock (
if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */ if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */
if(CondRefOf(\_OSI,Local1)) if(CondRefOf(\_OSI))
{ {
Store(1, OSVR) /* Assume some form of XP */ Store(1, OSVR) /* Assume some form of XP */
if (\_OSI("Windows 2006")) /* Vista */ if (\_OSI("Windows 2006")) /* Vista */

View File

@@ -35,7 +35,7 @@ Scope(\_SB) {
if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */ if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */
if(CondRefOf(\_OSI,Local1)) if(CondRefOf(\_OSI))
{ {
Store(1, OSVR) /* Assume some form of XP */ Store(1, OSVR) /* Assume some form of XP */
if (\_OSI("Windows 2006")) /* Vista */ if (\_OSI("Windows 2006")) /* Vista */

View File

@@ -374,7 +374,7 @@ DefinitionBlock (
if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */ if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */
if(CondRefOf(\_OSI,Local1)) if(CondRefOf(\_OSI))
{ {
Store(1, OSVR) /* Assume some form of XP */ Store(1, OSVR) /* Assume some form of XP */
if (\_OSI("Windows 2006")) /* Vista */ if (\_OSI("Windows 2006")) /* Vista */

View File

@@ -35,7 +35,7 @@ Scope(\_SB) {
if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */ if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */
if(CondRefOf(\_OSI,Local1)) if(CondRefOf(\_OSI))
{ {
Store(1, OSVR) /* Assume some form of XP */ Store(1, OSVR) /* Assume some form of XP */
if (\_OSI("Windows 2006")) /* Vista */ if (\_OSI("Windows 2006")) /* Vista */

View File

@@ -415,7 +415,7 @@ DefinitionBlock (
if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */ if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */
if(CondRefOf(\_OSI,Local1)) if(CondRefOf(\_OSI))
{ {
Store(1, OSVR) /* Assume some form of XP */ Store(1, OSVR) /* Assume some form of XP */
if (\_OSI("Windows 2006")) /* Vista */ if (\_OSI("Windows 2006")) /* Vista */

View File

@@ -35,7 +35,7 @@ Scope(\_SB) {
if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */ if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */
if(CondRefOf(\_OSI,Local1)) if(CondRefOf(\_OSI))
{ {
Store(1, OSVR) /* Assume some form of XP */ Store(1, OSVR) /* Assume some form of XP */
if (\_OSI("Windows 2006")) /* Vista */ if (\_OSI("Windows 2006")) /* Vista */

View File

@@ -35,7 +35,7 @@ Scope(\_SB) {
if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */ if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */
if(CondRefOf(\_OSI,Local1)) if(CondRefOf(\_OSI))
{ {
Store(1, OSVR) /* Assume some form of XP */ Store(1, OSVR) /* Assume some form of XP */
if (\_OSI("Windows 2006")) /* Vista */ if (\_OSI("Windows 2006")) /* Vista */

View File

@@ -415,7 +415,7 @@ DefinitionBlock (
if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */ if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */
if(CondRefOf(\_OSI,Local1)) if(CondRefOf(\_OSI))
{ {
Store(1, OSVR) /* Assume some form of XP */ Store(1, OSVR) /* Assume some form of XP */
if (\_OSI("Windows 2006")) /* Vista */ if (\_OSI("Windows 2006")) /* Vista */

View File

@@ -415,7 +415,7 @@ DefinitionBlock (
if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */ if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */
if(CondRefOf(\_OSI,Local1)) if(CondRefOf(\_OSI))
{ {
Store(1, OSVR) /* Assume some form of XP */ Store(1, OSVR) /* Assume some form of XP */
if (\_OSI("Windows 2006")) /* Vista */ if (\_OSI("Windows 2006")) /* Vista */

View File

@@ -415,7 +415,7 @@ DefinitionBlock (
if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */ if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */
if(CondRefOf(\_OSI,Local1)) if(CondRefOf(\_OSI))
{ {
Store(1, OSVR) /* Assume some form of XP */ Store(1, OSVR) /* Assume some form of XP */
if (\_OSI("Windows 2006")) /* Vista */ if (\_OSI("Windows 2006")) /* Vista */

View File

@@ -410,7 +410,7 @@ DefinitionBlock (
if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */ if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */
if(CondRefOf(\_OSI,Local1)) if(CondRefOf(\_OSI))
{ {
Store(1, OSVR) /* Assume some form of XP */ Store(1, OSVR) /* Assume some form of XP */
if (\_OSI("Windows 2006")) /* Vista */ if (\_OSI("Windows 2006")) /* Vista */

View File

@@ -410,7 +410,7 @@ DefinitionBlock (
if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */ if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */
if(CondRefOf(\_OSI,Local1)) if(CondRefOf(\_OSI))
{ {
Store(1, OSVR) /* Assume some form of XP */ Store(1, OSVR) /* Assume some form of XP */
if (\_OSI("Windows 2006")) /* Vista */ if (\_OSI("Windows 2006")) /* Vista */

View File

@@ -415,7 +415,7 @@ DefinitionBlock (
if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */ if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */
if(CondRefOf(\_OSI,Local1)) if(CondRefOf(\_OSI))
{ {
Store(1, OSVR) /* Assume some form of XP */ Store(1, OSVR) /* Assume some form of XP */
if (\_OSI("Windows 2006")) /* Vista */ if (\_OSI("Windows 2006")) /* Vista */

View File

@@ -415,7 +415,7 @@ DefinitionBlock (
if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */ if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */
if(CondRefOf(\_OSI,Local1)) if(CondRefOf(\_OSI))
{ {
Store(1, OSVR) /* Assume some form of XP */ Store(1, OSVR) /* Assume some form of XP */
if (\_OSI("Windows 2006")) /* Vista */ if (\_OSI("Windows 2006")) /* Vista */

View File

@@ -415,7 +415,7 @@ DefinitionBlock (
if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */ if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */
if(CondRefOf(\_OSI,Local1)) if(CondRefOf(\_OSI))
{ {
Store(1, OSVR) /* Assume some form of XP */ Store(1, OSVR) /* Assume some form of XP */
if (\_OSI("Windows 2006")) /* Vista */ if (\_OSI("Windows 2006")) /* Vista */

View File

@@ -36,7 +36,7 @@ Scope(\_SB) {
if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */ if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */
if(CondRefOf(\_OSI,Local1)) if(CondRefOf(\_OSI))
{ {
Store(1, OSVR) /* Assume some form of XP */ Store(1, OSVR) /* Assume some form of XP */
if (\_OSI("Windows 2006")) /* Vista */ if (\_OSI("Windows 2006")) /* Vista */

View File

@@ -415,7 +415,7 @@ DefinitionBlock (
if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */ if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */
if(CondRefOf(\_OSI,Local1)) if(CondRefOf(\_OSI))
{ {
Store(1, OSVR) /* Assume some form of XP */ Store(1, OSVR) /* Assume some form of XP */
if (\_OSI("Windows 2006")) /* Vista */ if (\_OSI("Windows 2006")) /* Vista */

View File

@@ -35,7 +35,7 @@ Scope(\_SB) {
if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */ if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */
if(CondRefOf(\_OSI,Local1)) if(CondRefOf(\_OSI))
{ {
Store(1, OSVR) /* Assume some form of XP */ Store(1, OSVR) /* Assume some form of XP */
if (\_OSI("Windows 2006")) /* Vista */ if (\_OSI("Windows 2006")) /* Vista */

View File

@@ -415,7 +415,7 @@ DefinitionBlock (
if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */ if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */
if(CondRefOf(\_OSI,Local1)) if(CondRefOf(\_OSI))
{ {
Store(1, OSVR) /* Assume some form of XP */ Store(1, OSVR) /* Assume some form of XP */
if (\_OSI("Windows 2006")) /* Vista */ if (\_OSI("Windows 2006")) /* Vista */

View File

@@ -374,7 +374,7 @@ DefinitionBlock (
if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */ if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */
if(CondRefOf(\_OSI,Local1)) if(CondRefOf(\_OSI))
{ {
Store(1, OSVR) /* Assume some form of XP */ Store(1, OSVR) /* Assume some form of XP */
if (\_OSI("Windows 2006")) /* Vista */ if (\_OSI("Windows 2006")) /* Vista */

View File

@@ -99,7 +99,7 @@ Scope(\_SB)
/* Let's assume we're running at least Windows 2000 */ /* Let's assume we're running at least Windows 2000 */
Store (2000, OSYS) Store (2000, OSYS)
If (CondRefOf(_OSI, Local0)) { If (CondRefOf(_OSI)) {
If (_OSI("Windows 2001")) { If (_OSI("Windows 2001")) {
Store (2001, OSYS) Store (2001, OSYS)
} }

View File

@@ -404,7 +404,7 @@ DefinitionBlock (
if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */ if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */
if(CondRefOf(\_OSI,Local1)) if(CondRefOf(\_OSI))
{ {
Store(1, OSVR) /* Assume some form of XP */ Store(1, OSVR) /* Assume some form of XP */
if (\_OSI("Windows 2006")) /* Vista */ if (\_OSI("Windows 2006")) /* Vista */

View File

@@ -404,7 +404,7 @@ DefinitionBlock (
if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */ if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */
if(CondRefOf(\_OSI,Local1)) if(CondRefOf(\_OSI))
{ {
Store(1, OSVR) /* Assume some form of XP */ Store(1, OSVR) /* Assume some form of XP */
if (\_OSI("Windows 2006")) /* Vista */ if (\_OSI("Windows 2006")) /* Vista */

View File

@@ -96,7 +96,7 @@ Scope(\_SB)
/* Let's assume we're running at least Windows 2000 */ /* Let's assume we're running at least Windows 2000 */
Store (2000, OSYS) Store (2000, OSYS)
If (CondRefOf(_OSI, Local0)) { If (CondRefOf(_OSI)) {
If (_OSI("Windows 2001")) { If (_OSI("Windows 2001")) {
Store (2001, OSYS) Store (2001, OSYS)
} }

View File

@@ -35,7 +35,7 @@ Scope(\_SB) {
if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */ if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */
if(CondRefOf(\_OSI,Local1)) if(CondRefOf(\_OSI))
{ {
Store(1, OSVR) /* Assume some form of XP */ Store(1, OSVR) /* Assume some form of XP */
if (\_OSI("Windows 2006")) /* Vista */ if (\_OSI("Windows 2006")) /* Vista */

View File

@@ -36,7 +36,7 @@ Scope(\_SB)
{ {
Store (2000, OSYS) Store (2000, OSYS)
If (CondRefOf(_OSI, Local0)) { If (CondRefOf(_OSI)) {
If (_OSI("Linux")) { If (_OSI("Linux")) {
Store (1, LINX) Store (1, LINX)

View File

@@ -456,7 +456,7 @@ DefinitionBlock (
Scope(\_SB) { Scope(\_SB) {
Method(OSFL, 0){ Method(OSFL, 0){
if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */ if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */
if(CondRefOf(\_OSI,Local1)) if(CondRefOf(\_OSI))
{ {
Store(1, OSVR) /* Assume some form of XP */ Store(1, OSVR) /* Assume some form of XP */
if (\_OSI("Windows 2006")) /* Vista */ if (\_OSI("Windows 2006")) /* Vista */

View File

@@ -448,7 +448,7 @@ DefinitionBlock (
Scope(\_SB) { Scope(\_SB) {
Method(OSFL, 0){ Method(OSFL, 0){
if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */ if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */
if(CondRefOf(\_OSI,Local1)) if(CondRefOf(\_OSI))
{ {
Store(1, OSVR) /* Assume some form of XP */ Store(1, OSVR) /* Assume some form of XP */
if (\_OSI("Windows 2006")) /* Vista */ if (\_OSI("Windows 2006")) /* Vista */

View File

@@ -433,7 +433,7 @@ DefinitionBlock (
if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */ if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */
if(CondRefOf(\_OSI,Local1)) if(CondRefOf(\_OSI))
{ {
Store(1, OSVR) /* Assume some form of XP */ Store(1, OSVR) /* Assume some form of XP */
if (\_OSI("Windows 2006")) /* Vista */ if (\_OSI("Windows 2006")) /* Vista */

View File

@@ -374,7 +374,7 @@ DefinitionBlock (
if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */ if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */
if(CondRefOf(\_OSI,Local1)) if(CondRefOf(\_OSI))
{ {
Store(1, OSVR) /* Assume some form of XP */ Store(1, OSVR) /* Assume some form of XP */
if (\_OSI("Windows 2006")) /* Vista */ if (\_OSI("Windows 2006")) /* Vista */

View File

@@ -374,7 +374,7 @@ DefinitionBlock (
if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */ if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */
if(CondRefOf(\_OSI,Local1)) if(CondRefOf(\_OSI))
{ {
Store(1, OSVR) /* Assume some form of XP */ Store(1, OSVR) /* Assume some form of XP */
if (\_OSI("Windows 2006")) /* Vista */ if (\_OSI("Windows 2006")) /* Vista */

View File

@@ -448,7 +448,7 @@ DefinitionBlock (
Scope(\_SB) { Scope(\_SB) {
Method(OSFL, 0){ Method(OSFL, 0){
if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */ if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */
if(CondRefOf(\_OSI,Local1)) if(CondRefOf(\_OSI))
{ {
Store(1, OSVR) /* Assume some form of XP */ Store(1, OSVR) /* Assume some form of XP */
if (\_OSI("Windows 2006")) /* Vista */ if (\_OSI("Windows 2006")) /* Vista */

View File

@@ -185,7 +185,7 @@ Method(OSFL, 0){
if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */ if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */
if(CondRefOf(\_OSI,Local1)) if(CondRefOf(\_OSI))
{ {
Store(1, OSVR) /* Assume some form of XP */ Store(1, OSVR) /* Assume some form of XP */
if (\_OSI("Windows 2006")) /* Vista */ if (\_OSI("Windows 2006")) /* Vista */

View File

@@ -167,7 +167,7 @@ Method(OSFL, 0){
if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */ if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */
if(CondRefOf(\_OSI,Local1)) if(CondRefOf(\_OSI))
{ {
Store(1, OSVR) /* Assume some form of XP */ Store(1, OSVR) /* Assume some form of XP */
if (\_OSI("Windows 2006")) /* Vista */ if (\_OSI("Windows 2006")) /* Vista */

View File

@@ -70,7 +70,7 @@ Method(GOS, 0)
/* Let's assume we're running at least Windows 2000 */ /* Let's assume we're running at least Windows 2000 */
Store (2000, OSYS) Store (2000, OSYS)
If (CondRefOf(_OSI, Local0)) { If (CondRefOf(_OSI)) {
/* Linux answers _OSI with "True" for a couple of /* Linux answers _OSI with "True" for a couple of
* Windows version queries. But unlike Windows it * Windows version queries. But unlike Windows it
* needs a Video repost, so let's determine whether * needs a Video repost, so let's determine whether