diff options
Diffstat (limited to 'include/acpi/acstruct.h')
-rw-r--r-- | include/acpi/acstruct.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/include/acpi/acstruct.h b/include/acpi/acstruct.h index a907c67d651e..7980a26bad35 100644 --- a/include/acpi/acstruct.h +++ b/include/acpi/acstruct.h | |||
@@ -108,7 +108,6 @@ struct acpi_walk_state { | |||
108 | union acpi_operand_object **caller_return_desc; | 108 | union acpi_operand_object **caller_return_desc; |
109 | union acpi_generic_state *control_state; /* List of control states (nested IFs) */ | 109 | union acpi_generic_state *control_state; /* List of control states (nested IFs) */ |
110 | struct acpi_namespace_node *deferred_node; /* Used when executing deferred opcodes */ | 110 | struct acpi_namespace_node *deferred_node; /* Used when executing deferred opcodes */ |
111 | struct acpi_gpe_event_info *gpe_event_info; /* Info for GPE (_Lxx/_Exx methods only */ | ||
112 | union acpi_operand_object *implicit_return_obj; | 111 | union acpi_operand_object *implicit_return_obj; |
113 | struct acpi_namespace_node *method_call_node; /* Called method Node */ | 112 | struct acpi_namespace_node *method_call_node; /* Called method Node */ |
114 | union acpi_parse_object *method_call_op; /* method_call Op if running a method */ | 113 | union acpi_parse_object *method_call_op; /* method_call Op if running a method */ |
@@ -143,7 +142,7 @@ struct acpi_init_walk_info { | |||
143 | u16 package_init; | 142 | u16 package_init; |
144 | u16 object_count; | 143 | u16 object_count; |
145 | acpi_owner_id owner_id; | 144 | acpi_owner_id owner_id; |
146 | acpi_native_uint table_index; | 145 | u32 table_index; |
147 | }; | 146 | }; |
148 | 147 | ||
149 | struct acpi_get_devices_info { | 148 | struct acpi_get_devices_info { |
@@ -189,17 +188,12 @@ struct acpi_evaluate_info { | |||
189 | union acpi_operand_object **parameters; | 188 | union acpi_operand_object **parameters; |
190 | struct acpi_namespace_node *resolved_node; | 189 | struct acpi_namespace_node *resolved_node; |
191 | union acpi_operand_object *return_object; | 190 | union acpi_operand_object *return_object; |
191 | u8 param_count; | ||
192 | u8 pass_number; | 192 | u8 pass_number; |
193 | u8 parameter_type; | ||
194 | u8 return_object_type; | 193 | u8 return_object_type; |
195 | u8 flags; | 194 | u8 flags; |
196 | }; | 195 | }; |
197 | 196 | ||
198 | /* Types for parameter_type above */ | ||
199 | |||
200 | #define ACPI_PARAM_ARGS 0 | ||
201 | #define ACPI_PARAM_GPE 1 | ||
202 | |||
203 | /* Values for Flags above */ | 197 | /* Values for Flags above */ |
204 | 198 | ||
205 | #define ACPI_IGNORE_RETURN_VALUE 1 | 199 | #define ACPI_IGNORE_RETURN_VALUE 1 |