[ACPI] Lindent all ACPI files

Signed-off-by: Len Brown <len.brown@intel.com>

1 files changed, 281 insertions, 397 deletions

diff --git a/include/acpi/aclocal.h b/include/acpi/aclocal.h
index 4d2635698e10..9fba0fddda90 100644
--- a/include/acpi/aclocal.h
+++ b/include/acpi/aclocal.h
@@ -44,24 +44,20 @@
 #ifndef __ACLOCAL_H__
 #define __ACLOCAL_H__
 
+#define ACPI_WAIT_FOREVER               0xFFFF  /* u16, as per ACPI spec */
 
-#define ACPI_WAIT_FOREVER               0xFFFF  /* u16, as per ACPI spec */
-
-typedef void *                                  acpi_mutex;
-typedef u32                                     acpi_mutex_handle;
-
+typedef void *acpi_mutex;
+typedef u32 acpi_mutex_handle;
 
 /* Total number of aml opcodes defined */
 
 #define AML_NUM_OPCODES                 0x7F
 
-
 /* Forward declarations */
 
-struct acpi_walk_state        ;
+struct acpi_walk_state;
 struct acpi_obj_mutex;
-union acpi_parse_object        ;
-
+union acpi_parse_object;
 
 /*****************************************************************************
  *
@@ -69,7 +65,6 @@ union acpi_parse_object        ;
  *
  ****************************************************************************/
 
-
 /*
  * Predefined handles for the mutex objects used within the subsystem
  * All mutex objects are automatically created by acpi_ut_mutex_initialize.
@@ -96,14 +91,12 @@ union acpi_parse_object        ;
 #define MAX_MUTEX                       12
 #define NUM_MUTEX                       MAX_MUTEX+1
 
-
 #if defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DEBUGGER)
 #ifdef DEFINE_ACPI_GLOBALS
 
 /* Names for the mutexes used in the subsystem */
 
