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>

40 files changed, 41 insertions, 41 deletions

diff --git a/src/mainboard/advansus/a785e-i/dsdt.asl b/src/mainboard/advansus/a785e-i/dsdt.asl
index 63a34fd33a..652b3663e0 100644
--- a/src/mainboard/advansus/a785e-i/dsdt.asl
+++ b/src/mainboard/advansus/a785e-i/dsdt.asl
@@ -410,7 +410,7 @@ DefinitionBlock (
 
 			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 */
 				if (\_OSI("Windows 2006"))      /* Vista */
diff --git a/src/mainboard/amd/bimini_fam10/dsdt.asl b/src/mainboard/amd/bimini_fam10/dsdt.asl
index fb08788ddc..3d5d2e3339 100644
--- a/src/mainboard/amd/bimini_fam10/dsdt.asl
+++ b/src/mainboard/amd/bimini_fam10/dsdt.asl
@@ -410,7 +410,7 @@ DefinitionBlock (
 
 			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 */
 				if (\_OSI("Windows 2006"))      /* Vista */
diff --git a/src/mainboard/amd/dbm690t/dsdt.asl b/src/mainboard/amd/dbm690t/dsdt.asl
index 66e4a02c00..3f5c1925c0 100644
--- a/src/mainboard/amd/dbm690t/dsdt.asl
+++ b/src/mainboard/amd/dbm690t/dsdt.asl
@@ -374,7 +374,7 @@ DefinitionBlock (
 
 			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 */
 				if (\_OSI("Windows 2006"))      /* Vista */
diff --git a/src/mainboard/amd/inagua/acpi/mainboard.asl b/src/mainboard/amd/inagua/acpi/mainboard.asl
index 57a414e178..b666a4f350 100644
--- a/src/mainboard/amd/inagua/acpi/mainboard.asl
+++ b/src/mainboard/amd/inagua/acpi/mainboard.asl
@@ -35,7 +35,7 @@ Scope(\_SB) {
 
 		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 */
 			if (\_OSI("Windows 2006"))		/* Vista */
diff --git a/src/mainboard/amd/mahogany/dsdt.asl b/src/mainboard/amd/mahogany/dsdt.asl
index 7535e68ef1..7623f76fdb 100644
--- a/src/mainboard/amd/mahogany/dsdt.asl
+++ b/src/mainboard/amd/mahogany/dsdt.asl
@@ -373,7 +373,7 @@ DefinitionBlock (
 
 			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 */
 				if (\_OSI("Windows 2006"))      /* Vista */
diff --git a/src/mainboard/amd/mahogany_fam10/dsdt.asl b/src/mainboard/amd/mahogany_fam10/dsdt.asl
index 56f63059d8..2fe6a56ac5 100644
--- a/src/mainboard/amd/mahogany_fam10/dsdt.asl
+++ b/src/mainboard/amd/mahogany_fam10/dsdt.asl
@@ -415,7 +415,7 @@ DefinitionBlock (
 
 			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 */
 				if (\_OSI("Windows 2006"))      /* Vista */
diff --git a/src/mainboard/amd/persimmon/acpi/mainboard.asl b/src/mainboard/amd/persimmon/acpi/mainboard.asl
index 57a414e178..b666a4f350 100644
--- a/src/mainboard/amd/persimmon/acpi/mainboard.asl
+++ b/src/mainboard/amd/persimmon/acpi/mainboard.asl
@@ -35,7 +35,7 @@ Scope(\_SB) {
 
 		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 */
 			if (\_OSI("Windows 2006"))		/* Vista */
diff --git a/src/mainboard/amd/pistachio/dsdt.asl b/src/mainboard/amd/pistachio/dsdt.asl
index 53a51d0b87..69d28be4e9 100644
--- a/src/mainboard/amd/pistachio/dsdt.asl
+++ b/src/mainboard/amd/pistachio/dsdt.asl
@@ -374,7 +374,7 @@ DefinitionBlock (
 
 			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 */
 				if (\_OSI("Windows 2006"))      /* Vista */
diff --git a/src/mainboard/amd/south_station/acpi/mainboard.asl b/src/mainboard/amd/south_station/acpi/mainboard.asl
index 57a414e178..b666a4f350 100644
--- a/src/mainboard/amd/south_station/acpi/mainboard.asl
+++ b/src/mainboard/amd/south_station/acpi/mainboard.asl
@@ -35,7 +35,7 @@ Scope(\_SB) {
 
 		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 */
 			if (\_OSI("Windows 2006"))		/* Vista */
diff --git a/src/mainboard/amd/tilapia_fam10/dsdt.asl b/src/mainboard/amd/tilapia_fam10/dsdt.asl
index efb2769385..f85cb59ee1 100644
--- a/src/mainboard/amd/tilapia_fam10/dsdt.asl
+++ b/src/mainboard/amd/tilapia_fam10/dsdt.asl
@@ -415,7 +415,7 @@ DefinitionBlock (
 
 			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 */
 				if (\_OSI("Windows 2006"))      /* Vista */
diff --git a/src/mainboard/amd/union_station/acpi/mainboard.asl b/src/mainboard/amd/union_station/acpi/mainboard.asl
index 57a414e178..b666a4f350 100644
--- a/src/mainboard/amd/union_station/acpi/mainboard.asl
+++ b/src/mainboard/amd/union_station/acpi/mainboard.asl
@@ -35,7 +35,7 @@ Scope(\_SB) {
 
 		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 */
 			if (\_OSI("Windows 2006"))		/* Vista */
diff --git a/src/mainboard/asrock/e350m1/acpi/mainboard.asl b/src/mainboard/asrock/e350m1/acpi/mainboard.asl
index 57a414e178..b666a4f350 100644
--- a/src/mainboard/asrock/e350m1/acpi/mainboard.asl
+++ b/src/mainboard/asrock/e350m1/acpi/mainboard.asl
@@ -35,7 +35,7 @@ Scope(\_SB) {
 
 		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 */
 			if (\_OSI("Windows 2006"))		/* Vista */
diff --git a/src/mainboard/asus/m4a78-em/dsdt.asl b/src/mainboard/asus/m4a78-em/dsdt.asl
index f5dd4a6183..3d82d25ea7 100644
--- a/src/mainboard/asus/m4a78-em/dsdt.asl
+++ b/src/mainboard/asus/m4a78-em/dsdt.asl
@@ -415,7 +415,7 @@ DefinitionBlock (
 
 			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 */
 				if (\_OSI("Windows 2006"))      /* Vista */
diff --git a/src/mainboard/asus/m4a785-m/dsdt.asl b/src/mainboard/asus/m4a785-m/dsdt.asl
index f5dd4a6183..3d82d25ea7 100644
--- a/src/mainboard/asus/m4a785-m/dsdt.asl
+++ b/src/mainboard/asus/m4a785-m/dsdt.asl
@@ -415,7 +415,7 @@ DefinitionBlock (
 
 			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 */
 				if (\_OSI("Windows 2006"))      /* Vista */
diff --git a/src/mainboard/asus/m4a785t-m/dsdt.asl b/src/mainboard/asus/m4a785t-m/dsdt.asl
index bfe3992cca..07bf4014c3 100644
--- a/src/mainboard/asus/m4a785t-m/dsdt.asl
+++ b/src/mainboard/asus/m4a785t-m/dsdt.asl
@@ -415,7 +415,7 @@ DefinitionBlock (
 
 			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 */
 				if (\_OSI("Windows 2006"))      /* Vista */
diff --git a/src/mainboard/asus/m5a88-v/dsdt.asl b/src/mainboard/asus/m5a88-v/dsdt.asl
index 886c7b4dac..04042bdb37 100644
--- a/src/mainboard/asus/m5a88-v/dsdt.asl
+++ b/src/mainboard/asus/m5a88-v/dsdt.asl
@@ -410,7 +410,7 @@ DefinitionBlock (
 
 			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 */
 				if (\_OSI("Windows 2006"))      /* Vista */
diff --git a/src/mainboard/avalue/eax-785e/dsdt.asl b/src/mainboard/avalue/eax-785e/dsdt.asl
index 5ed6486942..9476a3e5c5 100644
--- a/src/mainboard/avalue/eax-785e/dsdt.asl
+++ b/src/mainboard/avalue/eax-785e/dsdt.asl
@@ -410,7 +410,7 @@ DefinitionBlock (
 
 			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 */
 				if (\_OSI("Windows 2006"))      /* Vista */
diff --git a/src/mainboard/gigabyte/ma785gm/dsdt.asl b/src/mainboard/gigabyte/ma785gm/dsdt.asl
index be84765674..b1ff955510 100644
--- a/src/mainboard/gigabyte/ma785gm/dsdt.asl
+++ b/src/mainboard/gigabyte/ma785gm/dsdt.asl
@@ -415,7 +415,7 @@ DefinitionBlock (
 
 			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 */
 				if (\_OSI("Windows 2006"))      /* Vista */
diff --git a/src/mainboard/gigabyte/ma785gmt/dsdt.asl b/src/mainboard/gigabyte/ma785gmt/dsdt.asl
index be84765674..b1ff955510 100644
--- a/src/mainboard/gigabyte/ma785gmt/dsdt.asl
+++ b/src/mainboard/gigabyte/ma785gmt/dsdt.asl
@@ -415,7 +415,7 @@ DefinitionBlock (
 
 			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 */
 				if (\_OSI("Windows 2006"))      /* Vista */
diff --git a/src/mainboard/gigabyte/ma78gm/dsdt.asl b/src/mainboard/gigabyte/ma78gm/dsdt.asl
index be84765674..b1ff955510 100644
--- a/src/mainboard/gigabyte/ma78gm/dsdt.asl
+++ b/src/mainboard/gigabyte/ma78gm/dsdt.asl
@@ -415,7 +415,7 @@ DefinitionBlock (
 
 			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 */
 				if (\_OSI("Windows 2006"))      /* Vista */
diff --git a/src/mainboard/gizmosphere/gizmo/acpi/mainboard.asl b/src/mainboard/gizmosphere/gizmo/acpi/mainboard.asl
index 10cf73019b..4ee8efca0a 100644
--- a/src/mainboard/gizmosphere/gizmo/acpi/mainboard.asl
+++ b/src/mainboard/gizmosphere/gizmo/acpi/mainboard.asl
@@ -36,7 +36,7 @@ Scope(\_SB) {
 
 		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 */
 			if (\_OSI("Windows 2006"))		/* Vista */
diff --git a/src/mainboard/iei/kino-780am2-fam10/dsdt.asl b/src/mainboard/iei/kino-780am2-fam10/dsdt.asl
index 1c6989da32..ec303bd336 100644
--- a/src/mainboard/iei/kino-780am2-fam10/dsdt.asl
+++ b/src/mainboard/iei/kino-780am2-fam10/dsdt.asl
@@ -415,7 +415,7 @@ DefinitionBlock (
 
 			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 */
 				if (\_OSI("Windows 2006"))      /* Vista */
diff --git a/src/mainboard/jetway/nf81-t56n-lf/acpi/mainboard.asl b/src/mainboard/jetway/nf81-t56n-lf/acpi/mainboard.asl
index 57a414e178..b666a4f350 100644
--- a/src/mainboard/jetway/nf81-t56n-lf/acpi/mainboard.asl
+++ b/src/mainboard/jetway/nf81-t56n-lf/acpi/mainboard.asl
@@ -35,7 +35,7 @@ Scope(\_SB) {
 
 		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 */
 			if (\_OSI("Windows 2006"))		/* Vista */
diff --git a/src/mainboard/jetway/pa78vm5/dsdt.asl b/src/mainboard/jetway/pa78vm5/dsdt.asl
index ef90448a10..eae9bbeab2 100644
--- a/src/mainboard/jetway/pa78vm5/dsdt.asl
+++ b/src/mainboard/jetway/pa78vm5/dsdt.asl
@@ -415,7 +415,7 @@ DefinitionBlock (
 
 			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 */
 				if (\_OSI("Windows 2006"))      /* Vista */
diff --git a/src/mainboard/kontron/kt690/dsdt.asl b/src/mainboard/kontron/kt690/dsdt.asl
index 1de12547cd..bfe63f79ee 100644
--- a/src/mainboard/kontron/kt690/dsdt.asl
+++ b/src/mainboard/kontron/kt690/dsdt.asl
@@ -374,7 +374,7 @@ DefinitionBlock (
 
 			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 */
 				if (\_OSI("Windows 2006"))      /* Vista */
diff --git a/src/mainboard/lenovo/x201/acpi/platform.asl b/src/mainboard/lenovo/x201/acpi/platform.asl
index 31e9e88b2b..3aa12e9f88 100644
--- a/src/mainboard/lenovo/x201/acpi/platform.asl
+++ b/src/mainboard/lenovo/x201/acpi/platform.asl
@@ -99,7 +99,7 @@ Scope(\_SB)
 		/* Let's assume we're running at least Windows 2000 */
 		Store (2000, OSYS)
 
-		If (CondRefOf(_OSI, Local0)) {
+		If (CondRefOf(_OSI)) {
 			If (_OSI("Windows 2001")) {
 				Store (2001, OSYS)
 			}
diff --git a/src/mainboard/lippert/frontrunner-af/dsdt.asl b/src/mainboard/lippert/frontrunner-af/dsdt.asl
index 86eccb2eb0..eaac89517b 100644
--- a/src/mainboard/lippert/frontrunner-af/dsdt.asl
+++ b/src/mainboard/lippert/frontrunner-af/dsdt.asl
@@ -404,7 +404,7 @@ DefinitionBlock (
 
 			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 */
 				if (\_OSI("Windows 2006"))      /* Vista */
diff --git a/src/mainboard/lippert/toucan-af/dsdt.asl b/src/mainboard/lippert/toucan-af/dsdt.asl
index 9c537fae36..a9a7485436 100644
--- a/src/mainboard/lippert/toucan-af/dsdt.asl
+++ b/src/mainboard/lippert/toucan-af/dsdt.asl
@@ -404,7 +404,7 @@ DefinitionBlock (
 
 			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 */
 				if (\_OSI("Windows 2006"))      /* Vista */
diff --git a/src/mainboard/packardbell/ms2290/acpi/platform.asl b/src/mainboard/packardbell/ms2290/acpi/platform.asl
index 4d5b5c01df..9812d14bac 100644
--- a/src/mainboard/packardbell/ms2290/acpi/platform.asl
+++ b/src/mainboard/packardbell/ms2290/acpi/platform.asl
@@ -96,7 +96,7 @@ Scope(\_SB)
 		/* Let's assume we're running at least Windows 2000 */
 		Store (2000, OSYS)
 
-		If (CondRefOf(_OSI, Local0)) {
+		If (CondRefOf(_OSI)) {
 			If (_OSI("Windows 2001")) {
 				Store (2001, OSYS)
 			}
diff --git a/src/mainboard/pcengines/apu1/acpi/mainboard.asl b/src/mainboard/pcengines/apu1/acpi/mainboard.asl
index 57a414e178..b666a4f350 100644
--- a/src/mainboard/pcengines/apu1/acpi/mainboard.asl
+++ b/src/mainboard/pcengines/apu1/acpi/mainboard.asl
@@ -35,7 +35,7 @@ Scope(\_SB) {
 
 		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 */
 			if (\_OSI("Windows 2006"))		/* Vista */
diff --git a/src/mainboard/siemens/sitemp_g1p1/acpi/platform.asl b/src/mainboard/siemens/sitemp_g1p1/acpi/platform.asl
index 3dbc3f277f..bda467a2c1 100644
--- a/src/mainboard/siemens/sitemp_g1p1/acpi/platform.asl
+++ b/src/mainboard/siemens/sitemp_g1p1/acpi/platform.asl
@@ -36,7 +36,7 @@ Scope(\_SB)
 	{
 		Store (2000, OSYS)
 
-		If (CondRefOf(_OSI, Local0)) {
+		If (CondRefOf(_OSI)) {
 
 			If (_OSI("Linux")) {
 				Store (1, LINX)
@@ -59,4 +59,4 @@ Scope(\_SB)
 			}
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/mainboard/supermicro/h8qgi/dsdt.asl b/src/mainboard/supermicro/h8qgi/dsdt.asl
index 5efa78a1ca..e488bab766 100644
--- a/src/mainboard/supermicro/h8qgi/dsdt.asl
+++ b/src/mainboard/supermicro/h8qgi/dsdt.asl
@@ -456,7 +456,7 @@ DefinitionBlock (
 	Scope(\_SB) {
 		Method(OSFL, 0){
 			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 */
 				if (\_OSI("Windows 2006"))      /* Vista */
diff --git a/src/mainboard/supermicro/h8scm/dsdt.asl b/src/mainboard/supermicro/h8scm/dsdt.asl
index 4c49e92872..78f927cb13 100644
--- a/src/mainboard/supermicro/h8scm/dsdt.asl
+++ b/src/mainboard/supermicro/h8scm/dsdt.asl
@@ -448,7 +448,7 @@ DefinitionBlock (
 	Scope(\_SB) {
 		Method(OSFL, 0){
 			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 */
 				if (\_OSI("Windows 2006"))      /* Vista */
diff --git a/src/mainboard/supermicro/h8scm_fam10/dsdt.asl b/src/mainboard/supermicro/h8scm_fam10/dsdt.asl
index 39b325451e..8f5daea02a 100644
--- a/src/mainboard/supermicro/h8scm_fam10/dsdt.asl
+++ b/src/mainboard/supermicro/h8scm_fam10/dsdt.asl
@@ -433,7 +433,7 @@ DefinitionBlock (
 
 			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 */
 				if (\_OSI("Windows 2006"))      /* Vista */
diff --git a/src/mainboard/technexion/tim5690/dsdt.asl b/src/mainboard/technexion/tim5690/dsdt.asl
index 7955cd670a..f45f8f3b7c 100644
--- a/src/mainboard/technexion/tim5690/dsdt.asl
+++ b/src/mainboard/technexion/tim5690/dsdt.asl
@@ -374,7 +374,7 @@ DefinitionBlock (
 
 			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 */
 				if (\_OSI("Windows 2006"))      /* Vista */
diff --git a/src/mainboard/technexion/tim8690/dsdt.asl b/src/mainboard/technexion/tim8690/dsdt.asl
index 552f5a3dd7..d0ce009e62 100644
--- a/src/mainboard/technexion/tim8690/dsdt.asl
+++ b/src/mainboard/technexion/tim8690/dsdt.asl
@@ -374,7 +374,7 @@ DefinitionBlock (
 
 			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 */
 				if (\_OSI("Windows 2006"))      /* Vista */
diff --git a/src/mainboard/tyan/s8226/dsdt.asl b/src/mainboard/tyan/s8226/dsdt.asl
index cdf13995ef..f15d8bb2aa 100644
--- a/src/mainboard/tyan/s8226/dsdt.asl
+++ b/src/mainboard/tyan/s8226/dsdt.asl
@@ -448,7 +448,7 @@ DefinitionBlock (
 	Scope(\_SB) {
 		Method(OSFL, 0){
 			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 */
 				if (\_OSI("Windows 2006"))      /* Vista */
diff --git a/src/southbridge/amd/agesa/hudson/acpi/fch.asl b/src/southbridge/amd/agesa/hudson/acpi/fch.asl
index 9351059a4d..d7cee4a0c0 100644
--- a/src/southbridge/amd/agesa/hudson/acpi/fch.asl
+++ b/src/southbridge/amd/agesa/hudson/acpi/fch.asl
@@ -185,7 +185,7 @@ Method(OSFL, 0){
 
 	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 */
 		if (\_OSI("Windows 2006"))		/* Vista */
diff --git a/src/southbridge/amd/pi/hudson/acpi/fch.asl b/src/southbridge/amd/pi/hudson/acpi/fch.asl
index 02a272ddf5..5a433e613a 100644
--- a/src/southbridge/amd/pi/hudson/acpi/fch.asl
+++ b/src/southbridge/amd/pi/hudson/acpi/fch.asl
@@ -167,7 +167,7 @@ Method(OSFL, 0){
 
 	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 */
 		if (\_OSI("Windows 2006"))		/* Vista */
diff --git a/src/southbridge/intel/common/acpi/platform.asl b/src/southbridge/intel/common/acpi/platform.asl
index 8481dfd9b4..ba8091d73b 100644
--- a/src/southbridge/intel/common/acpi/platform.asl
+++ b/src/southbridge/intel/common/acpi/platform.asl
@@ -70,7 +70,7 @@ Method(GOS, 0)
 	/* Let's assume we're running at least Windows 2000 */
 	Store (2000, OSYS)
 
-	If (CondRefOf(_OSI, Local0)) {
+	If (CondRefOf(_OSI)) {
 		/* Linux answers _OSI with "True" for a couple of
 		 * Windows version queries. But unlike Windows it
 		 * needs a Video repost, so let's determine whether