]> pilppa.org Git - linux-2.6-omap-h63xx.git/blobdiff - drivers/acpi/utilities/utinit.c
Pull trivial1 into release branch
[linux-2.6-omap-h63xx.git] / drivers / acpi / utilities / utinit.c
index 7f3713889ff02eae471ec94d1c59097728345f75..ff76055eb7d61a3e1b999b60e19d2de2507a1d23 100644 (file)
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #include <acpi/acpi.h>
 #include <acpi/acnamesp.h>
 #include <acpi/acevents.h>
 
 #define _COMPONENT          ACPI_UTILITIES
-        ACPI_MODULE_NAME    ("utinit")
+ACPI_MODULE_NAME("utinit")
 
 /* Local prototypes */
-
 static void
-acpi_ut_fadt_register_error (
-       char                            *register_name,
-       u32                             value,
-       acpi_size                       offset);
-
-static void acpi_ut_terminate (
-       void);
+acpi_ut_fadt_register_error(char *register_name, u32 value, u8 offset);
 
+static void acpi_ut_terminate(void);
 
 /*******************************************************************************
  *
@@ -76,18 +69,14 @@ static void acpi_ut_terminate (
  ******************************************************************************/
 
 static void
-acpi_ut_fadt_register_error (
-       char                            *register_name,
-       u32                             value,
-       acpi_size                       offset)
+acpi_ut_fadt_register_error(char *register_name, u32 value, u8 offset)
 {
 
-       ACPI_REPORT_WARNING (
-               ("Invalid FADT value %s=%X at offset %X FADT=%p\n",
-               register_name, value, (u32) offset, acpi_gbl_FADT));
+       ACPI_WARNING((AE_INFO,
+                     "Invalid FADT value %s=%X at offset %X FADT=%p",
+                     register_name, value, offset, acpi_gbl_FADT));
 }
 
-
 /******************************************************************************
  *
  * FUNCTION:    acpi_ut_validate_fadt
@@ -100,9 +89,7 @@ acpi_ut_fadt_register_error (
  *
  ******************************************************************************/
 
-acpi_status
-acpi_ut_validate_fadt (
-       void)
+acpi_status acpi_ut_validate_fadt(void)
 {
 
        /*
@@ -110,64 +97,66 @@ acpi_ut_validate_fadt (
         * but don't abort on any problems, just display error
         */
        if (acpi_gbl_FADT->pm1_evt_len < 4) {
-               acpi_ut_fadt_register_error ("PM1_EVT_LEN",
-                                 (u32) acpi_gbl_FADT->pm1_evt_len,
-                                 ACPI_FADT_OFFSET (pm1_evt_len));
+               acpi_ut_fadt_register_error("PM1_EVT_LEN",
+                                           (u32) acpi_gbl_FADT->pm1_evt_len,
+                                           ACPI_FADT_OFFSET(pm1_evt_len));
        }
 
        if (!acpi_gbl_FADT->pm1_cnt_len) {
-               acpi_ut_fadt_register_error ("PM1_CNT_LEN", 0,
-                                 ACPI_FADT_OFFSET (pm1_cnt_len));
+               acpi_ut_fadt_register_error("PM1_CNT_LEN", 0,
+                                           ACPI_FADT_OFFSET(pm1_cnt_len));
        }
 
        if (!acpi_gbl_FADT->xpm1a_evt_blk.address) {
-               acpi_ut_fadt_register_error ("X_PM1a_EVT_BLK", 0,
-                                 ACPI_FADT_OFFSET (xpm1a_evt_blk.address));
+               acpi_ut_fadt_register_error("X_PM1a_EVT_BLK", 0,
+                                           ACPI_FADT_OFFSET(xpm1a_evt_blk.
+                                                            address));
        }
 
        if (!acpi_gbl_FADT->xpm1a_cnt_blk.address) {
-               acpi_ut_fadt_register_error ("X_PM1a_CNT_BLK", 0,
-                                 ACPI_FADT_OFFSET (xpm1a_cnt_blk.address));
+               acpi_ut_fadt_register_error("X_PM1a_CNT_BLK", 0,
+                                           ACPI_FADT_OFFSET(xpm1a_cnt_blk.
+                                                            address));
        }
 
        if (!acpi_gbl_FADT->xpm_tmr_blk.address) {
-               acpi_ut_fadt_register_error ("X_PM_TMR_BLK", 0,
-                                 ACPI_FADT_OFFSET (xpm_tmr_blk.address));
+               acpi_ut_fadt_register_error("X_PM_TMR_BLK", 0,
+                                           ACPI_FADT_OFFSET(xpm_tmr_blk.
+                                                            address));
        }
 
        if ((acpi_gbl_FADT->xpm2_cnt_blk.address &&
-               !acpi_gbl_FADT->pm2_cnt_len)) {
-               acpi_ut_fadt_register_error ("PM2_CNT_LEN",
-                                 (u32) acpi_gbl_FADT->pm2_cnt_len,
-                                 ACPI_FADT_OFFSET (pm2_cnt_len));
+            !acpi_gbl_FADT->pm2_cnt_len)) {
+               acpi_ut_fadt_register_error("PM2_CNT_LEN",
+                                           (u32) acpi_gbl_FADT->pm2_cnt_len,
+                                           ACPI_FADT_OFFSET(pm2_cnt_len));
        }
 
        if (acpi_gbl_FADT->pm_tm_len < 4) {
-               acpi_ut_fadt_register_error ("PM_TM_LEN",
-                                 (u32) acpi_gbl_FADT->pm_tm_len,
-                                 ACPI_FADT_OFFSET (pm_tm_len));
+               acpi_ut_fadt_register_error("PM_TM_LEN",
+                                           (u32) acpi_gbl_FADT->pm_tm_len,
+                                           ACPI_FADT_OFFSET(pm_tm_len));
        }
 
        /* Length of GPE blocks must be a multiple of 2 */
 
        if (acpi_gbl_FADT->xgpe0_blk.address &&
-               (acpi_gbl_FADT->gpe0_blk_len & 1)) {
-               acpi_ut_fadt_register_error ("(x)GPE0_BLK_LEN",
-                                 (u32) acpi_gbl_FADT->gpe0_blk_len,
-                                 ACPI_FADT_OFFSET (gpe0_blk_len));
+           (acpi_gbl_FADT->gpe0_blk_len & 1)) {
+               acpi_ut_fadt_register_error("(x)GPE0_BLK_LEN",
+                                           (u32) acpi_gbl_FADT->gpe0_blk_len,
+                                           ACPI_FADT_OFFSET(gpe0_blk_len));
        }
 
        if (acpi_gbl_FADT->xgpe1_blk.address &&
-               (acpi_gbl_FADT->gpe1_blk_len & 1)) {
-               acpi_ut_fadt_register_error ("(x)GPE1_BLK_LEN",
-                                 (u32) acpi_gbl_FADT->gpe1_blk_len,
-                                 ACPI_FADT_OFFSET (gpe1_blk_len));
+           (acpi_gbl_FADT->gpe1_blk_len & 1)) {
+               acpi_ut_fadt_register_error("(x)GPE1_BLK_LEN",
+                                           (u32) acpi_gbl_FADT->gpe1_blk_len,
+                                           ACPI_FADT_OFFSET(gpe1_blk_len));
        }
 
        return (AE_OK);
 }
 
