summaryrefslogtreecommitdiffstats
path: root/sys/contrib/dev/acpica/utinit.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/contrib/dev/acpica/utinit.c')
-rw-r--r--sys/contrib/dev/acpica/utinit.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/sys/contrib/dev/acpica/utinit.c b/sys/contrib/dev/acpica/utinit.c
index c1dd2ee..617fbc6 100644
--- a/sys/contrib/dev/acpica/utinit.c
+++ b/sys/contrib/dev/acpica/utinit.c
@@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: utinit - Common ACPI subsystem initialization
- * $Revision: 109 $
+ * $Revision: 112 $
*
*****************************************************************************/
@@ -118,7 +118,6 @@
#define __UTINIT_C__
#include "acpi.h"
-#include "achware.h"
#include "acnamesp.h"
#include "acevents.h"
@@ -149,7 +148,7 @@ AcpiUtFadtRegisterError (
{
ACPI_REPORT_WARNING (
- ("Invalid FADT value %s=%lX at offset %lX FADT=%p\n",
+ ("Invalid FADT value %s=%X at offset %X FADT=%p\n",
RegisterName, Value, Offset, AcpiGbl_FADT));
}
@@ -283,7 +282,7 @@ AcpiUtTerminate (void)
*
******************************************************************************/
-ACPI_STATUS
+void
AcpiUtSubsystemShutdown (void)
{
@@ -294,7 +293,7 @@ AcpiUtSubsystemShutdown (void)
if (AcpiGbl_Shutdown)
{
ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "ACPI Subsystem is already terminated\n"));
- return_ACPI_STATUS (AE_OK);
+ return_VOID;
}
/* Subsystem appears active, go ahead and shut it down */
@@ -316,7 +315,7 @@ AcpiUtSubsystemShutdown (void)
/* Purge the local caches */
- AcpiPurgeCachedObjects ();
+ (void) AcpiPurgeCachedObjects ();
/* Debug only - display leftover memory allocation, if any */
@@ -324,7 +323,7 @@ AcpiUtSubsystemShutdown (void)
AcpiUtDumpAllocations (ACPI_UINT32_MAX, NULL);
#endif
- return_ACPI_STATUS (AE_OK);
+ return_VOID;
}
OpenPOWER on IntegriCloud