aboutsummaryrefslogtreecommitdiff
path: root/source/components/events
diff options
context:
space:
mode:
authorJung-uk Kim <jkim@FreeBSD.org>2012-10-19 18:47:57 +0000
committerJung-uk Kim <jkim@FreeBSD.org>2012-10-19 18:47:57 +0000
commit31aa864e8c068201d58aad3a8f82ddb51df11015 (patch)
tree5e268c18ae0fa3ec73e13e2af60a3be57d8393ec /source/components/events
parentebef5c959a0ea58fa05c4a5a80bb93104780bf87 (diff)
downloadsrc-31aa864e8c068201d58aad3a8f82ddb51df11015.tar.gz
src-31aa864e8c068201d58aad3a8f82ddb51df11015.zip
Import ACPICA 20121018.vendor/acpica/20121018
Notes
Notes: svn path=/vendor-sys/acpica/dist/; revision=241746 svn path=/vendor-sys/acpica/20121018/; revision=241747; tag=vendor/acpica/20121018
Diffstat (limited to 'source/components/events')
-rw-r--r--source/components/events/evevent.c2
-rw-r--r--source/components/events/evrgnini.c5
-rw-r--r--source/components/events/evxfgpe.c4
-rw-r--r--source/components/events/evxfregn.c1
4 files changed, 4 insertions, 8 deletions
diff --git a/source/components/events/evevent.c b/source/components/events/evevent.c
index b5a7acde7293..45ed92779e83 100644
--- a/source/components/events/evevent.c
+++ b/source/components/events/evevent.c
@@ -332,5 +332,3 @@ AcpiEvFixedEventDispatch (
}
#endif /* !ACPI_REDUCED_HARDWARE */
-
-
diff --git a/source/components/events/evrgnini.c b/source/components/events/evrgnini.c
index 92946b5aaafa..2dd9ebf0ae27 100644
--- a/source/components/events/evrgnini.c
+++ b/source/components/events/evrgnini.c
@@ -389,8 +389,8 @@ AcpiEvIsPciRootBridge (
ACPI_NAMESPACE_NODE *Node)
{
ACPI_STATUS Status;
- ACPI_DEVICE_ID *Hid;
- ACPI_DEVICE_ID_LIST *Cid;
+ ACPI_PNP_DEVICE_ID *Hid;
+ ACPI_PNP_DEVICE_ID_LIST *Cid;
UINT32 i;
BOOLEAN Match;
@@ -729,4 +729,3 @@ AcpiEvInitializeRegion (
return_ACPI_STATUS (AE_NOT_EXIST);
}
-
diff --git a/source/components/events/evxfgpe.c b/source/components/events/evxfgpe.c
index 1e83d1dacd6d..118fb5672ba0 100644
--- a/source/components/events/evxfgpe.c
+++ b/source/components/events/evxfgpe.c
@@ -774,7 +774,7 @@ AcpiInstallGpeBlock (
Status = AcpiUtAcquireMutex (ACPI_MTX_NAMESPACE);
if (ACPI_FAILURE (Status))
{
- return (Status);
+ return_ACPI_STATUS (Status);
}
Node = AcpiNsValidateHandle (GpeDevice);
@@ -867,7 +867,7 @@ AcpiRemoveGpeBlock (
Status = AcpiUtAcquireMutex (ACPI_MTX_NAMESPACE);
if (ACPI_FAILURE (Status))
{
- return (Status);
+ return_ACPI_STATUS (Status);
}
Node = AcpiNsValidateHandle (GpeDevice);
diff --git a/source/components/events/evxfregn.c b/source/components/events/evxfregn.c
index 493df9217de1..26afaf379a34 100644
--- a/source/components/events/evxfregn.c
+++ b/source/components/events/evxfregn.c
@@ -310,4 +310,3 @@ UnlockAndExit:
}
ACPI_EXPORT_SYMBOL (AcpiRemoveAddressSpaceHandler)
-