-
 /******************************************************************************
  *
  * FUNCTION:    acpi_ut_terminate
@@ -180,18 +169,14 @@ acpi_ut_validate_fadt (
  *
  ******************************************************************************/
 
-static void
-acpi_ut_terminate (
-       void)
+static void acpi_ut_terminate(void)
 {
-       struct acpi_gpe_block_info      *gpe_block;
-       struct acpi_gpe_block_info      *next_gpe_block;
-       struct acpi_gpe_xrupt_info      *gpe_xrupt_info;
-       struct acpi_gpe_xrupt_info      *next_gpe_xrupt_info;
-
-
-       ACPI_FUNCTION_TRACE ("ut_terminate");
+       struct acpi_gpe_block_info *gpe_block;
+       struct acpi_gpe_block_info *next_gpe_block;
+       struct acpi_gpe_xrupt_info *gpe_xrupt_info;
+       struct acpi_gpe_xrupt_info *next_gpe_xrupt_info;
 
+       ACPI_FUNCTION_TRACE(ut_terminate);
 
        /* Free global tables, etc. */
        /* Free global GPE blocks and related info structures */
@@ -201,21 +186,20 @@ acpi_ut_terminate (
                gpe_block = gpe_xrupt_info->gpe_block_list_head;
                while (gpe_block) {
                        next_gpe_block = gpe_block->next;
-                       ACPI_MEM_FREE (gpe_block->event_info);
-                       ACPI_MEM_FREE (gpe_block->register_info);
-                       ACPI_MEM_FREE (gpe_block);
+                       ACPI_FREE(gpe_block->event_info);
+                       ACPI_FREE(gpe_block->register_info);
+                       ACPI_FREE(gpe_block);
 
                        gpe_block = next_gpe_block;
                }
                next_gpe_xrupt_info = gpe_xrupt_info->next;
-               ACPI_MEM_FREE (gpe_xrupt_info);
+               ACPI_FREE(gpe_xrupt_info);
                gpe_xrupt_info = next_gpe_xrupt_info;
        }
 
        return_VOID;
 }
 
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ut_subsystem_shutdown
@@ -229,50 +213,38 @@ acpi_ut_terminate (
  *
  ******************************************************************************/
 
-void
-acpi_ut_subsystem_shutdown (
-       void)
+void acpi_ut_subsystem_shutdown(void)
 {
 
-       ACPI_FUNCTION_TRACE ("ut_subsystem_shutdown");
+       ACPI_FUNCTION_TRACE(ut_subsystem_shutdown);
 
        /* Just exit if subsystem is already shutdown */
 
        if (acpi_gbl_shutdown) {
-               ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
-                       "ACPI Subsystem is already terminated\n"));
+               ACPI_ERROR((AE_INFO, "ACPI Subsystem is already terminated"));
                return_VOID;
        }
 
        /* Subsystem appears active, go ahead and shut it down */
 
        acpi_gbl_shutdown = TRUE;
-       ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
-               "Shutting down ACPI Subsystem...\n"));
+       acpi_gbl_startup_flags = 0;
+       ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Shutting down ACPI Subsystem\n"));
 
        /* Close the acpi_event Handling */
 
-       acpi_ev_terminate ();
+       acpi_ev_terminate();
 
        /* Close the Namespace */
 
-       acpi_ns_terminate ();
+       acpi_ns_terminate();
 
        /* Close the globals */
 
-       acpi_ut_terminate ();
+       acpi_ut_terminate();
 
        /* Purge the local caches */
 
-       (void) acpi_purge_cached_objects ();
-
-       /* Debug only - display leftover memory allocation, if any */
-
-#ifdef ACPI_DBG_TRACK_ALLOCATIONS
-       acpi_ut_dump_allocations (ACPI_UINT32_MAX, NULL);
-#endif
-
+       (void)acpi_ut_delete_caches();
        return_VOID;
 }
-
-