-static char                         *acpi_gbl_mutex_names[] =
-{
+static char *acpi_gbl_mutex_names[] = {
         "ACPI_MTX_Execute",
         "ACPI_MTX_Interpreter",
         "ACPI_MTX_Parser",
@@ -122,10 +115,9 @@ static char                         *acpi_gbl_mutex_names[] =
 #endif
 #endif
 
-
 /* Owner IDs are used to track namespace nodes for selective deletion */
 
-typedef u8                                      acpi_owner_id;
+typedef u8 acpi_owner_id;
 #define ACPI_OWNER_ID_MAX               0xFF
 
 /* This Thread ID means that the mutex is not in use (unlocked) */
@@ -134,20 +126,17 @@ typedef u8                                      acpi_owner_id;
 
 /* Table for the global mutexes */
 
-struct acpi_mutex_info
-{
-        acpi_mutex                          mutex;
-        u32                                 use_count;
-        u32                                 thread_id;
+struct acpi_mutex_info {
+        acpi_mutex mutex;
+        u32 use_count;
+        u32 thread_id;
 };
 
-
 /* Lock flag parameter for various interfaces */
 
 #define ACPI_MTX_DO_NOT_LOCK            0
 #define ACPI_MTX_LOCK                   1
 
-
 /* Field access granularities */
 
 #define ACPI_FIELD_BYTE_GRANULARITY     1
@@ -155,7 +144,6 @@ struct acpi_mutex_info
 #define ACPI_FIELD_DWORD_GRANULARITY    4
 #define ACPI_FIELD_QWORD_GRANULARITY    8
 
-
 /*****************************************************************************
  *
  * Namespace typedefs and structs
@@ -164,15 +152,12 @@ struct acpi_mutex_info
 
 /* Operational modes of the AML interpreter/scanner */
 
-typedef enum
-{
-        ACPI_IMODE_LOAD_PASS1               = 0x01,
-        ACPI_IMODE_LOAD_PASS2               = 0x02,
-        ACPI_IMODE_EXECUTE                  = 0x0E
-
+typedef enum {
+        ACPI_IMODE_LOAD_PASS1 = 0x01,
+        ACPI_IMODE_LOAD_PASS2 = 0x02,
+        ACPI_IMODE_EXECUTE = 0x0E
 } acpi_interpreter_mode;
 
-
 /*
  * The Node describes a named object that appears in the AML
  * An acpi_node is used to store Nodes.
@@ -180,41 +165,37 @@ typedef enum
  * data_type is used to differentiate between internal descriptors, and MUST
  * be the first byte in this structure.
  */
-union acpi_name_union
-{
-        u32                                 integer;
-        char                                ascii[4];
-};
-
-struct acpi_namespace_node
-{
-        u8                                  descriptor;     /* Used to differentiate object descriptor types */
-        u8                                  type;           /* Type associated with this name */
-        u16                                 reference_count; /* Current count of references and children */
-        union acpi_name_union               name;           /* ACPI Name, always 4 chars per ACPI spec */
-        union acpi_operand_object           *object;        /* Pointer to attached ACPI object (optional) */
-        struct acpi_namespace_node          *child;         /* First child */
-        struct acpi_namespace_node          *peer;          /* Next peer*/
-        u8                                  owner_id;       /* Who created this node */
-        u8                                  flags;
+union acpi_name_union {
+        u32 integer;
+        char ascii[4];
+};
+
+struct acpi_namespace_node {
+        u8 descriptor;          /* Used to differentiate object descriptor types */
+        u8 type;                /* Type associated with this name */
+        u16 reference_count;    /* Current count of references and children */
+        union acpi_name_union name;     /* ACPI Name, always 4 chars per ACPI spec */
+        union acpi_operand_object *object;      /* Pointer to attached ACPI object (optional) */
+        struct acpi_namespace_node *child;      /* First child */
+        struct acpi_namespace_node *peer;       /* Next peer */
+        u8 owner_id;            /* Who created this node */
+        u8 flags;
 
         /* Fields used by the ASL compiler only */
 
 #ifdef ACPI_ASL_COMPILER
-        u32                                 value;
-        union acpi_parse_object             *op;
+        u32 value;
+        union acpi_parse_object *op;
 #endif
 };
 
-
 #define ACPI_ENTRY_NOT_FOUND            NULL
 
-
 /* Node flags */
 
 #define ANOBJ_RESERVED                  0x01
 #define ANOBJ_END_OF_PEER_LIST          0x02
-#define ANOBJ_DATA_WIDTH_32             0x04     /* Parent table is 64-bits */
+#define ANOBJ_DATA_WIDTH_32             0x04    /* Parent table is 64-bits */
 #define ANOBJ_METHOD_ARG                0x08
 #define ANOBJ_METHOD_LOCAL              0x10
 #define ANOBJ_METHOD_NO_RETVAL          0x20
@@ -224,91 +205,77 @@ struct acpi_namespace_node
 /*
  * ACPI Table Descriptor.  One per ACPI table
  */
-struct acpi_table_desc
-{
-        struct acpi_table_desc          *prev;
-        struct acpi_table_desc          *next;
-        struct acpi_table_desc          *installed_desc;
-        struct acpi_table_header        *pointer;
-        u8                              *aml_start;
-        u64                             physical_address;
-        u32                             aml_length;
-        acpi_size                       length;
-        acpi_owner_id                   owner_id;
-        u8                              type;
-        u8                              allocation;
-        u8                              loaded_into_namespace;
+struct acpi_table_desc {
+        struct acpi_table_desc *prev;
+        struct acpi_table_desc *next;
+        struct acpi_table_desc *installed_desc;
+        struct acpi_table_header *pointer;
+        u8 *aml_start;
+        u64 physical_address;
+        u32 aml_length;
+        acpi_size length;
+        acpi_owner_id owner_id;
+        u8 type;
+        u8 allocation;
+        u8 loaded_into_namespace;
 };
 
-struct acpi_table_list
-{
-        struct acpi_table_desc          *next;
-        u32                             count;
+struct acpi_table_list {
+        struct acpi_table_desc *next;
+        u32 count;
 };
 
-
-struct acpi_find_context
-{
-        char                            *search_for;
-        acpi_handle                     *list;
-        u32                             *count;
+struct acpi_find_context {
+        char *search_for;
+        acpi_handle *list;
+        u32 *count;
 };
 
-
-struct acpi_ns_search_data
-{
-        struct acpi_namespace_node      *node;
+struct acpi_ns_search_data {
+        struct acpi_namespace_node *node;
 };
 
-
 /*
  * Predefined Namespace items
  */
-struct acpi_predefined_names
-{
-        char                            *name;
-        u8                              type;
-        char                            *val;
+struct acpi_predefined_names {
+        char *name;
+        u8 type;
+        char *val;
 };
 
-
 /* Object types used during package copies */
 
-
 #define ACPI_COPY_TYPE_SIMPLE           0
 #define ACPI_COPY_TYPE_PACKAGE          1
 
 /* Info structure used to convert external<->internal namestrings */
 
-struct acpi_namestring_info
-{
-        char                            *external_name;
-        char                            *next_external_char;
-        char                            *internal_name;
-        u32                             length;
-        u32                             num_segments;
-        u32                             num_carats;
-        u8                              fully_qualified;
+struct acpi_namestring_info {
+        char *external_name;
+        char *next_external_char;
+        char *internal_name;
+        u32 length;
+        u32 num_segments;
+        u32 num_carats;
+        u8 fully_qualified;
 };
 
-
 /* Field creation info */
 
-struct acpi_create_field_info
-{
-        struct acpi_namespace_node      *region_node;
-        struct acpi_namespace_node      *field_node;
-        struct acpi_namespace_node      *register_node;
-        struct acpi_namespace_node      *data_register_node;
-        u32                             bank_value;
-        u32                             field_bit_position;
-        u32                             field_bit_length;
-        u8                              field_flags;
-        u8                              attribute;
-        u8                              field_type;
+struct acpi_create_field_info {
+        struct acpi_namespace_node *region_node;
+        struct acpi_namespace_node *field_node;
+        struct acpi_namespace_node *register_node;
+        struct acpi_namespace_node *data_register_node;
+        u32 bank_value;
+        u32 field_bit_position;
+        u32 field_bit_length;
+        u8 field_flags;
+        u8 attribute;
+        u8 field_type;
 };
 
-
 /*****************************************************************************
  *
  * Event typedefs and structs
@@ -317,108 +284,95 @@ struct acpi_create_field_info
 
 /* Dispatch info for each GPE -- either a method or handler, cannot be both */
 
-struct acpi_handler_info
-{
-        acpi_event_handler                      address;        /* Address of handler, if any */
-        void                                    *context;       /* Context to be passed to handler */
-        struct acpi_namespace_node              *method_node;   /* Method node for this GPE level (saved) */
+struct acpi_handler_info {
+        acpi_event_handler address;     /* Address of handler, if any */
+        void *context;          /* Context to be passed to handler */
+        struct acpi_namespace_node *method_node;        /* Method node for this GPE level (saved) */
 };
 
-union acpi_gpe_dispatch_info
-{
-        struct acpi_namespace_node              *method_node;   /* Method node for this GPE level */
-        struct acpi_handler_info                *handler;
+union acpi_gpe_dispatch_info {
+        struct acpi_namespace_node *method_node;        /* Method node for this GPE level */
+        struct acpi_handler_info *handler;
 };
 
 /*
  * Information about a GPE, one per each GPE in an array.
  * NOTE: Important to keep this struct as small as possible.
  */
-struct acpi_gpe_event_info
-{
-        union acpi_gpe_dispatch_info    dispatch;       /* Either Method or Handler */
-        struct acpi_gpe_register_info           *register_info; /* Backpointer to register info */
-        u8                                      flags;          /* Misc info about this GPE */
-        u8                                      register_bit;   /* This GPE bit within the register */
+struct acpi_gpe_event_info {
+        union acpi_gpe_dispatch_info dispatch;  /* Either Method or Handler */
+        struct acpi_gpe_register_info *register_info;   /* Backpointer to register info */
+        u8 flags;               /* Misc info about this GPE */
+        u8 register_bit;        /* This GPE bit within the register */
 };
 
 /* Information about a GPE register pair, one per each status/enable pair in an array */
 
-struct acpi_gpe_register_info
-{
-        struct acpi_generic_address             status_address; /* Address of status reg */
-        struct acpi_generic_address             enable_address; /* Address of enable reg */
-        u8                                      enable_for_wake; /* GPEs to keep enabled when sleeping */
-        u8                                      enable_for_run; /* GPEs to keep enabled when running */
-        u8                                      base_gpe_number; /* Base GPE number for this register */
+struct acpi_gpe_register_info {
+        struct acpi_generic_address status_address;     /* Address of status reg */
+        struct acpi_generic_address enable_address;     /* Address of enable reg */
+        u8 enable_for_wake;     /* GPEs to keep enabled when sleeping */
+        u8 enable_for_run;      /* GPEs to keep enabled when running */
+        u8 base_gpe_number;     /* Base GPE number for this register */
 };
 
 /*
  * Information about a GPE register block, one per each installed block --
  * GPE0, GPE1, and one per each installed GPE Block Device.
  */
-struct acpi_gpe_block_info
-{
-        struct acpi_namespace_node              *node;
-        struct acpi_gpe_block_info              *previous;
-        struct acpi_gpe_block_info              *next;
-        struct acpi_gpe_xrupt_info              *xrupt_block;   /* Backpointer to interrupt block */
-        struct acpi_gpe_register_info           *register_info; /* One per GPE register pair */
-        struct acpi_gpe_event_info              *event_info;    /* One for each GPE */
-        struct acpi_generic_address             block_address;  /* Base address of the block */
-        u32                                     register_count; /* Number of register pairs in block */
-        u8                                      block_base_number;/* Base GPE number for this block */
+struct acpi_gpe_block_info {
+        struct acpi_namespace_node *node;
+        struct acpi_gpe_block_info *previous;
+        struct acpi_gpe_block_info *next;
+        struct acpi_gpe_xrupt_info *xrupt_block;        /* Backpointer to interrupt block */
+        struct acpi_gpe_register_info *register_info;   /* One per GPE register pair */
+        struct acpi_gpe_event_info *event_info; /* One for each GPE */
+        struct acpi_generic_address block_address;      /* Base address of the block */
+        u32 register_count;     /* Number of register pairs in block */
+        u8 block_base_number;   /* Base GPE number for this block */
 };
 
 /* Information about GPE interrupt handlers, one per each interrupt level used for GPEs */
 
-struct acpi_gpe_xrupt_info
-{
-        struct acpi_gpe_xrupt_info              *previous;
-        struct acpi_gpe_xrupt_info              *next;
-        struct acpi_gpe_block_info              *gpe_block_list_head; /* List of GPE blocks for this xrupt */
-        u32                                     interrupt_number;   /* System interrupt number */
+struct acpi_gpe_xrupt_info {
+        struct acpi_gpe_xrupt_info *previous;
+        struct acpi_gpe_xrupt_info *next;
+        struct acpi_gpe_block_info *gpe_block_list_head;        /* List of GPE blocks for this xrupt */
+        u32 interrupt_number;   /* System interrupt number */
 };
 
-
-struct acpi_gpe_walk_info
-{
-        struct acpi_namespace_node              *gpe_device;
-        struct acpi_gpe_block_info              *gpe_block;
+struct acpi_gpe_walk_info {
+        struct acpi_namespace_node *gpe_device;
+        struct acpi_gpe_block_info *gpe_block;
 };
 
-
-typedef acpi_status (*ACPI_GPE_CALLBACK) (
-        struct acpi_gpe_xrupt_info      *gpe_xrupt_info,
-        struct acpi_gpe_block_info      *gpe_block);
-
+typedef acpi_status(*ACPI_GPE_CALLBACK) (struct acpi_gpe_xrupt_info *
+                                         gpe_xrupt_info,
+                                         struct acpi_gpe_block_info *
+                                         gpe_block);
 
 /* Information about each particular fixed event */
 
-struct acpi_fixed_event_handler
-{
-        acpi_event_handler              handler;        /* Address of handler. */
-        void                            *context;       /* Context to be passed to handler */
+struct acpi_fixed_event_handler {
+        acpi_event_handler handler;     /* Address of handler. */
+        void *context;          /* Context to be passed to handler */
 };
 
-struct acpi_fixed_event_info
-{
-        u8                              status_register_id;
-        u8                              enable_register_id;
-        u16                             status_bit_mask;
-        u16                             enable_bit_mask;
+struct acpi_fixed_event_info {
+        u8 status_register_id;
+        u8 enable_register_id;
+        u16 status_bit_mask;
+        u16 enable_bit_mask;
 };
 
 /* Information used during field processing */
 
-struct acpi_field_info
-{
-        u8                              skip_field;
-        u8                              field_flag;
-        u32                             pkg_length;
+struct acpi_field_info {
+        u8 skip_field;
+        u8 field_flag;
+        u32 pkg_length;
 };
 
-
 /*****************************************************************************
  *
  * Generic "state" object for stacks
@@ -431,7 +385,6 @@ struct acpi_field_info
 #define ACPI_CONTROL_PREDICATE_FALSE         0xC3
 #define ACPI_CONTROL_PREDICATE_TRUE          0xC4
 
-
 #define ACPI_STATE_COMMON                  /* Two 32-bit fields and a pointer */\
         u8                                  data_type;          /* To differentiate various internal objs */\
         u8                                  flags;      \
@@ -440,147 +393,112 @@ struct acpi_field_info
         u16                                 reserved;   \
         void                                *next;      \
 
-struct acpi_common_state
-{
-        ACPI_STATE_COMMON
-};
-
+struct acpi_common_state {
+ACPI_STATE_COMMON};
 
 /*
  * Update state - used to traverse complex objects such as packages
  */
-struct acpi_update_state
-{
-        ACPI_STATE_COMMON
-        union acpi_operand_object           *object;
+struct acpi_update_state {
+        ACPI_STATE_COMMON union acpi_operand_object *object;
 };
 
-
 /*
  * Pkg state - used to traverse nested package structures
  */
-struct acpi_pkg_state
-{
-        ACPI_STATE_COMMON
-        union acpi_operand_object           *source_object;
-        union acpi_operand_object           *dest_object;
-        struct acpi_walk_state              *walk_state;
-        void                                *this_target_obj;
-        u32                                 num_packages;
-        u16                                 index;
+struct acpi_pkg_state {
+        ACPI_STATE_COMMON union acpi_operand_object *source_object;
+        union acpi_operand_object *dest_object;
+        struct acpi_walk_state *walk_state;
+        void *this_target_obj;
+        u32 num_packages;
+        u16 index;
 };
 
-
 /*
  * Control state - one per if/else and while constructs.
  * Allows nesting of these constructs
  */
-struct acpi_control_state
-{
-        ACPI_STATE_COMMON
-        union acpi_parse_object             *predicate_op;
-        u8                                  *aml_predicate_start;   /* Start of if/while predicate */
-        u8                                  *package_end;           /* End of if/while block */
-        u16                                 opcode;
+struct acpi_control_state {
+        ACPI_STATE_COMMON union acpi_parse_object *predicate_op;
+        u8 *aml_predicate_start;        /* Start of if/while predicate */
+        u8 *package_end;        /* End of if/while block */
+        u16 opcode;
 };
 
-
 /*
  * Scope state - current scope during namespace lookups
  */
-struct acpi_scope_state
-{
-        ACPI_STATE_COMMON
-        struct acpi_namespace_node          *node;
+struct acpi_scope_state {
+        ACPI_STATE_COMMON struct acpi_namespace_node *node;
 };
 
-
-struct acpi_pscope_state
-{
-        ACPI_STATE_COMMON
-        union acpi_parse_object             *op;                    /* Current op being parsed */
-        u8                                  *arg_end;               /* Current argument end */
-        u8                                  *pkg_end;               /* Current package end */
-        u32                                 arg_list;               /* Next argument to parse */
-        u32                                 arg_count;              /* Number of fixed arguments */
+struct acpi_pscope_state {
+        ACPI_STATE_COMMON union acpi_parse_object *op;  /* Current op being parsed */
+        u8 *arg_end;            /* Current argument end */
+        u8 *pkg_end;            /* Current package end */
+        u32 arg_list;           /* Next argument to parse */
+        u32 arg_count;          /* Number of fixed arguments */
 };
 
-
 /*
  * Thread state - one per thread across multiple walk states.  Multiple walk
  * states are created when there are nested control methods executing.
  */
-struct acpi_thread_state
-{
-        ACPI_STATE_COMMON
-        struct acpi_walk_state              *walk_state_list;       /* Head of list of walk_states for this thread */
-        union acpi_operand_object           *acquired_mutex_list;   /* List of all currently acquired mutexes */
-        u32                                 thread_id;              /* Running thread ID */
-        u8                                  current_sync_level;     /* Mutex Sync (nested acquire) level */
+struct acpi_thread_state {
+        ACPI_STATE_COMMON struct acpi_walk_state *walk_state_list;      /* Head of list of walk_states for this thread */
+        union acpi_operand_object *acquired_mutex_list; /* List of all currently acquired mutexes */
+        u32 thread_id;          /* Running thread ID */
+        u8 current_sync_level;  /* Mutex Sync (nested acquire) level */
 };
 
-
 /*
  * Result values - used to accumulate the results of nested
  * AML arguments
  */
-struct acpi_result_values
-{
+struct acpi_result_values {
         ACPI_STATE_COMMON
-        union acpi_operand_object           *obj_desc [ACPI_OBJ_NUM_OPERANDS];
-        u8                                  num_results;
-        u8                                  last_insert;
+            union acpi_operand_object *obj_desc[ACPI_OBJ_NUM_OPERANDS];
+        u8 num_results;
+        u8 last_insert;
 };
 
-
 typedef
-acpi_status (*acpi_parse_downwards) (
-        struct acpi_walk_state              *walk_state,
-        union acpi_parse_object             **out_op);
-
-typedef
-acpi_status (*acpi_parse_upwards) (
-        struct acpi_walk_state              *walk_state);
+acpi_status(*acpi_parse_downwards) (struct acpi_walk_state * walk_state,
+                                    union acpi_parse_object ** out_op);
 
+typedef acpi_status(*acpi_parse_upwards) (struct acpi_walk_state * walk_state);
 
 /*
  * Notify info - used to pass info to the deferred notify
  * handler/dispatcher.
  */
-struct acpi_notify_info
-{
-        ACPI_STATE_COMMON
-        struct acpi_namespace_node          *node;
-        union acpi_operand_object           *handler_obj;
+struct acpi_notify_info {
+        ACPI_STATE_COMMON struct acpi_namespace_node *node;
+        union acpi_operand_object *handler_obj;
 };
 
-
 /* Generic state is union of structs above */
 
-union acpi_generic_state
-{
-        struct acpi_common_state            common;
-        struct acpi_control_state           control;
-        struct acpi_update_state            update;
-        struct acpi_scope_state             scope;
-        struct acpi_pscope_state            parse_scope;
-        struct acpi_pkg_state               pkg;
-        struct acpi_thread_state            thread;
-        struct acpi_result_values           results;
-        struct acpi_notify_info             notify;
+union acpi_generic_state {
+        struct acpi_common_state common;
+        struct acpi_control_state control;
+        struct acpi_update_state update;
+        struct acpi_scope_state scope;
+        struct acpi_pscope_state parse_scope;
+        struct acpi_pkg_state pkg;
+        struct acpi_thread_state thread;
+        struct acpi_result_values results;
+        struct acpi_notify_info notify;
 };
 
-
 /*****************************************************************************
  *
  * Interpreter typedefs and structs
  *
  ****************************************************************************/
 
-typedef
-acpi_status (*ACPI_EXECUTE_OP) (
-        struct acpi_walk_state              *walk_state);
-
+typedef acpi_status(*ACPI_EXECUTE_OP) (struct acpi_walk_state * walk_state);
 
 /*****************************************************************************
  *
@@ -591,28 +509,26 @@ acpi_status (*ACPI_EXECUTE_OP) (
 /*
  * AML opcode, name, and argument layout
  */
-struct acpi_opcode_info
-{
+struct acpi_opcode_info {
 #if defined(ACPI_DISASSEMBLER) || defined(ACPI_DEBUG_OUTPUT)
-        char                                *name;          /* Opcode name (disassembler/debug only) */
+        char *name;             /* Opcode name (disassembler/debug only) */
 #endif
-        u32                                 parse_args;     /* Grammar/Parse time arguments */
-        u32                                 runtime_args;   /* Interpret time arguments */
-        u32                                 flags;          /* Misc flags */
-        u8                                  object_type;    /* Corresponding internal object type */
-        u8                                  class;          /* Opcode class */
-        u8                                  type;           /* Opcode type */
+        u32 parse_args;         /* Grammar/Parse time arguments */
+        u32 runtime_args;       /* Interpret time arguments */
+        u32 flags;              /* Misc flags */
+        u8 object_type;         /* Corresponding internal object type */
+        u8 class;               /* Opcode class */
+        u8 type;                /* Opcode type */
 };
 
-union acpi_parse_value
-{
-        acpi_integer                        integer;        /* Integer constant (Up to 64 bits) */
-        struct uint64_struct                integer64;      /* Structure overlay for 2 32-bit Dwords */
-        u32                                 size;           /* bytelist or field size */
-        char                                *string;        /* NULL terminated string */
-        u8                                  *buffer;        /* buffer or string */
-        char                                *name;          /* NULL terminated string */
-        union acpi_parse_object             *arg;           /* arguments and contained ops */
+union acpi_parse_value {
+        acpi_integer integer;   /* Integer constant (Up to 64 bits) */
+        struct uint64_struct integer64; /* Structure overlay for 2 32-bit Dwords */
+        u32 size;               /* bytelist or field size */
+        char *string;           /* NULL terminated string */
+        u8 *buffer;             /* buffer or string */
+        char *name;             /* NULL terminated string */
+        union acpi_parse_object *arg;   /* arguments and contained ops */
 };
 
 #define ACPI_PARSE_COMMON \
@@ -641,84 +557,72 @@ union acpi_parse_value
 /*
  * generic operation (for example:  If, While, Store)
  */
-struct acpi_parse_obj_common
-{
-        ACPI_PARSE_COMMON
-};
-
+struct acpi_parse_obj_common {
+ACPI_PARSE_COMMON};
 
 /*
  * Extended Op for named ops (Scope, Method, etc.), deferred ops (Methods and op_regions),
  * and bytelists.
  */
-struct acpi_parse_obj_named
-{
-        ACPI_PARSE_COMMON
-        u8                                  *path;
-        u8                                  *data;          /* AML body or bytelist data */
-        u32                                 length;         /* AML length */
-        u32                                 name;           /* 4-byte name or zero if no name */
+struct acpi_parse_obj_named {
+        ACPI_PARSE_COMMON u8 * path;
+        u8 *data;               /* AML body or bytelist data */
+        u32 length;             /* AML length */
+        u32 name;               /* 4-byte name or zero if no name */
 };
 
-
 /* The parse node is the fundamental element of the parse tree */
 
-struct acpi_parse_obj_asl
-{
-        ACPI_PARSE_COMMON
-        union acpi_parse_object             *child;
-        union acpi_parse_object             *parent_method;
-        char                                *filename;
-        char                                *external_name;
-        char                                *namepath;
-        char                                name_seg[4];
-        u32                                 extra_value;
-        u32                                 column;
-        u32                                 line_number;
-        u32                                 logical_line_number;
-        u32                                 logical_byte_offset;
-        u32                                 end_line;
-        u32                                 end_logical_line;
-        u32                                 acpi_btype;
-        u32                                 aml_length;
-        u32                                 aml_subtree_length;
-        u32                                 final_aml_length;
-        u32                                 final_aml_offset;
-        u32                                 compile_flags;
-        u16                                 parse_opcode;
-        u8                                  aml_opcode_length;
-        u8                                  aml_pkg_len_bytes;
-        u8                                  extra;
-        char                                parse_op_name[12];
-};
-
-union acpi_parse_object
-{
-        struct acpi_parse_obj_common        common;
-        struct acpi_parse_obj_named         named;
-        struct acpi_parse_obj_asl           asl;
+struct acpi_parse_obj_asl {
+        ACPI_PARSE_COMMON union acpi_parse_object *child;
+        union acpi_parse_object *parent_method;
+        char *filename;
+        char *external_name;
+        char *namepath;
+        char name_seg[4];
+        u32 extra_value;
+        u32 column;
+        u32 line_number;
+        u32 logical_line_number;
+        u32 logical_byte_offset;
+        u32 end_line;
+        u32 end_logical_line;
+        u32 acpi_btype;
+        u32 aml_length;
+        u32 aml_subtree_length;
+        u32 final_aml_length;
+        u32 final_aml_offset;
+        u32 compile_flags;
+        u16 parse_opcode;
+        u8 aml_opcode_length;
+        u8 aml_pkg_len_bytes;
+        u8 extra;
+        char parse_op_name[12];
+};
+
+union acpi_parse_object {
+        struct acpi_parse_obj_common common;
+        struct acpi_parse_obj_named named;
+        struct acpi_parse_obj_asl asl;
 };
 
-
 /*
  * Parse state - one state per parser invocation and each control
  * method.
  */
-struct acpi_parse_state
-{
-        u32                                 aml_size;
-        u8                                  *aml_start;     /* First AML byte */
-        u8                                  *aml;           /* Next AML byte */
-        u8                                  *aml_end;       /* (last + 1) AML byte */
-        u8                                  *pkg_start;     /* Current package begin */
-        u8                                  *pkg_end;       /* Current package end */
-        union acpi_parse_object             *start_op;      /* Root of parse tree */
-        struct acpi_namespace_node          *start_node;
-        union acpi_generic_state            *scope;         /* Current scope */
-        union acpi_parse_object             *start_scope;
+struct acpi_parse_state {
+        u32 aml_size;
+        u8 *aml_start;          /* First AML byte */
+        u8 *aml;                /* Next AML byte */
+        u8 *aml_end;            /* (last + 1) AML byte */
+        u8 *pkg_start;          /* Current package begin */
+        u8 *pkg_end;            /* Current package end */
+        union acpi_parse_object *start_op;      /* Root of parse tree */
+        struct acpi_namespace_node *start_node;
+        union acpi_generic_state *scope;        /* Current scope */
+        union acpi_parse_object *start_scope;
 };
 
-
 /* Parse object flags */
 
 #define ACPI_PARSEOP_GENERIC                    0x01
@@ -734,7 +638,6 @@ struct acpi_parse_state
 #define ACPI_PARSEOP_EMPTY_TERMLIST             0x04
 #define ACPI_PARSEOP_SPECIAL                    0x10
 
-
 /*****************************************************************************
  *
  * Hardware (ACPI registers) and PNP
@@ -744,14 +647,12 @@ struct acpi_parse_state
 #define PCI_ROOT_HID_STRING         "PNP0A03"
 #define PCI_EXPRESS_ROOT_HID_STRING "PNP0A08"
 
-struct acpi_bit_register_info
-{
-        u8                                  parent_register;
-        u8                                  bit_position;
-        u16                                 access_bit_mask;
+struct acpi_bit_register_info {
+        u8 parent_register;
+        u8 bit_position;
+        u16 access_bit_mask;
 };
 
-
 /*
  * Register IDs
  * These are the full ACPI registers
@@ -766,7 +667,6 @@ struct acpi_bit_register_info
 #define ACPI_REGISTER_PROCESSOR_BLOCK           0x08
 #define ACPI_REGISTER_SMI_COMMAND_BLOCK         0x09
 
-
 /* Masks used to access the bit_registers */
 
 #define ACPI_BITMASK_TIMER_STATUS               0x0001
@@ -775,7 +675,7 @@ struct acpi_bit_register_info
 #define ACPI_BITMASK_POWER_BUTTON_STATUS        0x0100
 #define ACPI_BITMASK_SLEEP_BUTTON_STATUS        0x0200
 #define ACPI_BITMASK_RT_CLOCK_STATUS            0x0400
-#define ACPI_BITMASK_PCIEXP_WAKE_STATUS         0x4000    /* ACPI 3.0 */
+#define ACPI_BITMASK_PCIEXP_WAKE_STATUS         0x4000  /* ACPI 3.0 */
 #define ACPI_BITMASK_WAKE_STATUS                0x8000
 
 #define ACPI_BITMASK_ALL_FIXED_STATUS           (ACPI_BITMASK_TIMER_STATUS          | \
@@ -791,7 +691,7 @@ struct acpi_bit_register_info
 #define ACPI_BITMASK_POWER_BUTTON_ENABLE        0x0100
 #define ACPI_BITMASK_SLEEP_BUTTON_ENABLE        0x0200
 #define ACPI_BITMASK_RT_CLOCK_ENABLE            0x0400
-#define ACPI_BITMASK_PCIEXP_WAKE_DISABLE        0x4000    /* ACPI 3.0 */
+#define ACPI_BITMASK_PCIEXP_WAKE_DISABLE        0x4000  /* ACPI 3.0 */
 
 #define ACPI_BITMASK_SCI_ENABLE                 0x0001
 #define ACPI_BITMASK_BUS_MASTER_RLD             0x0002
@@ -801,7 +701,6 @@ struct acpi_bit_register_info
 
 #define ACPI_BITMASK_ARB_DISABLE                0x0001
 
-
 /* Raw bit position of each bit_register */
 
 #define ACPI_BITPOSITION_TIMER_STATUS           0x00
@@ -810,7 +709,7 @@ struct acpi_bit_register_info
 #define ACPI_BITPOSITION_POWER_BUTTON_STATUS    0x08
 #define ACPI_BITPOSITION_SLEEP_BUTTON_STATUS    0x09
 #define ACPI_BITPOSITION_RT_CLOCK_STATUS        0x0A
-#define ACPI_BITPOSITION_PCIEXP_WAKE_STATUS     0x0E    /* ACPI 3.0 */
+#define ACPI_BITPOSITION_PCIEXP_WAKE_STATUS     0x0E    /* ACPI 3.0 */
 #define ACPI_BITPOSITION_WAKE_STATUS            0x0F
 
 #define ACPI_BITPOSITION_TIMER_ENABLE           0x00
@@ -818,7 +717,7 @@ struct acpi_bit_register_info
 #define ACPI_BITPOSITION_POWER_BUTTON_ENABLE    0x08
 #define ACPI_BITPOSITION_SLEEP_BUTTON_ENABLE    0x09
 #define ACPI_BITPOSITION_RT_CLOCK_ENABLE        0x0A
-#define ACPI_BITPOSITION_PCIEXP_WAKE_DISABLE    0x0E    /* ACPI 3.0 */
+#define ACPI_BITPOSITION_PCIEXP_WAKE_DISABLE    0x0E    /* ACPI 3.0 */
 
 #define ACPI_BITPOSITION_SCI_ENABLE             0x00
 #define ACPI_BITPOSITION_BUS_MASTER_RLD         0x01
@@ -828,7 +727,6 @@ struct acpi_bit_register_info
 
 #define ACPI_BITPOSITION_ARB_DISABLE            0x00
 
-
 /*****************************************************************************
  *
  * Resource descriptors
@@ -847,8 +745,7 @@ struct acpi_bit_register_info
 #define ACPI_RDESC_TYPE_SMALL                   0x00
 
 #define ACPI_RDESC_TYPE_MASK                    0x80
-#define ACPI_RDESC_SMALL_MASK                   0x78 /* Only bits 6:3 contain the type */
-
+#define ACPI_RDESC_SMALL_MASK                   0x78    /* Only bits 6:3 contain the type */
 
 /*
  * Small resource descriptor types
@@ -877,7 +774,6 @@ struct acpi_bit_register_info
 #define ACPI_RDESC_TYPE_QWORD_ADDRESS_SPACE     0x8A
 #define ACPI_RDESC_TYPE_EXTENDED_ADDRESS_SPACE  0x8B
 
-
 /*****************************************************************************
  *
  * Miscellaneous
@@ -886,35 +782,30 @@ struct acpi_bit_register_info
 
 #define ACPI_ASCII_ZERO                      0x30
 
-
 /*****************************************************************************
  *
  * Debugger
  *
  ****************************************************************************/
 
-struct acpi_db_method_info
-{
-        acpi_handle                     thread_gate;
-        char                            *name;
-        char                            **args;
-        u32                             flags;
-        u32                             num_loops;
-        char                            pathname[128];
+struct acpi_db_method_info {
+        acpi_handle thread_gate;
+        char *name;
+        char **args;
+        u32 flags;
+        u32 num_loops;
+        char pathname[128];
 };
 
-struct acpi_integrity_info
-{
-        u32                         nodes;
-        u32                         objects;
+struct acpi_integrity_info {
+        u32 nodes;
+        u32 objects;
 };
 
-
 #define ACPI_DB_REDIRECTABLE_OUTPUT  0x01
 #define ACPI_DB_CONSOLE_OUTPUT       0x02
 #define ACPI_DB_DUPLICATE_OUTPUT     0x03
 
-
 /*****************************************************************************
  *
  * Debug
@@ -936,43 +827,36 @@ struct acpi_integrity_info
         char                                module[ACPI_MAX_MODULE_NAME]; \
         u8                                  alloc_type;
 
-struct acpi_debug_mem_header
-{
-        ACPI_COMMON_DEBUG_MEM_HEADER
-};
+struct acpi_debug_mem_header {
+ACPI_COMMON_DEBUG_MEM_HEADER};
 
-struct acpi_debug_mem_block
-{
-        ACPI_COMMON_DEBUG_MEM_HEADER
-        u64                                 user_space;
+struct acpi_debug_mem_block {
+        ACPI_COMMON_DEBUG_MEM_HEADER u64 user_space;
 };
 
-
 #define ACPI_MEM_LIST_GLOBAL            0
 #define ACPI_MEM_LIST_NSNODE            1
 #define ACPI_MEM_LIST_MAX               1
 #define ACPI_NUM_MEM_LISTS              2
 
-
-struct acpi_memory_list
-{
-        char                                *list_name;
-        void                                *list_head;
-        u16                                 object_size;
-        u16                                 max_depth;
-        u16                                 current_depth;
-        u16                                 link_offset;
+struct acpi_memory_list {
+        char *list_name;
+        void *list_head;
+        u16 object_size;
+        u16 max_depth;
+        u16 current_depth;
+        u16 link_offset;
 
 #ifdef ACPI_DBG_TRACK_ALLOCATIONS
 
         /* Statistics for debug memory tracking only */
 
-        u32                                 total_allocated;
-        u32                                 total_freed;
-        u32                                 current_total_size;
-        u32                                 requests;
-        u32                                 hits;
+        u32 total_allocated;
+        u32 total_freed;
+        u32 current_total_size;
+        u32 requests;
+        u32 hits;
 #endif
 };
 
-#endif /* __ACLOCAL_H__ */
+#endif                          /* __ACLOCAL_H__ */