aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/acpi/asus_acpi.c2
-rw-r--r--drivers/acpi/bus.c2
-rw-r--r--drivers/acpi/dispatcher/dsfield.c12
-rw-r--r--drivers/acpi/dispatcher/dsinit.c6
-rw-r--r--drivers/acpi/dispatcher/dsmethod.c180
-rw-r--r--drivers/acpi/dispatcher/dsmthdat.c22
-rw-r--r--drivers/acpi/dispatcher/dsobject.c10
-rw-r--r--drivers/acpi/dispatcher/dsopcode.c59
-rw-r--r--drivers/acpi/dispatcher/dsutils.c16
-rw-r--r--drivers/acpi/dispatcher/dswexec.c20
-rw-r--r--drivers/acpi/dispatcher/dswload.c16
-rw-r--r--drivers/acpi/dispatcher/dswscope.c6
-rw-r--r--drivers/acpi/dispatcher/dswstate.c42
-rw-r--r--drivers/acpi/events/evevent.c8
-rw-r--r--drivers/acpi/events/evgpe.c18
-rw-r--r--drivers/acpi/events/evgpeblk.c42
-rw-r--r--drivers/acpi/events/evmisc.c12
-rw-r--r--drivers/acpi/events/evregion.c18
-rw-r--r--drivers/acpi/events/evrgnini.c18
-rw-r--r--drivers/acpi/events/evsci.c8
-rw-r--r--drivers/acpi/events/evxface.c14
-rw-r--r--drivers/acpi/events/evxfevnt.c26
-rw-r--r--drivers/acpi/events/evxfregn.c6
-rw-r--r--drivers/acpi/executer/exconfig.c18
-rw-r--r--drivers/acpi/executer/exconvrt.c10
-rw-r--r--drivers/acpi/executer/excreate.c18
-rw-r--r--drivers/acpi/executer/exdump.c24
-rw-r--r--drivers/acpi/executer/exfield.c12
-rw-r--r--drivers/acpi/executer/exfldio.c30
-rw-r--r--drivers/acpi/executer/exmisc.c10
-rw-r--r--drivers/acpi/executer/exmutex.c12
-rw-r--r--drivers/acpi/executer/exnames.c16
-rw-r--r--drivers/acpi/executer/exoparg1.c12
-rw-r--r--drivers/acpi/executer/exoparg2.c10
-rw-r--r--drivers/acpi/executer/exoparg3.c6
-rw-r--r--drivers/acpi/executer/exoparg6.c2
-rw-r--r--drivers/acpi/executer/exprep.c40
-rw-r--r--drivers/acpi/executer/exregion.c14
-rw-r--r--drivers/acpi/executer/exresnte.c6
-rw-r--r--drivers/acpi/executer/exresolv.c14
-rw-r--r--drivers/acpi/executer/exresop.c8
-rw-r--r--drivers/acpi/executer/exstore.c13
-rw-r--r--drivers/acpi/executer/exstoren.c4
-rw-r--r--drivers/acpi/executer/exstorob.c4
-rw-r--r--drivers/acpi/executer/exsystem.c10
-rw-r--r--drivers/acpi/executer/exutils.c10
-rw-r--r--drivers/acpi/hardware/hwacpi.c6
-rw-r--r--drivers/acpi/hardware/hwgpe.c6
-rw-r--r--drivers/acpi/hardware/hwregs.c24
-rw-r--r--drivers/acpi/hardware/hwsleep.c12
-rw-r--r--drivers/acpi/hardware/hwtimer.c6
-rw-r--r--drivers/acpi/namespace/nsaccess.c6
-rw-r--r--drivers/acpi/namespace/nsalloc.c12
-rw-r--r--drivers/acpi/namespace/nsdump.c8
-rw-r--r--drivers/acpi/namespace/nsdumpdv.c4
-rw-r--r--drivers/acpi/namespace/nseval.c10
-rw-r--r--drivers/acpi/namespace/nsinit.c265
-rw-r--r--drivers/acpi/namespace/nsload.c24
-rw-r--r--drivers/acpi/namespace/nsnames.c4
-rw-r--r--drivers/acpi/namespace/nsobject.c12
-rw-r--r--drivers/acpi/namespace/nsparse.c4
-rw-r--r--drivers/acpi/namespace/nssearch.c8
-rw-r--r--drivers/acpi/namespace/nsutils.c18
-rw-r--r--drivers/acpi/namespace/nswalk.c2
-rw-r--r--drivers/acpi/namespace/nsxfeval.c8
-rw-r--r--drivers/acpi/osl.c63
-rw-r--r--drivers/acpi/parser/psargs.c18
-rw-r--r--drivers/acpi/parser/psloop.c6
-rw-r--r--drivers/acpi/parser/psopcode.c4
-rw-r--r--drivers/acpi/parser/psparse.c28
-rw-r--r--drivers/acpi/parser/psscope.c8
-rw-r--r--drivers/acpi/parser/psutils.c2
-rw-r--r--drivers/acpi/parser/pswalk.c2
-rw-r--r--drivers/acpi/parser/psxface.c7
-rw-r--r--drivers/acpi/resources/rscalc.c8
-rw-r--r--drivers/acpi/resources/rscreate.c24
-rw-r--r--drivers/acpi/resources/rsdump.c42
-rw-r--r--drivers/acpi/resources/rslist.c6
-rw-r--r--drivers/acpi/resources/rsmisc.c4
-rw-r--r--drivers/acpi/resources/rsutils.c10
-rw-r--r--drivers/acpi/resources/rsxface.c14
-rw-r--r--drivers/acpi/system.c4
-rw-r--r--drivers/acpi/tables/tbconvrt.c6
-rw-r--r--drivers/acpi/tables/tbget.c16
-rw-r--r--drivers/acpi/tables/tbgetall.c10
-rw-r--r--drivers/acpi/tables/tbinstal.c41
-rw-r--r--drivers/acpi/tables/tbrsdt.c25
-rw-r--r--drivers/acpi/tables/tbutils.c10
-rw-r--r--drivers/acpi/tables/tbxface.c24
-rw-r--r--drivers/acpi/tables/tbxfroot.c24
-rw-r--r--drivers/acpi/utilities/utalloc.c4
-rw-r--r--drivers/acpi/utilities/utcache.c2
-rw-r--r--drivers/acpi/utilities/utcopy.c16
-rw-r--r--drivers/acpi/utilities/utdelete.c12
-rw-r--r--drivers/acpi/utilities/uteval.c88
-rw-r--r--drivers/acpi/utilities/utglobal.c38
-rw-r--r--drivers/acpi/utilities/utinit.c4
-rw-r--r--drivers/acpi/utilities/utmath.c8
-rw-r--r--drivers/acpi/utilities/utmisc.c16
-rw-r--r--drivers/acpi/utilities/utmutex.c12
-rw-r--r--drivers/acpi/utilities/utobject.c16
-rw-r--r--drivers/acpi/utilities/utresrc.c106
-rw-r--r--drivers/acpi/utilities/utstate.c14
-rw-r--r--drivers/acpi/utilities/utxface.c20
104 files changed, 1144 insertions, 923 deletions
diff --git a/drivers/acpi/asus_acpi.c b/drivers/acpi/asus_acpi.c
index f4c87750dbf2..216c072dee5e 100644
--- a/drivers/acpi/asus_acpi.c
+++ b/drivers/acpi/asus_acpi.c
@@ -970,7 +970,7 @@ static int __init asus_hotk_get_info(void)
970 * HID), this bit will be moved. A global variable asus_info contains 970 * HID), this bit will be moved. A global variable asus_info contains
971 * the DSDT header. 971 * the DSDT header.
972 */ 972 */
973 status = acpi_get_table(ACPI_TABLE_DSDT, 1, &dsdt); 973 status = acpi_get_table(ACPI_TABLE_ID_DSDT, 1, &dsdt);
974 if (ACPI_FAILURE(status)) 974 if (ACPI_FAILURE(status))
975 printk(KERN_WARNING " Couldn't get the DSDT table header\n"); 975 printk(KERN_WARNING " Couldn't get the DSDT table header\n");
976 else 976 else
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index b3a214db56f6..b77f03d51f0b 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -619,7 +619,7 @@ void __init acpi_early_init(void)
619 /* 619 /*
620 * Get a separate copy of the FADT for use by other drivers. 620 * Get a separate copy of the FADT for use by other drivers.
621 */ 621 */
622 status = acpi_get_table(ACPI_TABLE_FADT, 1, &buffer); 622 status = acpi_get_table(ACPI_TABLE_ID_FADT, 1, &buffer);
623 if (ACPI_FAILURE(status)) { 623 if (ACPI_FAILURE(status)) {
624 printk(KERN_ERR PREFIX "Unable to get the FADT\n"); 624 printk(KERN_ERR PREFIX "Unable to get the FADT\n");
625 goto error0; 625 goto error0;
diff --git a/drivers/acpi/dispatcher/dsfield.c b/drivers/acpi/dispatcher/dsfield.c
index 3d33bcc98678..a6d77efb41a0 100644
--- a/drivers/acpi/dispatcher/dsfield.c
+++ b/drivers/acpi/dispatcher/dsfield.c
@@ -87,7 +87,7 @@ acpi_ds_create_buffer_field(union acpi_parse_object *op,
87 union acpi_operand_object *second_desc = NULL; 87 union acpi_operand_object *second_desc = NULL;
88 u32 flags; 88 u32 flags;
89 89
90 ACPI_FUNCTION_TRACE("ds_create_buffer_field"); 90 ACPI_FUNCTION_TRACE(ds_create_buffer_field);
91 91
92 /* Get the name_string argument */ 92 /* Get the name_string argument */
93 93
@@ -210,7 +210,7 @@ acpi_ds_get_field_names(struct acpi_create_field_info *info,
210 acpi_status status; 210 acpi_status status;
211 acpi_integer position; 211 acpi_integer position;
212 212
213 ACPI_FUNCTION_TRACE_PTR("ds_get_field_names", info); 213 ACPI_FUNCTION_TRACE_PTR(ds_get_field_names, info);
214 214
215 /* First field starts at bit zero */ 215 /* First field starts at bit zero */
216 216
@@ -342,7 +342,7 @@ acpi_ds_create_field(union acpi_parse_object *op,
342 union acpi_parse_object *arg; 342 union acpi_parse_object *arg;
343 struct acpi_create_field_info info; 343 struct acpi_create_field_info info;
344 344
345 ACPI_FUNCTION_TRACE_PTR("ds_create_field", op); 345 ACPI_FUNCTION_TRACE_PTR(ds_create_field, op);
346 346
347 /* First arg is the name of the parent op_region (must already exist) */ 347 /* First arg is the name of the parent op_region (must already exist) */
348 348
@@ -399,7 +399,7 @@ acpi_ds_init_field_objects(union acpi_parse_object *op,
399 struct acpi_namespace_node *node; 399 struct acpi_namespace_node *node;
400 u8 type = 0; 400 u8 type = 0;
401 401
402 ACPI_FUNCTION_TRACE_PTR("ds_init_field_objects", op); 402 ACPI_FUNCTION_TRACE_PTR(ds_init_field_objects, op);
403 403
404 switch (walk_state->opcode) { 404 switch (walk_state->opcode) {
405 case AML_FIELD_OP: 405 case AML_FIELD_OP:
@@ -482,7 +482,7 @@ acpi_ds_create_bank_field(union acpi_parse_object *op,
482 union acpi_parse_object *arg; 482 union acpi_parse_object *arg;
483 struct acpi_create_field_info info; 483 struct acpi_create_field_info info;
484 484
485 ACPI_FUNCTION_TRACE_PTR("ds_create_bank_field", op); 485 ACPI_FUNCTION_TRACE_PTR(ds_create_bank_field, op);
486 486
487 /* First arg is the name of the parent op_region (must already exist) */ 487 /* First arg is the name of the parent op_region (must already exist) */
488 488
@@ -555,7 +555,7 @@ acpi_ds_create_index_field(union acpi_parse_object *op,
555 union acpi_parse_object *arg; 555 union acpi_parse_object *arg;
556 struct acpi_create_field_info info; 556 struct acpi_create_field_info info;
557 557
558 ACPI_FUNCTION_TRACE_PTR("ds_create_index_field", op); 558 ACPI_FUNCTION_TRACE_PTR(ds_create_index_field, op);
559 559
560 /* First arg is the name of the Index register (must already exist) */ 560 /* First arg is the name of the Index register (must already exist) */
561 561
diff --git a/drivers/acpi/dispatcher/dsinit.c b/drivers/acpi/dispatcher/dsinit.c
index e65a07ad2422..bbdf990e9f65 100644
--- a/drivers/acpi/dispatcher/dsinit.c
+++ b/drivers/acpi/dispatcher/dsinit.c
@@ -184,7 +184,7 @@ acpi_ds_init_one_object(acpi_handle obj_handle,
184 * 184 *
185 * RETURN: Status 185 * RETURN: Status
186 * 186 *
187 * DESCRIPTION: Walk the namespace starting at "start_node" and perform any 187 * DESCRIPTION: Walk the namespace starting at "StartNode" and perform any
188 * necessary initialization on the objects found therein 188 * necessary initialization on the objects found therein
189 * 189 *
190 ******************************************************************************/ 190 ******************************************************************************/
@@ -196,7 +196,7 @@ acpi_ds_initialize_objects(struct acpi_table_desc * table_desc,
196 acpi_status status; 196 acpi_status status;
197 struct acpi_init_walk_info info; 197 struct acpi_init_walk_info info;
198 198
199 ACPI_FUNCTION_TRACE("ds_initialize_objects"); 199 ACPI_FUNCTION_TRACE(ds_initialize_objects);
200 200
201 ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH, 201 ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,
202 "**** Starting initialization of namespace objects ****\n")); 202 "**** Starting initialization of namespace objects ****\n"));
@@ -213,7 +213,7 @@ acpi_ds_initialize_objects(struct acpi_table_desc * table_desc,
213 status = acpi_walk_namespace(ACPI_TYPE_ANY, start_node, ACPI_UINT32_MAX, 213 status = acpi_walk_namespace(ACPI_TYPE_ANY, start_node, ACPI_UINT32_MAX,
214 acpi_ds_init_one_object, &info, NULL); 214 acpi_ds_init_one_object, &info, NULL);
215 if (ACPI_FAILURE(status)) { 215 if (ACPI_FAILURE(status)) {
216 ACPI_EXCEPTION((AE_INFO, status, "During walk_namespace")); 216 ACPI_EXCEPTION((AE_INFO, status, "During WalkNamespace"));
217 } 217 }
218 218
219 ACPI_DEBUG_PRINT_RAW((ACPI_DB_INIT, 219 ACPI_DEBUG_PRINT_RAW((ACPI_DB_INIT,
diff --git a/drivers/acpi/dispatcher/dsmethod.c b/drivers/acpi/dispatcher/dsmethod.c
index 7dc59fc7344f..651f2b68531b 100644
--- a/drivers/acpi/dispatcher/dsmethod.c
+++ b/drivers/acpi/dispatcher/dsmethod.c
@@ -134,7 +134,7 @@ acpi_ds_begin_method_execution(struct acpi_namespace_node * method_node,
134{ 134{
135 acpi_status status = AE_OK; 135 acpi_status status = AE_OK;
136 136
137 ACPI_FUNCTION_TRACE_PTR("ds_begin_method_execution", method_node); 137 ACPI_FUNCTION_TRACE_PTR(ds_begin_method_execution, method_node);
138 138
139 if (!method_node) { 139 if (!method_node) {
140 return_ACPI_STATUS(AE_NULL_ENTRY); 140 return_ACPI_STATUS(AE_NULL_ENTRY);
@@ -170,11 +170,14 @@ acpi_ds_begin_method_execution(struct acpi_namespace_node * method_node,
170 170
171 /* 171 /*
172 * Get a unit from the method semaphore. This releases the 172 * Get a unit from the method semaphore. This releases the
173 * interpreter if we block 173 * interpreter if we block (then reacquires it)
174 */ 174 */
175 status = 175 status =
176 acpi_ex_system_wait_semaphore(obj_desc->method.semaphore, 176 acpi_ex_system_wait_semaphore(obj_desc->method.semaphore,
177 ACPI_WAIT_FOREVER); 177 ACPI_WAIT_FOREVER);
178 if (ACPI_FAILURE(status)) {
179 return_ACPI_STATUS(status);
180 }
178 } 181 }
179 182
180 /* 183 /*
@@ -185,7 +188,7 @@ acpi_ds_begin_method_execution(struct acpi_namespace_node * method_node,
185 if (!obj_desc->method.owner_id) { 188 if (!obj_desc->method.owner_id) {
186 status = acpi_ut_allocate_owner_id(&obj_desc->method.owner_id); 189 status = acpi_ut_allocate_owner_id(&obj_desc->method.owner_id);
187 if (ACPI_FAILURE(status)) { 190 if (ACPI_FAILURE(status)) {
188 return_ACPI_STATUS(status); 191 goto cleanup;
189 } 192 }
190 } 193 }
191 194
@@ -195,6 +198,14 @@ acpi_ds_begin_method_execution(struct acpi_namespace_node * method_node,
195 */ 198 */
196 obj_desc->method.thread_count++; 199 obj_desc->method.thread_count++;
197 return_ACPI_STATUS(status); 200 return_ACPI_STATUS(status);
201
202 cleanup:
203 /* On error, must signal the method semaphore if present */
204
205 if (obj_desc->method.semaphore) {
206 (void)acpi_os_signal_semaphore(obj_desc->method.semaphore, 1);
207 }
208 return_ACPI_STATUS(status);
198} 209}
199 210
200/******************************************************************************* 211/*******************************************************************************
@@ -223,7 +234,7 @@ acpi_ds_call_control_method(struct acpi_thread_state *thread,
223 struct acpi_parameter_info info; 234 struct acpi_parameter_info info;
224 u32 i; 235 u32 i;
225 236
226 ACPI_FUNCTION_TRACE_PTR("ds_call_control_method", this_walk_state); 237 ACPI_FUNCTION_TRACE_PTR(ds_call_control_method, this_walk_state);
227 238
228 ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH, 239 ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,
229 "Execute method %p, currentstate=%p\n", 240 "Execute method %p, currentstate=%p\n",
@@ -242,26 +253,31 @@ acpi_ds_call_control_method(struct acpi_thread_state *thread,
242 return_ACPI_STATUS(AE_NULL_OBJECT); 253 return_ACPI_STATUS(AE_NULL_OBJECT);
243 } 254 }
244 255
245 /* Init for new method, wait on concurrency semaphore */ 256 /* Init for new method, possibly wait on concurrency semaphore */
246 257
247 status = acpi_ds_begin_method_execution(method_node, obj_desc, 258 status = acpi_ds_begin_method_execution(method_node, obj_desc,
248 this_walk_state->method_node); 259 this_walk_state->method_node);
249 if (ACPI_FAILURE(status)) { 260 if (ACPI_FAILURE(status)) {
250 goto cleanup; 261 return_ACPI_STATUS(status);
251 } 262 }
252 263
264 /*
265 * 1) Parse the method. All "normal" methods are parsed for each execution.
266 * Internal methods (_OSI, etc.) do not require parsing.
267 */
253 if (!(obj_desc->method.method_flags & AML_METHOD_INTERNAL_ONLY)) { 268 if (!(obj_desc->method.method_flags & AML_METHOD_INTERNAL_ONLY)) {
254 269
255 /* 1) Parse: Create a new walk state for the preempting walk */ 270 /* Create a new walk state for the parse */
256 271
257 next_walk_state = 272 next_walk_state =
258 acpi_ds_create_walk_state(obj_desc->method.owner_id, op, 273 acpi_ds_create_walk_state(obj_desc->method.owner_id, op,
259 obj_desc, NULL); 274 obj_desc, NULL);
260 if (!next_walk_state) { 275 if (!next_walk_state) {
261 return_ACPI_STATUS(AE_NO_MEMORY); 276 status = AE_NO_MEMORY;
277 goto cleanup;
262 } 278 }
263 279
264 /* Create and init a Root Node */ 280 /* Create and init a parse tree root */
265 281
266 op = acpi_ps_create_scope_op(); 282 op = acpi_ps_create_scope_op();
267 if (!op) { 283 if (!op) {
@@ -274,17 +290,20 @@ acpi_ds_call_control_method(struct acpi_thread_state *thread,
274 obj_desc->method.aml_length, 290 obj_desc->method.aml_length,
275 NULL, 1); 291 NULL, 1);
276 if (ACPI_FAILURE(status)) { 292 if (ACPI_FAILURE(status)) {
277 acpi_ds_delete_walk_state(next_walk_state); 293 acpi_ps_delete_parse_tree(op);
278 goto cleanup; 294 goto cleanup;
279 } 295 }
280 296
281 /* Begin AML parse */ 297 /* Begin AML parse (deletes next_walk_state) */
282 298
283 status = acpi_ps_parse_aml(next_walk_state); 299 status = acpi_ps_parse_aml(next_walk_state);
284 acpi_ps_delete_parse_tree(op); 300 acpi_ps_delete_parse_tree(op);
301 if (ACPI_FAILURE(status)) {
302 goto cleanup;
303 }
285 } 304 }
286 305
287 /* 2) Execute: Create a new state for the preempting walk */ 306 /* 2) Begin method execution. Create a new walk state */
288 307
289 next_walk_state = acpi_ds_create_walk_state(obj_desc->method.owner_id, 308 next_walk_state = acpi_ds_create_walk_state(obj_desc->method.owner_id,
290 NULL, obj_desc, thread); 309 NULL, obj_desc, thread);
@@ -292,6 +311,7 @@ acpi_ds_call_control_method(struct acpi_thread_state *thread,
292 status = AE_NO_MEMORY; 311 status = AE_NO_MEMORY;
293 goto cleanup; 312 goto cleanup;
294 } 313 }
314
295 /* 315 /*
296 * The resolved arguments were put on the previous walk state's operand 316 * The resolved arguments were put on the previous walk state's operand
297 * stack. Operands on the previous walk state stack always 317 * stack. Operands on the previous walk state stack always
@@ -326,6 +346,8 @@ acpi_ds_call_control_method(struct acpi_thread_state *thread,
326 "Starting nested execution, newstate=%p\n", 346 "Starting nested execution, newstate=%p\n",
327 next_walk_state)); 347 next_walk_state));
328 348
349 /* Invoke an internal method if necessary */
350
329 if (obj_desc->method.method_flags & AML_METHOD_INTERNAL_ONLY) { 351 if (obj_desc->method.method_flags & AML_METHOD_INTERNAL_ONLY) {
330 status = obj_desc->method.implementation(next_walk_state); 352 status = obj_desc->method.implementation(next_walk_state);
331 } 353 }
@@ -333,16 +355,14 @@ acpi_ds_call_control_method(struct acpi_thread_state *thread,
333 return_ACPI_STATUS(status); 355 return_ACPI_STATUS(status);
334 356
335 cleanup: 357 cleanup:
336 /* Decrement the thread count on the method parse tree */
337 358
338 if (next_walk_state && (next_walk_state->method_desc)) { 359 /* On error, we must terminate the method properly */
339 next_walk_state->method_desc->method.thread_count--;
340 }
341 360
342 /* On error, we must delete the new walk state */ 361 acpi_ds_terminate_control_method(obj_desc, next_walk_state);
362 if (next_walk_state) {
363 acpi_ds_delete_walk_state(next_walk_state);
364 }
343 365
344 acpi_ds_terminate_control_method(next_walk_state);
345 acpi_ds_delete_walk_state(next_walk_state);
346 return_ACPI_STATUS(status); 366 return_ACPI_STATUS(status);
347} 367}
348 368
@@ -366,15 +386,15 @@ acpi_ds_restart_control_method(struct acpi_walk_state *walk_state,
366{ 386{
367 acpi_status status; 387 acpi_status status;
368 388
369 ACPI_FUNCTION_TRACE_PTR("ds_restart_control_method", walk_state); 389 ACPI_FUNCTION_TRACE_PTR(ds_restart_control_method, walk_state);
370 390
371 ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH, 391 ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,
372 "****Restart [%4.4s] Op %p return_value_from_callee %p\n", 392 "****Restart [%4.4s] Op %p ReturnValueFromCallee %p\n",
373 (char *)&walk_state->method_node->name, 393 (char *)&walk_state->method_node->name,
374 walk_state->method_call_op, return_desc)); 394 walk_state->method_call_op, return_desc));
375 395
376 ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH, 396 ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,
377 " return_from_this_method_used?=%X res_stack %p Walk %p\n", 397 " ReturnFromThisMethodUsed?=%X ResStack %p Walk %p\n",
378 walk_state->return_used, 398 walk_state->return_used,
379 walk_state->results, walk_state)); 399 walk_state->results, walk_state));
380 400
@@ -426,7 +446,8 @@ acpi_ds_restart_control_method(struct acpi_walk_state *walk_state,
426 * 446 *
427 * FUNCTION: acpi_ds_terminate_control_method 447 * FUNCTION: acpi_ds_terminate_control_method
428 * 448 *
429 * PARAMETERS: walk_state - State of the method 449 * PARAMETERS: method_desc - Method object
450 * walk_state - State associated with the method
430 * 451 *
431 * RETURN: None 452 * RETURN: None
432 * 453 *
@@ -436,28 +457,27 @@ acpi_ds_restart_control_method(struct acpi_walk_state *walk_state,
436 * 457 *
437 ******************************************************************************/ 458 ******************************************************************************/
438 459
439void acpi_ds_terminate_control_method(struct acpi_walk_state *walk_state) 460void
461acpi_ds_terminate_control_method(union acpi_operand_object *method_desc,
462 struct acpi_walk_state *walk_state)
440{ 463{
441 union acpi_operand_object *obj_desc;
442 struct acpi_namespace_node *method_node; 464 struct acpi_namespace_node *method_node;
443 acpi_status status; 465 acpi_status status;
444 466
445 ACPI_FUNCTION_TRACE_PTR("ds_terminate_control_method", walk_state); 467 ACPI_FUNCTION_TRACE_PTR(ds_terminate_control_method, walk_state);
446
447 if (!walk_state) {
448 return_VOID;
449 }
450 468
451 /* The current method object was saved in the walk state */ 469 /* method_desc is required, walk_state is optional */
452 470
453 obj_desc = walk_state->method_desc; 471 if (!method_desc) {
454 if (!obj_desc) {
455 return_VOID; 472 return_VOID;
456 } 473 }
457 474
458 /* Delete all arguments and locals */ 475 if (walk_state) {
459 476
460 acpi_ds_method_data_delete_all(walk_state); 477 /* Delete all arguments and locals */
478
479 acpi_ds_method_data_delete_all(walk_state);
480 }
461 481
462 /* 482 /*
463 * Lock the parser while we terminate this method. 483 * Lock the parser while we terminate this method.
@@ -471,60 +491,66 @@ void acpi_ds_terminate_control_method(struct acpi_walk_state *walk_state)
471 491
472 /* Signal completion of the execution of this method if necessary */ 492 /* Signal completion of the execution of this method if necessary */
473 493
474 if (walk_state->method_desc->method.semaphore) { 494 if (method_desc->method.semaphore) {
475 status = 495 status =
476 acpi_os_signal_semaphore(walk_state->method_desc->method. 496 acpi_os_signal_semaphore(method_desc->method.semaphore, 1);
477 semaphore, 1);
478 if (ACPI_FAILURE(status)) { 497 if (ACPI_FAILURE(status)) {
479 ACPI_ERROR((AE_INFO,
480 "Could not signal method semaphore"));
481 498
482 /* Ignore error and continue cleanup */ 499 /* Ignore error and continue */
500
501 ACPI_EXCEPTION((AE_INFO, status,
502 "Could not signal method semaphore"));
483 } 503 }
484 } 504 }
485 505
486 /* 506 if (walk_state) {
487 * There are no more threads executing this method. Perform 507 /*
488 * additional cleanup. 508 * Delete any objects created by this method during execution.
489 * 509 * The method Node is stored in the walk state
490 * The method Node is stored in the walk state 510 */
491 */ 511 method_node = walk_state->method_node;
492 method_node = walk_state->method_node;
493 512
494 /* Lock namespace for possible update */ 513 /* Lock namespace for possible update */
495 514
496 status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE); 515 status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
497 if (ACPI_FAILURE(status)) { 516 if (ACPI_FAILURE(status)) {
498 goto exit; 517 goto exit;
499 } 518 }
500 519
501 /* 520 /*
502 * Delete any namespace entries created immediately underneath 521 * Delete any namespace entries created immediately underneath
503 * the method 522 * the method
504 */ 523 */
505 if (method_node && method_node->child) { 524 if (method_node && method_node->child) {
506 acpi_ns_delete_namespace_subtree(method_node); 525 acpi_ns_delete_namespace_subtree(method_node);
526 }
527
528 /*
529 * Delete any namespace entries created anywhere else within
530 * the namespace by the execution of this method
531 */
532 acpi_ns_delete_namespace_by_owner(method_desc->method.owner_id);
533 status = acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
507 } 534 }
508 535
509 /* 536 /* Decrement the thread count on the method */
510 * Delete any namespace entries created anywhere else within 537
511 * the namespace by the execution of this method 538 if (method_desc->method.thread_count) {
512 */ 539 method_desc->method.thread_count--;
513 acpi_ns_delete_namespace_by_owner(walk_state->method_desc->method. 540 } else {
514 owner_id); 541 ACPI_ERROR((AE_INFO, "Invalid zero thread count in method"));
515 status = acpi_ut_release_mutex(ACPI_MTX_NAMESPACE); 542 }
516 543
517 /* Are there any other threads currently executing this method? */ 544 /* Are there any other threads currently executing this method? */
518 545
519 if (walk_state->method_desc->method.thread_count) { 546 if (method_desc->method.thread_count) {
520 /* 547 /*
521 * Additional threads. Do not release the owner_id in this case, 548 * Additional threads. Do not release the owner_id in this case,
522 * we immediately reuse it for the next thread executing this method 549 * we immediately reuse it for the next thread executing this method
523 */ 550 */
524 ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH, 551 ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,
525 "*** Completed execution of one thread, %d threads remaining\n", 552 "*** Completed execution of one thread, %d threads remaining\n",
526 walk_state->method_desc->method. 553 method_desc->method.thread_count));
527 thread_count));
528 } else { 554 } else {
529 /* This is the only executing thread for this method */ 555 /* This is the only executing thread for this method */
530 556
@@ -538,18 +564,16 @@ void acpi_ds_terminate_control_method(struct acpi_walk_state *walk_state)
538 * This code is here because we must wait until the last thread exits 564 * This code is here because we must wait until the last thread exits
539 * before creating the synchronization semaphore. 565 * before creating the synchronization semaphore.
540 */ 566 */
541 if ((walk_state->method_desc->method.concurrency == 1) && 567 if ((method_desc->method.concurrency == 1) &&
542 (!walk_state->method_desc->method.semaphore)) { 568 (!method_desc->method.semaphore)) {
543 status = acpi_os_create_semaphore(1, 1, 569 status = acpi_os_create_semaphore(1, 1,
544 &walk_state-> 570 &method_desc->method.
545 method_desc->method.
546 semaphore); 571 semaphore);
547 } 572 }
548 573
549 /* No more threads, we can free the owner_id */ 574 /* No more threads, we can free the owner_id */
550 575
551 acpi_ut_release_owner_id(&walk_state->method_desc->method. 576 acpi_ut_release_owner_id(&method_desc->method.owner_id);
552 owner_id);
553 } 577 }
554 578
555 exit: 579 exit:
@@ -586,7 +610,7 @@ acpi_status acpi_ds_parse_method(struct acpi_namespace_node *node)
586 union acpi_parse_object *op; 610 union acpi_parse_object *op;
587 struct acpi_walk_state *walk_state; 611 struct acpi_walk_state *walk_state;
588 612
589 ACPI_FUNCTION_TRACE_PTR("ds_parse_method", node); 613 ACPI_FUNCTION_TRACE_PTR(ds_parse_method, node);
590 614
591 /* Parameter Validation */ 615 /* Parameter Validation */
592 616
@@ -595,7 +619,7 @@ acpi_status acpi_ds_parse_method(struct acpi_namespace_node *node)
595 } 619 }
596 620
597 ACPI_DEBUG_PRINT((ACPI_DB_PARSE, 621 ACPI_DEBUG_PRINT((ACPI_DB_PARSE,
598 "**** Parsing [%4.4s] **** named_obj=%p\n", 622 "**** Parsing [%4.4s] **** NamedObj=%p\n",
599 acpi_ut_get_node_name(node), node)); 623 acpi_ut_get_node_name(node), node));
600 624
601 /* Extract the method object from the method Node */ 625 /* Extract the method object from the method Node */
@@ -674,7 +698,7 @@ acpi_status acpi_ds_parse_method(struct acpi_namespace_node *node)
674 } 698 }
675 699
676 ACPI_DEBUG_PRINT((ACPI_DB_PARSE, 700 ACPI_DEBUG_PRINT((ACPI_DB_PARSE,
677 "**** [%4.4s] Parsed **** named_obj=%p Op=%p\n", 701 "**** [%4.4s] Parsed **** NamedObj=%p Op=%p\n",
678 acpi_ut_get_node_name(node), node, op)); 702 acpi_ut_get_node_name(node), node, op));
679 703
680 /* 704 /*
diff --git a/drivers/acpi/dispatcher/dsmthdat.c b/drivers/acpi/dispatcher/dsmthdat.c
index ce4de18f1229..b47c54fad86d 100644
--- a/drivers/acpi/dispatcher/dsmthdat.c
+++ b/drivers/acpi/dispatcher/dsmthdat.c
@@ -92,7 +92,7 @@ void acpi_ds_method_data_init(struct acpi_walk_state *walk_state)
92{ 92{
93 u32 i; 93 u32 i;
94 94
95 ACPI_FUNCTION_TRACE("ds_method_data_init"); 95 ACPI_FUNCTION_TRACE(ds_method_data_init);
96 96
97 /* Init the method arguments */ 97 /* Init the method arguments */
98 98
@@ -140,7 +140,7 @@ void acpi_ds_method_data_delete_all(struct acpi_walk_state *walk_state)
140{ 140{
141 u32 index; 141 u32 index;
142 142
143 ACPI_FUNCTION_TRACE("ds_method_data_delete_all"); 143 ACPI_FUNCTION_TRACE(ds_method_data_delete_all);
144 144
145 /* Detach the locals */ 145 /* Detach the locals */
146 146
@@ -199,7 +199,7 @@ acpi_ds_method_data_init_args(union acpi_operand_object **params,
199 acpi_status status; 199 acpi_status status;
200 u32 index = 0; 200 u32 index = 0;
201 201
202 ACPI_FUNCTION_TRACE_PTR("ds_method_data_init_args", params); 202 ACPI_FUNCTION_TRACE_PTR(ds_method_data_init_args, params);
203 203
204 if (!params) { 204 if (!params) {
205 ACPI_DEBUG_PRINT((ACPI_DB_EXEC, 205 ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
@@ -251,7 +251,7 @@ acpi_ds_method_data_get_node(u16 opcode,
251 struct acpi_walk_state *walk_state, 251 struct acpi_walk_state *walk_state,
252 struct acpi_namespace_node **node) 252 struct acpi_namespace_node **node)
253{ 253{
254 ACPI_FUNCTION_TRACE("ds_method_data_get_node"); 254 ACPI_FUNCTION_TRACE(ds_method_data_get_node);
255 255
256 /* 256 /*
257 * Method Locals and Arguments are supported 257 * Method Locals and Arguments are supported
@@ -318,10 +318,10 @@ acpi_ds_method_data_set_value(u16 opcode,
318 acpi_status status; 318 acpi_status status;
319 struct acpi_namespace_node *node; 319 struct acpi_namespace_node *node;
320 320
321 ACPI_FUNCTION_TRACE("ds_method_data_set_value"); 321 ACPI_FUNCTION_TRACE(ds_method_data_set_value);
322 322
323 ACPI_DEBUG_PRINT((ACPI_DB_EXEC, 323 ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
324 "new_obj %p Opcode %X, Refs=%d [%s]\n", object, 324 "NewObj %p Opcode %X, Refs=%d [%s]\n", object,
325 opcode, object->common.reference_count, 325 opcode, object->common.reference_count,
326 acpi_ut_get_type_name(object->common.type))); 326 acpi_ut_get_type_name(object->common.type)));
327 327
@@ -372,7 +372,7 @@ acpi_ds_method_data_get_value(u16 opcode,
372 struct acpi_namespace_node *node; 372 struct acpi_namespace_node *node;
373 union acpi_operand_object *object; 373 union acpi_operand_object *object;
374 374
375 ACPI_FUNCTION_TRACE("ds_method_data_get_value"); 375 ACPI_FUNCTION_TRACE(ds_method_data_get_value);
376 376
377 /* Validate the object descriptor */ 377 /* Validate the object descriptor */
378 378
@@ -477,7 +477,7 @@ acpi_ds_method_data_delete_value(u16 opcode,
477 struct acpi_namespace_node *node; 477 struct acpi_namespace_node *node;
478 union acpi_operand_object *object; 478 union acpi_operand_object *object;
479 479
480 ACPI_FUNCTION_TRACE("ds_method_data_delete_value"); 480 ACPI_FUNCTION_TRACE(ds_method_data_delete_value);
481 481
482 /* Get the namespace node for the arg/local */ 482 /* Get the namespace node for the arg/local */
483 483
@@ -538,7 +538,7 @@ acpi_ds_store_object_to_local(u16 opcode,
538 union acpi_operand_object *current_obj_desc; 538 union acpi_operand_object *current_obj_desc;
539 union acpi_operand_object *new_obj_desc; 539 union acpi_operand_object *new_obj_desc;
540 540
541 ACPI_FUNCTION_TRACE("ds_store_object_to_local"); 541 ACPI_FUNCTION_TRACE(ds_store_object_to_local);
542 ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "Opcode=%X Index=%d Obj=%p\n", 542 ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "Opcode=%X Index=%d Obj=%p\n",
543 opcode, index, obj_desc)); 543 opcode, index, obj_desc));
544 544
@@ -614,7 +614,7 @@ acpi_ds_store_object_to_local(u16 opcode,
614 && (current_obj_desc->reference.opcode == 614 && (current_obj_desc->reference.opcode ==
615 AML_REF_OF_OP)) { 615 AML_REF_OF_OP)) {
616 ACPI_DEBUG_PRINT((ACPI_DB_EXEC, 616 ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
617 "Arg (%p) is an obj_ref(Node), storing in node %p\n", 617 "Arg (%p) is an ObjRef(Node), storing in node %p\n",
618 new_obj_desc, 618 new_obj_desc,
619 current_obj_desc)); 619 current_obj_desc));
620 620
@@ -688,7 +688,7 @@ acpi_ds_method_data_get_type(u16 opcode,
688 struct acpi_namespace_node *node; 688 struct acpi_namespace_node *node;
689 union acpi_operand_object *object; 689 union acpi_operand_object *object;
690 690
691 ACPI_FUNCTION_TRACE("ds_method_data_get_type"); 691 ACPI_FUNCTION_TRACE(ds_method_data_get_type);
692 692
693 /* Get the namespace node for the arg/local */ 693 /* Get the namespace node for the arg/local */
694 694
diff --git a/drivers/acpi/dispatcher/dsobject.c b/drivers/acpi/dispatcher/dsobject.c
index ce54715f13ad..72190abb1d59 100644
--- a/drivers/acpi/dispatcher/dsobject.c
+++ b/drivers/acpi/dispatcher/dsobject.c
@@ -81,7 +81,7 @@ acpi_ds_build_internal_object(struct acpi_walk_state *walk_state,
81 union acpi_operand_object *obj_desc; 81 union acpi_operand_object *obj_desc;
82 acpi_status status; 82 acpi_status status;
83 83
84 ACPI_FUNCTION_TRACE("ds_build_internal_object"); 84 ACPI_FUNCTION_TRACE(ds_build_internal_object);
85 85
86 *obj_desc_ptr = NULL; 86 *obj_desc_ptr = NULL;
87 if (op->common.aml_opcode == AML_INT_NAMEPATH_OP) { 87 if (op->common.aml_opcode == AML_INT_NAMEPATH_OP) {
@@ -187,7 +187,7 @@ acpi_ds_build_internal_buffer_obj(struct acpi_walk_state *walk_state,
187 union acpi_parse_object *byte_list; 187 union acpi_parse_object *byte_list;
188 u32 byte_list_length = 0; 188 u32 byte_list_length = 0;
189 189
190 ACPI_FUNCTION_TRACE("ds_build_internal_buffer_obj"); 190 ACPI_FUNCTION_TRACE(ds_build_internal_buffer_obj);
191 191
192 /* 192 /*
193 * If we are evaluating a Named buffer object "Name (xxxx, Buffer)". 193 * If we are evaluating a Named buffer object "Name (xxxx, Buffer)".
@@ -293,7 +293,7 @@ acpi_ds_build_internal_package_obj(struct acpi_walk_state *walk_state,
293 acpi_status status = AE_OK; 293 acpi_status status = AE_OK;
294 acpi_native_uint i; 294 acpi_native_uint i;
295 295
296 ACPI_FUNCTION_TRACE("ds_build_internal_package_obj"); 296 ACPI_FUNCTION_TRACE(ds_build_internal_package_obj);
297 297
298 /* Find the parent of a possibly nested package */ 298 /* Find the parent of a possibly nested package */
299 299
@@ -400,7 +400,7 @@ acpi_ds_create_node(struct acpi_walk_state *walk_state,
400 acpi_status status; 400 acpi_status status;
401 union acpi_operand_object *obj_desc; 401 union acpi_operand_object *obj_desc;
402 402
403 ACPI_FUNCTION_TRACE_PTR("ds_create_node", op); 403 ACPI_FUNCTION_TRACE_PTR(ds_create_node, op);
404 404
405 /* 405 /*
406 * Because of the execution pass through the non-control-method 406 * Because of the execution pass through the non-control-method
@@ -469,7 +469,7 @@ acpi_ds_init_object_from_op(struct acpi_walk_state *walk_state,
469 union acpi_operand_object *obj_desc; 469 union acpi_operand_object *obj_desc;
470 acpi_status status = AE_OK; 470 acpi_status status = AE_OK;
471 471
472 ACPI_FUNCTION_TRACE("ds_init_object_from_op"); 472 ACPI_FUNCTION_TRACE(ds_init_object_from_op);
473 473
474 obj_desc = *ret_obj_desc; 474 obj_desc = *ret_obj_desc;
475 op_info = acpi_ps_get_opcode_info(opcode); 475 op_info = acpi_ps_get_opcode_info(opcode);
diff --git a/drivers/acpi/dispatcher/dsopcode.c b/drivers/acpi/dispatcher/dsopcode.c
index 8a690a9963f2..5b974a8fe614 100644
--- a/drivers/acpi/dispatcher/dsopcode.c
+++ b/drivers/acpi/dispatcher/dsopcode.c
@@ -91,7 +91,7 @@ acpi_ds_execute_arguments(struct acpi_namespace_node *node,
91 union acpi_parse_object *op; 91 union acpi_parse_object *op;
92 struct acpi_walk_state *walk_state; 92 struct acpi_walk_state *walk_state;
93 93
94 ACPI_FUNCTION_TRACE("ds_execute_arguments"); 94 ACPI_FUNCTION_TRACE(ds_execute_arguments);
95 95
96 /* 96 /*
97 * Allocate a new parser op to be the root of the parsed tree 97 * Allocate a new parser op to be the root of the parsed tree
@@ -193,7 +193,7 @@ acpi_ds_get_buffer_field_arguments(union acpi_operand_object *obj_desc)
193 struct acpi_namespace_node *node; 193 struct acpi_namespace_node *node;
194 acpi_status status; 194 acpi_status status;
195 195
196 ACPI_FUNCTION_TRACE_PTR("ds_get_buffer_field_arguments", obj_desc); 196 ACPI_FUNCTION_TRACE_PTR(ds_get_buffer_field_arguments, obj_desc);
197 197
198 if (obj_desc->common.flags & AOPOBJ_DATA_VALID) { 198 if (obj_desc->common.flags & AOPOBJ_DATA_VALID) {
199 return_ACPI_STATUS(AE_OK); 199 return_ACPI_STATUS(AE_OK);
@@ -206,7 +206,7 @@ acpi_ds_get_buffer_field_arguments(union acpi_operand_object *obj_desc)
206 206
207 ACPI_DEBUG_EXEC(acpi_ut_display_init_pathname 207 ACPI_DEBUG_EXEC(acpi_ut_display_init_pathname
208 (ACPI_TYPE_BUFFER_FIELD, node, NULL)); 208 (ACPI_TYPE_BUFFER_FIELD, node, NULL));
209 ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "[%4.4s] buffer_field Arg Init\n", 209 ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "[%4.4s] BufferField Arg Init\n",
210 acpi_ut_get_node_name(node))); 210 acpi_ut_get_node_name(node)));
211 211
212 /* Execute the AML code for the term_arg arguments */ 212 /* Execute the AML code for the term_arg arguments */
@@ -235,7 +235,7 @@ acpi_status acpi_ds_get_buffer_arguments(union acpi_operand_object *obj_desc)
235 struct acpi_namespace_node *node; 235 struct acpi_namespace_node *node;
236 acpi_status status; 236 acpi_status status;
237 237
238 ACPI_FUNCTION_TRACE_PTR("ds_get_buffer_arguments", obj_desc); 238 ACPI_FUNCTION_TRACE_PTR(ds_get_buffer_arguments, obj_desc);
239 239
240 if (obj_desc->common.flags & AOPOBJ_DATA_VALID) { 240 if (obj_desc->common.flags & AOPOBJ_DATA_VALID) {
241 return_ACPI_STATUS(AE_OK); 241 return_ACPI_STATUS(AE_OK);
@@ -279,7 +279,7 @@ acpi_status acpi_ds_get_package_arguments(union acpi_operand_object *obj_desc)
279 struct acpi_namespace_node *node; 279 struct acpi_namespace_node *node;
280 acpi_status status; 280 acpi_status status;
281 281
282 ACPI_FUNCTION_TRACE_PTR("ds_get_package_arguments", obj_desc); 282 ACPI_FUNCTION_TRACE_PTR(ds_get_package_arguments, obj_desc);
283 283
284 if (obj_desc->common.flags & AOPOBJ_DATA_VALID) { 284 if (obj_desc->common.flags & AOPOBJ_DATA_VALID) {
285 return_ACPI_STATUS(AE_OK); 285 return_ACPI_STATUS(AE_OK);
@@ -324,7 +324,7 @@ acpi_status acpi_ds_get_region_arguments(union acpi_operand_object *obj_desc)
324 acpi_status status; 324 acpi_status status;
325 union acpi_operand_object *extra_desc; 325 union acpi_operand_object *extra_desc;
326 326
327 ACPI_FUNCTION_TRACE_PTR("ds_get_region_arguments", obj_desc); 327 ACPI_FUNCTION_TRACE_PTR(ds_get_region_arguments, obj_desc);
328 328
329 if (obj_desc->region.flags & AOPOBJ_DATA_VALID) { 329 if (obj_desc->region.flags & AOPOBJ_DATA_VALID) {
330 return_ACPI_STATUS(AE_OK); 330 return_ACPI_STATUS(AE_OK);
@@ -342,8 +342,7 @@ acpi_status acpi_ds_get_region_arguments(union acpi_operand_object *obj_desc)
342 ACPI_DEBUG_EXEC(acpi_ut_display_init_pathname 342 ACPI_DEBUG_EXEC(acpi_ut_display_init_pathname
343 (ACPI_TYPE_REGION, node, NULL)); 343 (ACPI_TYPE_REGION, node, NULL));
344 344
345 ACPI_DEBUG_PRINT((ACPI_DB_EXEC, 345 ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "[%4.4s] OpRegion Arg Init at AML %p\n",
346 "[%4.4s] op_region Arg Init at AML %p\n",
347 acpi_ut_get_node_name(node), 346 acpi_ut_get_node_name(node),
348 extra_desc->extra.aml_start)); 347 extra_desc->extra.aml_start));
349 348
@@ -352,6 +351,28 @@ acpi_status acpi_ds_get_region_arguments(union acpi_operand_object *obj_desc)
352 status = acpi_ds_execute_arguments(node, acpi_ns_get_parent_node(node), 351 status = acpi_ds_execute_arguments(node, acpi_ns_get_parent_node(node),
353 extra_desc->extra.aml_length, 352 extra_desc->extra.aml_length,
354 extra_desc->extra.aml_start); 353 extra_desc->extra.aml_start);
354 if (ACPI_FAILURE(status)) {
355 return_ACPI_STATUS(status);
356 }
357
358 /* Validate the region address/length via the host OS */
359
360 status = acpi_os_validate_address(obj_desc->region.space_id,
361 obj_desc->region.address,
362 (acpi_size) obj_desc->region.length);
363 if (ACPI_FAILURE(status)) {
364 /*
365 * Invalid address/length. We will emit an error message and mark
366 * the region as invalid, so that it will cause an additional error if
367 * it is ever used. Then return AE_OK.
368 */
369 ACPI_EXCEPTION((AE_INFO, status,
370 "During address validation of OpRegion [%4.4s]",
371 node->name.ascii));
372 obj_desc->common.flags |= AOPOBJ_INVALID;
373 status = AE_OK;
374 }
375
355 return_ACPI_STATUS(status); 376 return_ACPI_STATUS(status);
356} 377}
357 378
@@ -411,7 +432,7 @@ acpi_ds_init_buffer_field(u16 aml_opcode,
411 u8 field_flags; 432 u8 field_flags;
412 acpi_status status; 433 acpi_status status;
413 434
414 ACPI_FUNCTION_TRACE_PTR("ds_init_buffer_field", obj_desc); 435 ACPI_FUNCTION_TRACE_PTR(ds_init_buffer_field, obj_desc);
415 436
416 /* Host object must be a Buffer */ 437 /* Host object must be a Buffer */
417 438
@@ -457,7 +478,7 @@ acpi_ds_init_buffer_field(u16 aml_opcode,
457 478
458 if (bit_count == 0) { 479 if (bit_count == 0) {
459 ACPI_ERROR((AE_INFO, 480 ACPI_ERROR((AE_INFO,
460 "Attempt to create_field of length zero")); 481 "Attempt to CreateField of length zero"));
461 status = AE_AML_OPERAND_VALUE; 482 status = AE_AML_OPERAND_VALUE;
462 goto cleanup; 483 goto cleanup;
463 } 484 }
@@ -595,7 +616,7 @@ acpi_ds_eval_buffer_field_operands(struct acpi_walk_state *walk_state,
595 struct acpi_namespace_node *node; 616 struct acpi_namespace_node *node;
596 union acpi_parse_object *next_op; 617 union acpi_parse_object *next_op;
597 618
598 ACPI_FUNCTION_TRACE_PTR("ds_eval_buffer_field_operands", op); 619 ACPI_FUNCTION_TRACE_PTR(ds_eval_buffer_field_operands, op);
599 620
600 /* 621 /*
601 * This is where we evaluate the address and length fields of the 622 * This is where we evaluate the address and length fields of the
@@ -627,7 +648,7 @@ acpi_ds_eval_buffer_field_operands(struct acpi_walk_state *walk_state,
627 ACPI_DUMP_OPERANDS(ACPI_WALK_OPERANDS, ACPI_IMODE_EXECUTE, 648 ACPI_DUMP_OPERANDS(ACPI_WALK_OPERANDS, ACPI_IMODE_EXECUTE,
628 acpi_ps_get_opcode_name(op->common.aml_opcode), 649 acpi_ps_get_opcode_name(op->common.aml_opcode),
629 walk_state->num_operands, 650 walk_state->num_operands,
630 "after acpi_ex_resolve_operands"); 651 "after AcpiExResolveOperands");
631 652
632 if (ACPI_FAILURE(status)) { 653 if (ACPI_FAILURE(status)) {
633 ACPI_ERROR((AE_INFO, "(%s) bad operand(s) (%X)", 654 ACPI_ERROR((AE_INFO, "(%s) bad operand(s) (%X)",
@@ -686,7 +707,7 @@ acpi_ds_eval_region_operands(struct acpi_walk_state *walk_state,
686 struct acpi_namespace_node *node; 707 struct acpi_namespace_node *node;
687 union acpi_parse_object *next_op; 708 union acpi_parse_object *next_op;
688 709
689 ACPI_FUNCTION_TRACE_PTR("ds_eval_region_operands", op); 710 ACPI_FUNCTION_TRACE_PTR(ds_eval_region_operands, op);
690 711
691 /* 712 /*
692 * This is where we evaluate the address and length fields of the 713 * This is where we evaluate the address and length fields of the
@@ -719,7 +740,7 @@ acpi_ds_eval_region_operands(struct acpi_walk_state *walk_state,
719 740
720 ACPI_DUMP_OPERANDS(ACPI_WALK_OPERANDS, ACPI_IMODE_EXECUTE, 741 ACPI_DUMP_OPERANDS(ACPI_WALK_OPERANDS, ACPI_IMODE_EXECUTE,
721 acpi_ps_get_opcode_name(op->common.aml_opcode), 742 acpi_ps_get_opcode_name(op->common.aml_opcode),
722 1, "after acpi_ex_resolve_operands"); 743 1, "after AcpiExResolveOperands");
723 744
724 obj_desc = acpi_ns_get_attached_object(node); 745 obj_desc = acpi_ns_get_attached_object(node);
725 if (!obj_desc) { 746 if (!obj_desc) {
@@ -745,7 +766,7 @@ acpi_ds_eval_region_operands(struct acpi_walk_state *walk_state,
745 operand_desc->integer.value; 766 operand_desc->integer.value;
746 acpi_ut_remove_reference(operand_desc); 767 acpi_ut_remove_reference(operand_desc);
747 768
748 ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "rgn_obj %p Addr %8.8X%8.8X Len %X\n", 769 ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "RgnObj %p Addr %8.8X%8.8X Len %X\n",
749 obj_desc, 770 obj_desc,
750 ACPI_FORMAT_UINT64(obj_desc->region.address), 771 ACPI_FORMAT_UINT64(obj_desc->region.address),
751 obj_desc->region.length)); 772 obj_desc->region.length));
@@ -781,7 +802,7 @@ acpi_ds_eval_data_object_operands(struct acpi_walk_state *walk_state,
781 union acpi_operand_object *arg_desc; 802 union acpi_operand_object *arg_desc;
782 u32 length; 803 u32 length;
783 804
784 ACPI_FUNCTION_TRACE("ds_eval_data_object_operands"); 805 ACPI_FUNCTION_TRACE(ds_eval_data_object_operands);
785 806
786 /* The first operand (for all of these data objects) is the length */ 807 /* The first operand (for all of these data objects) is the length */
787 808
@@ -875,7 +896,7 @@ acpi_ds_exec_begin_control_op(struct acpi_walk_state *walk_state,
875 acpi_status status = AE_OK; 896 acpi_status status = AE_OK;
876 union acpi_generic_state *control_state; 897 union acpi_generic_state *control_state;
877 898
878 ACPI_FUNCTION_NAME("ds_exec_begin_control_op"); 899 ACPI_FUNCTION_NAME(ds_exec_begin_control_op);
879 900
880 ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH, "Op=%p Opcode=%2.2X State=%p\n", op, 901 ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH, "Op=%p Opcode=%2.2X State=%p\n", op,
881 op->common.aml_opcode, walk_state)); 902 op->common.aml_opcode, walk_state));
@@ -953,7 +974,7 @@ acpi_ds_exec_end_control_op(struct acpi_walk_state * walk_state,
953 acpi_status status = AE_OK; 974 acpi_status status = AE_OK;
954 union acpi_generic_state *control_state; 975 union acpi_generic_state *control_state;
955 976
956 ACPI_FUNCTION_NAME("ds_exec_end_control_op"); 977 ACPI_FUNCTION_NAME(ds_exec_end_control_op);
957 978
958 switch (op->common.aml_opcode) { 979 switch (op->common.aml_opcode) {
959 case AML_IF_OP: 980 case AML_IF_OP:
@@ -1099,7 +1120,7 @@ acpi_ds_exec_end_control_op(struct acpi_walk_state * walk_state,
1099 } 1120 }
1100 1121
1101 ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH, 1122 ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,
1102 "Completed RETURN_OP State=%p, ret_val=%p\n", 1123 "Completed RETURN_OP State=%p, RetVal=%p\n",
1103 walk_state, walk_state->return_desc)); 1124 walk_state, walk_state->return_desc));
1104 1125
1105 /* End the control method execution right now */ 1126 /* End the control method execution right now */
diff --git a/drivers/acpi/dispatcher/dsutils.c b/drivers/acpi/dispatcher/dsutils.c
index ab24aa88e2fa..05230baf5de8 100644
--- a/drivers/acpi/dispatcher/dsutils.c
+++ b/drivers/acpi/dispatcher/dsutils.c
@@ -68,7 +68,7 @@ ACPI_MODULE_NAME("dsutils")
68 ******************************************************************************/ 68 ******************************************************************************/
69void acpi_ds_clear_implicit_return(struct acpi_walk_state *walk_state) 69void acpi_ds_clear_implicit_return(struct acpi_walk_state *walk_state)
70{ 70{
71 ACPI_FUNCTION_NAME("ds_clear_implicit_return"); 71 ACPI_FUNCTION_NAME(ds_clear_implicit_return);
72 72
73 /* 73 /*
74 * Slack must be enabled for this feature 74 * Slack must be enabled for this feature
@@ -115,7 +115,7 @@ u8
115acpi_ds_do_implicit_return(union acpi_operand_object *return_desc, 115acpi_ds_do_implicit_return(union acpi_operand_object *return_desc,
116 struct acpi_walk_state *walk_state, u8 add_reference) 116 struct acpi_walk_state *walk_state, u8 add_reference)
117{ 117{
118 ACPI_FUNCTION_NAME("ds_do_implicit_return"); 118 ACPI_FUNCTION_NAME(ds_do_implicit_return);
119 119
120 /* 120 /*
121 * Slack must be enabled for this feature, and we must 121 * Slack must be enabled for this feature, and we must
@@ -171,7 +171,7 @@ acpi_ds_is_result_used(union acpi_parse_object * op,
171{ 171{
172 const struct acpi_opcode_info *parent_info; 172 const struct acpi_opcode_info *parent_info;
173 173
174 ACPI_FUNCTION_TRACE_PTR("ds_is_result_used", op); 174 ACPI_FUNCTION_TRACE_PTR(ds_is_result_used, op);
175 175
176 /* Must have both an Op and a Result Object */ 176 /* Must have both an Op and a Result Object */
177 177
@@ -341,7 +341,7 @@ acpi_ds_delete_result_if_not_used(union acpi_parse_object *op,
341 union acpi_operand_object *obj_desc; 341 union acpi_operand_object *obj_desc;
342 acpi_status status; 342 acpi_status status;
343 343
344 ACPI_FUNCTION_TRACE_PTR("ds_delete_result_if_not_used", result_obj); 344 ACPI_FUNCTION_TRACE_PTR(ds_delete_result_if_not_used, result_obj);
345 345
346 if (!op) { 346 if (!op) {
347 ACPI_ERROR((AE_INFO, "Null Op")); 347 ACPI_ERROR((AE_INFO, "Null Op"));
@@ -384,7 +384,7 @@ acpi_status acpi_ds_resolve_operands(struct acpi_walk_state *walk_state)
384 u32 i; 384 u32 i;
385 acpi_status status = AE_OK; 385 acpi_status status = AE_OK;
386 386
387 ACPI_FUNCTION_TRACE_PTR("ds_resolve_operands", walk_state); 387 ACPI_FUNCTION_TRACE_PTR(ds_resolve_operands, walk_state);
388 388
389 /* 389 /*
390 * Attempt to resolve each of the valid operands 390 * Attempt to resolve each of the valid operands
@@ -419,7 +419,7 @@ void acpi_ds_clear_operands(struct acpi_walk_state *walk_state)
419{ 419{
420 u32 i; 420 u32 i;
421 421
422 ACPI_FUNCTION_TRACE_PTR("ds_clear_operands", walk_state); 422 ACPI_FUNCTION_TRACE_PTR(ds_clear_operands, walk_state);
423 423
424 /* Remove a reference on each operand on the stack */ 424 /* Remove a reference on each operand on the stack */
425 425
@@ -467,7 +467,7 @@ acpi_ds_create_operand(struct acpi_walk_state *walk_state,
467 acpi_interpreter_mode interpreter_mode; 467 acpi_interpreter_mode interpreter_mode;
468 const struct acpi_opcode_info *op_info; 468 const struct acpi_opcode_info *op_info;
469 469
470 ACPI_FUNCTION_TRACE_PTR("ds_create_operand", arg); 470 ACPI_FUNCTION_TRACE_PTR(ds_create_operand, arg);
471 471
472 /* A valid name must be looked up in the namespace */ 472 /* A valid name must be looked up in the namespace */
473 473
@@ -701,7 +701,7 @@ acpi_ds_create_operands(struct acpi_walk_state *walk_state,
701 union acpi_parse_object *arg; 701 union acpi_parse_object *arg;
702 u32 arg_count = 0; 702 u32 arg_count = 0;
703 703
704 ACPI_FUNCTION_TRACE_PTR("ds_create_operands", first_arg); 704 ACPI_FUNCTION_TRACE_PTR(ds_create_operands, first_arg);
705 705
706 /* For all arguments in the list... */ 706 /* For all arguments in the list... */
707 707
diff --git a/drivers/acpi/dispatcher/dswexec.c b/drivers/acpi/dispatcher/dswexec.c
index 8b740b370eb1..8afb20384e96 100644
--- a/drivers/acpi/dispatcher/dswexec.c
+++ b/drivers/acpi/dispatcher/dswexec.c
@@ -92,7 +92,7 @@ acpi_ds_get_predicate_value(struct acpi_walk_state *walk_state,
92 union acpi_operand_object *obj_desc; 92 union acpi_operand_object *obj_desc;
93 union acpi_operand_object *local_obj_desc = NULL; 93 union acpi_operand_object *local_obj_desc = NULL;
94 94
95 ACPI_FUNCTION_TRACE_PTR("ds_get_predicate_value", walk_state); 95 ACPI_FUNCTION_TRACE_PTR(ds_get_predicate_value, walk_state);
96 96
97 walk_state->control_state->common.state = 0; 97 walk_state->control_state->common.state = 0;
98 98
@@ -122,7 +122,7 @@ acpi_ds_get_predicate_value(struct acpi_walk_state *walk_state,
122 122
123 if (!obj_desc) { 123 if (!obj_desc) {
124 ACPI_ERROR((AE_INFO, 124 ACPI_ERROR((AE_INFO,
125 "No predicate obj_desc=%p State=%p", 125 "No predicate ObjDesc=%p State=%p",
126 obj_desc, walk_state)); 126 obj_desc, walk_state));
127 127
128 return_ACPI_STATUS(AE_AML_NO_OPERAND); 128 return_ACPI_STATUS(AE_AML_NO_OPERAND);
@@ -139,7 +139,7 @@ acpi_ds_get_predicate_value(struct acpi_walk_state *walk_state,
139 139
140 if (ACPI_GET_OBJECT_TYPE(local_obj_desc) != ACPI_TYPE_INTEGER) { 140 if (ACPI_GET_OBJECT_TYPE(local_obj_desc) != ACPI_TYPE_INTEGER) {
141 ACPI_ERROR((AE_INFO, 141 ACPI_ERROR((AE_INFO,
142 "Bad predicate (not an integer) obj_desc=%p State=%p Type=%X", 142 "Bad predicate (not an integer) ObjDesc=%p State=%p Type=%X",
143 obj_desc, walk_state, 143 obj_desc, walk_state,
144 ACPI_GET_OBJECT_TYPE(obj_desc))); 144 ACPI_GET_OBJECT_TYPE(obj_desc)));
145 145
@@ -213,7 +213,7 @@ acpi_ds_exec_begin_op(struct acpi_walk_state *walk_state,
213 acpi_status status = AE_OK; 213 acpi_status status = AE_OK;
214 u32 opcode_class; 214 u32 opcode_class;
215 215
216 ACPI_FUNCTION_TRACE_PTR("ds_exec_begin_op", walk_state); 216 ACPI_FUNCTION_TRACE_PTR(ds_exec_begin_op, walk_state);
217 217
218 op = walk_state->op; 218 op = walk_state->op;
219 if (!op) { 219 if (!op) {
@@ -353,7 +353,7 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)
353 union acpi_parse_object *next_op; 353 union acpi_parse_object *next_op;
354 union acpi_parse_object *first_arg; 354 union acpi_parse_object *first_arg;
355 355
356 ACPI_FUNCTION_TRACE_PTR("ds_exec_end_op", walk_state); 356 ACPI_FUNCTION_TRACE_PTR(ds_exec_end_op, walk_state);
357 357
358 op = walk_state->op; 358 op = walk_state->op;
359 op_type = walk_state->op_info->type; 359 op_type = walk_state->op_info->type;
@@ -423,7 +423,7 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)
423 acpi_ps_get_opcode_name 423 acpi_ps_get_opcode_name
424 (walk_state->opcode), 424 (walk_state->opcode),
425 walk_state->num_operands, 425 walk_state->num_operands,
426 "after ex_resolve_operands"); 426 "after ExResolveOperands");
427 } 427 }
428 } 428 }
429 429
@@ -437,7 +437,7 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)
437 acpi_gbl_op_type_dispatch[op_type] (walk_state); 437 acpi_gbl_op_type_dispatch[op_type] (walk_state);
438 } else { 438 } else {
439 /* 439 /*
440 * Treat constructs of the form "Store(local_x,local_x)" as noops when the 440 * Treat constructs of the form "Store(LocalX,LocalX)" as noops when the
441 * Local is uninitialized. 441 * Local is uninitialized.
442 */ 442 */
443 if ((status == AE_AML_UNINITIALIZED_LOCAL) && 443 if ((status == AE_AML_UNINITIALIZED_LOCAL) &&
@@ -570,7 +570,7 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)
570 case AML_TYPE_CREATE_FIELD: 570 case AML_TYPE_CREATE_FIELD:
571 571
572 ACPI_DEBUG_PRINT((ACPI_DB_EXEC, 572 ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
573 "Executing create_field Buffer/Index Op=%p\n", 573 "Executing CreateField Buffer/Index Op=%p\n",
574 op)); 574 op));
575 575
576 status = acpi_ds_load2_end_op(walk_state); 576 status = acpi_ds_load2_end_op(walk_state);
@@ -585,7 +585,7 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)
585 case AML_TYPE_CREATE_OBJECT: 585 case AML_TYPE_CREATE_OBJECT:
586 586
587 ACPI_DEBUG_PRINT((ACPI_DB_EXEC, 587 ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
588 "Executing create_object (Buffer/Package) Op=%p\n", 588 "Executing CreateObject (Buffer/Package) Op=%p\n",
589 op)); 589 op));
590 590
591 switch (op->common.parent->common.aml_opcode) { 591 switch (op->common.parent->common.aml_opcode) {
@@ -658,7 +658,7 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)
658 658
659 if (op->common.aml_opcode == AML_REGION_OP) { 659 if (op->common.aml_opcode == AML_REGION_OP) {
660 ACPI_DEBUG_PRINT((ACPI_DB_EXEC, 660 ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
661 "Executing op_region Address/Length Op=%p\n", 661 "Executing OpRegion Address/Length Op=%p\n",
662 op)); 662 op));
663 663
664 status = 664 status =
diff --git a/drivers/acpi/dispatcher/dswload.c b/drivers/acpi/dispatcher/dswload.c
index 1ad7870101fb..a8deb700cf33 100644
--- a/drivers/acpi/dispatcher/dswload.c
+++ b/drivers/acpi/dispatcher/dswload.c
@@ -127,7 +127,7 @@ acpi_ds_load1_begin_op(struct acpi_walk_state * walk_state,
127 char *path; 127 char *path;
128 u32 flags; 128 u32 flags;
129 129
130 ACPI_FUNCTION_TRACE("ds_load1_begin_op"); 130 ACPI_FUNCTION_TRACE(ds_load1_begin_op);
131 131
132 op = walk_state->op; 132 op = walk_state->op;
133 ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH, "Op=%p State=%p\n", op, 133 ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH, "Op=%p State=%p\n", op,
@@ -361,7 +361,7 @@ acpi_status acpi_ds_load1_end_op(struct acpi_walk_state *walk_state)
361 acpi_object_type object_type; 361 acpi_object_type object_type;
362 acpi_status status = AE_OK; 362 acpi_status status = AE_OK;
363 363
364 ACPI_FUNCTION_TRACE("ds_load1_end_op"); 364 ACPI_FUNCTION_TRACE(ds_load1_end_op);
365 365
366 op = walk_state->op; 366 op = walk_state->op;
367 ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH, "Op=%p State=%p\n", op, 367 ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH, "Op=%p State=%p\n", op,
@@ -448,7 +448,7 @@ acpi_status acpi_ds_load1_end_op(struct acpi_walk_state *walk_state)
448 * arguments.) 448 * arguments.)
449 */ 449 */
450 ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH, 450 ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,
451 "LOADING-Method: State=%p Op=%p named_obj=%p\n", 451 "LOADING-Method: State=%p Op=%p NamedObj=%p\n",
452 walk_state, op, op->named.node)); 452 walk_state, op, op->named.node));
453 453
454 if (!acpi_ns_get_attached_object(op->named.node)) { 454 if (!acpi_ns_get_attached_object(op->named.node)) {
@@ -514,7 +514,7 @@ acpi_ds_load2_begin_op(struct acpi_walk_state *walk_state,
514 acpi_object_type object_type; 514 acpi_object_type object_type;
515 char *buffer_ptr; 515 char *buffer_ptr;
516 516
517 ACPI_FUNCTION_TRACE("ds_load2_begin_op"); 517 ACPI_FUNCTION_TRACE(ds_load2_begin_op);
518 518
519 op = walk_state->op; 519 op = walk_state->op;
520 ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH, "Op=%p State=%p\n", op, 520 ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH, "Op=%p State=%p\n", op,
@@ -785,7 +785,7 @@ acpi_status acpi_ds_load2_end_op(struct acpi_walk_state *walk_state)
785 u32 i; 785 u32 i;
786#endif 786#endif
787 787
788 ACPI_FUNCTION_TRACE("ds_load2_end_op"); 788 ACPI_FUNCTION_TRACE(ds_load2_end_op);
789 789
790 op = walk_state->op; 790 op = walk_state->op;
791 ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH, "Opcode [%s] Op %p State %p\n", 791 ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH, "Opcode [%s] Op %p State %p\n",
@@ -879,7 +879,7 @@ acpi_status acpi_ds_load2_end_op(struct acpi_walk_state *walk_state)
879 */ 879 */
880 880
881 ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH, 881 ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,
882 "Create-Load [%s] State=%p Op=%p named_obj=%p\n", 882 "Create-Load [%s] State=%p Op=%p NamedObj=%p\n",
883 acpi_ps_get_opcode_name(op->common.aml_opcode), 883 acpi_ps_get_opcode_name(op->common.aml_opcode),
884 walk_state, op, node)); 884 walk_state, op, node));
885 885
@@ -1054,7 +1054,7 @@ acpi_status acpi_ds_load2_end_op(struct acpi_walk_state *walk_state)
1054 * arguments.) 1054 * arguments.)
1055 */ 1055 */
1056 ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH, 1056 ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,
1057 "LOADING-Method: State=%p Op=%p named_obj=%p\n", 1057 "LOADING-Method: State=%p Op=%p NamedObj=%p\n",
1058 walk_state, op, op->named.node)); 1058 walk_state, op, op->named.node));
1059 1059
1060 if (!acpi_ns_get_attached_object(op->named.node)) { 1060 if (!acpi_ns_get_attached_object(op->named.node)) {
@@ -1099,7 +1099,7 @@ acpi_status acpi_ds_load2_end_op(struct acpi_walk_state *walk_state)
1099 case AML_CLASS_METHOD_CALL: 1099 case AML_CLASS_METHOD_CALL:
1100 1100
1101 ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH, 1101 ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,
1102 "RESOLVING-method_call: State=%p Op=%p named_obj=%p\n", 1102 "RESOLVING-MethodCall: State=%p Op=%p NamedObj=%p\n",
1103 walk_state, op, node)); 1103 walk_state, op, node));
1104 1104
1105 /* 1105 /*
diff --git a/drivers/acpi/dispatcher/dswscope.c b/drivers/acpi/dispatcher/dswscope.c
index 3cd6895ed2c3..c9228972f5f6 100644
--- a/drivers/acpi/dispatcher/dswscope.c
+++ b/drivers/acpi/dispatcher/dswscope.c
@@ -63,7 +63,7 @@ void acpi_ds_scope_stack_clear(struct acpi_walk_state *walk_state)
63{ 63{
64 union acpi_generic_state *scope_info; 64 union acpi_generic_state *scope_info;
65 65
66 ACPI_FUNCTION_NAME("ds_scope_stack_clear"); 66 ACPI_FUNCTION_NAME(ds_scope_stack_clear);
67 67
68 while (walk_state->scope_info) { 68 while (walk_state->scope_info) {
69 69
@@ -103,7 +103,7 @@ acpi_ds_scope_stack_push(struct acpi_namespace_node *node,
103 union acpi_generic_state *scope_info; 103 union acpi_generic_state *scope_info;
104 union acpi_generic_state *old_scope_info; 104 union acpi_generic_state *old_scope_info;
105 105
106 ACPI_FUNCTION_TRACE("ds_scope_stack_push"); 106 ACPI_FUNCTION_TRACE(ds_scope_stack_push);
107 107
108 if (!node) { 108 if (!node) {
109 109
@@ -178,7 +178,7 @@ acpi_status acpi_ds_scope_stack_pop(struct acpi_walk_state *walk_state)
178 union acpi_generic_state *scope_info; 178 union acpi_generic_state *scope_info;
179 union acpi_generic_state *new_scope_info; 179 union acpi_generic_state *new_scope_info;
180 180
181 ACPI_FUNCTION_TRACE("ds_scope_stack_pop"); 181 ACPI_FUNCTION_TRACE(ds_scope_stack_pop);
182 182
183 /* 183 /*
184 * Pop scope info object off the stack. 184 * Pop scope info object off the stack.
diff --git a/drivers/acpi/dispatcher/dswstate.c b/drivers/acpi/dispatcher/dswstate.c
index 4840eae47d34..82c1e219bf15 100644
--- a/drivers/acpi/dispatcher/dswstate.c
+++ b/drivers/acpi/dispatcher/dswstate.c
@@ -87,7 +87,7 @@ acpi_ds_result_remove(union acpi_operand_object **object,
87{ 87{
88 union acpi_generic_state *state; 88 union acpi_generic_state *state;
89 89
90 ACPI_FUNCTION_NAME("ds_result_remove"); 90 ACPI_FUNCTION_NAME(ds_result_remove);
91 91
92 state = walk_state->results; 92 state = walk_state->results;
93 if (!state) { 93 if (!state) {
@@ -150,7 +150,7 @@ acpi_ds_result_pop(union acpi_operand_object ** object,
150 acpi_native_uint index; 150 acpi_native_uint index;
151 union acpi_generic_state *state; 151 union acpi_generic_state *state;
152 152
153 ACPI_FUNCTION_NAME("ds_result_pop"); 153 ACPI_FUNCTION_NAME(ds_result_pop);
154 154
155 state = walk_state->results; 155 state = walk_state->results;
156 if (!state) { 156 if (!state) {
@@ -212,7 +212,7 @@ acpi_ds_result_pop_from_bottom(union acpi_operand_object ** object,
212 acpi_native_uint index; 212 acpi_native_uint index;
213 union acpi_generic_state *state; 213 union acpi_generic_state *state;
214 214
215 ACPI_FUNCTION_NAME("ds_result_pop_from_bottom"); 215 ACPI_FUNCTION_NAME(ds_result_pop_from_bottom);
216 216
217 state = walk_state->results; 217 state = walk_state->results;
218 if (!state) { 218 if (!state) {
@@ -277,7 +277,7 @@ acpi_ds_result_push(union acpi_operand_object * object,
277{ 277{
278 union acpi_generic_state *state; 278 union acpi_generic_state *state;
279 279
280 ACPI_FUNCTION_NAME("ds_result_push"); 280 ACPI_FUNCTION_NAME(ds_result_push);
281 281
282 state = walk_state->results; 282 state = walk_state->results;
283 if (!state) { 283 if (!state) {
@@ -330,7 +330,7 @@ acpi_status acpi_ds_result_stack_push(struct acpi_walk_state * walk_state)
330{ 330{
331 union acpi_generic_state *state; 331 union acpi_generic_state *state;
332 332
333 ACPI_FUNCTION_NAME("ds_result_stack_push"); 333 ACPI_FUNCTION_NAME(ds_result_stack_push);
334 334
335 state = acpi_ut_create_generic_state(); 335 state = acpi_ut_create_generic_state();
336 if (!state) { 336 if (!state) {
@@ -362,7 +362,7 @@ acpi_status acpi_ds_result_stack_pop(struct acpi_walk_state * walk_state)
362{ 362{
363 union acpi_generic_state *state; 363 union acpi_generic_state *state;
364 364
365 ACPI_FUNCTION_NAME("ds_result_stack_pop"); 365 ACPI_FUNCTION_NAME(ds_result_stack_pop);
366 366
367 /* Check for stack underflow */ 367 /* Check for stack underflow */
368 368
@@ -375,7 +375,7 @@ acpi_status acpi_ds_result_stack_pop(struct acpi_walk_state * walk_state)
375 state = acpi_ut_pop_generic_state(&walk_state->results); 375 state = acpi_ut_pop_generic_state(&walk_state->results);
376 376
377 ACPI_DEBUG_PRINT((ACPI_DB_EXEC, 377 ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
378 "Result=%p remaining_results=%X State=%p\n", 378 "Result=%p RemainingResults=%X State=%p\n",
379 state, state->results.num_results, walk_state)); 379 state, state->results.num_results, walk_state));
380 380
381 acpi_ut_delete_generic_state(state); 381 acpi_ut_delete_generic_state(state);
@@ -399,7 +399,7 @@ acpi_status acpi_ds_result_stack_pop(struct acpi_walk_state * walk_state)
399acpi_status 399acpi_status
400acpi_ds_obj_stack_push(void *object, struct acpi_walk_state * walk_state) 400acpi_ds_obj_stack_push(void *object, struct acpi_walk_state * walk_state)
401{ 401{
402 ACPI_FUNCTION_NAME("ds_obj_stack_push"); 402 ACPI_FUNCTION_NAME(ds_obj_stack_push);
403 403
404 /* Check for stack overflow */ 404 /* Check for stack overflow */
405 405
@@ -444,7 +444,7 @@ acpi_ds_obj_stack_pop(u32 pop_count, struct acpi_walk_state * walk_state)
444{ 444{
445 u32 i; 445 u32 i;
446 446
447 ACPI_FUNCTION_NAME("ds_obj_stack_pop"); 447 ACPI_FUNCTION_NAME(ds_obj_stack_pop);
448 448
449 for (i = 0; i < pop_count; i++) { 449 for (i = 0; i < pop_count; i++) {
450 450
@@ -491,7 +491,7 @@ acpi_ds_obj_stack_pop_and_delete(u32 pop_count,
491 u32 i; 491 u32 i;
492 union acpi_operand_object *obj_desc; 492 union acpi_operand_object *obj_desc;
493 493
494 ACPI_FUNCTION_NAME("ds_obj_stack_pop_and_delete"); 494 ACPI_FUNCTION_NAME(ds_obj_stack_pop_and_delete);
495 495
496 for (i = 0; i < pop_count; i++) { 496 for (i = 0; i < pop_count; i++) {
497 497
@@ -539,13 +539,13 @@ acpi_ds_obj_stack_pop_and_delete(u32 pop_count,
539struct acpi_walk_state *acpi_ds_get_current_walk_state(struct acpi_thread_state 539struct acpi_walk_state *acpi_ds_get_current_walk_state(struct acpi_thread_state
540 *thread) 540 *thread)
541{ 541{
542 ACPI_FUNCTION_NAME("ds_get_current_walk_state"); 542 ACPI_FUNCTION_NAME(ds_get_current_walk_state);
543 543
544 if (!thread) { 544 if (!thread) {
545 return (NULL); 545 return (NULL);
546 } 546 }
547 547
548 ACPI_DEBUG_PRINT((ACPI_DB_PARSE, "Current walk_state %p\n", 548 ACPI_DEBUG_PRINT((ACPI_DB_PARSE, "Current WalkState %p\n",
549 thread->walk_state_list)); 549 thread->walk_state_list));
550 550
551 return (thread->walk_state_list); 551 return (thread->walk_state_list);
@@ -568,7 +568,7 @@ void
568acpi_ds_push_walk_state(struct acpi_walk_state *walk_state, 568acpi_ds_push_walk_state(struct acpi_walk_state *walk_state,
569 struct acpi_thread_state *thread) 569 struct acpi_thread_state *thread)
570{ 570{
571 ACPI_FUNCTION_TRACE("ds_push_walk_state"); 571 ACPI_FUNCTION_TRACE(ds_push_walk_state);
572 572
573 walk_state->next = thread->walk_state_list; 573 walk_state->next = thread->walk_state_list;
574 thread->walk_state_list = walk_state; 574 thread->walk_state_list = walk_state;
@@ -594,7 +594,7 @@ struct acpi_walk_state *acpi_ds_pop_walk_state(struct acpi_thread_state *thread)
594{ 594{
595 struct acpi_walk_state *walk_state; 595 struct acpi_walk_state *walk_state;
596 596
597 ACPI_FUNCTION_TRACE("ds_pop_walk_state"); 597 ACPI_FUNCTION_TRACE(ds_pop_walk_state);
598 598
599 walk_state = thread->walk_state_list; 599 walk_state = thread->walk_state_list;
600 600
@@ -641,7 +641,7 @@ struct acpi_walk_state *acpi_ds_create_walk_state(acpi_owner_id owner_id,
641 struct acpi_walk_state *walk_state; 641 struct acpi_walk_state *walk_state;
642 acpi_status status; 642 acpi_status status;
643 643
644 ACPI_FUNCTION_TRACE("ds_create_walk_state"); 644 ACPI_FUNCTION_TRACE(ds_create_walk_state);
645 645
646 walk_state = ACPI_ALLOCATE_ZEROED(sizeof(struct acpi_walk_state)); 646 walk_state = ACPI_ALLOCATE_ZEROED(sizeof(struct acpi_walk_state));
647 if (!walk_state) { 647 if (!walk_state) {
@@ -709,7 +709,7 @@ acpi_ds_init_aml_walk(struct acpi_walk_state *walk_state,
709 struct acpi_parse_state *parser_state = &walk_state->parser_state; 709 struct acpi_parse_state *parser_state = &walk_state->parser_state;
710 union acpi_parse_object *extra_op; 710 union acpi_parse_object *extra_op;
711 711
712 ACPI_FUNCTION_TRACE("ds_init_aml_walk"); 712 ACPI_FUNCTION_TRACE(ds_init_aml_walk);
713 713
714 walk_state->parser_state.aml = 714 walk_state->parser_state.aml =
715 walk_state->parser_state.aml_start = aml_start; 715 walk_state->parser_state.aml_start = aml_start;
@@ -813,7 +813,7 @@ void acpi_ds_delete_walk_state(struct acpi_walk_state *walk_state)
813{ 813{
814 union acpi_generic_state *state; 814 union acpi_generic_state *state;
815 815
816 ACPI_FUNCTION_TRACE_PTR("ds_delete_walk_state", walk_state); 816 ACPI_FUNCTION_TRACE_PTR(ds_delete_walk_state, walk_state);
817 817
818 if (!walk_state) { 818 if (!walk_state) {
819 return; 819 return;
@@ -882,7 +882,7 @@ acpi_ds_result_insert(void *object,
882{ 882{
883 union acpi_generic_state *state; 883 union acpi_generic_state *state;
884 884
885 ACPI_FUNCTION_NAME("ds_result_insert"); 885 ACPI_FUNCTION_NAME(ds_result_insert);
886 886
887 state = walk_state->results; 887 state = walk_state->results;
888 if (!state) { 888 if (!state) {
@@ -940,7 +940,7 @@ acpi_status acpi_ds_obj_stack_delete_all(struct acpi_walk_state * walk_state)
940{ 940{
941 u32 i; 941 u32 i;
942 942
943 ACPI_FUNCTION_TRACE_PTR("ds_obj_stack_delete_all", walk_state); 943 ACPI_FUNCTION_TRACE_PTR(ds_obj_stack_delete_all, walk_state);
944 944
945 /* The stack size is configurable, but fixed */ 945 /* The stack size is configurable, but fixed */
946 946
@@ -972,7 +972,7 @@ acpi_status
972acpi_ds_obj_stack_pop_object(union acpi_operand_object **object, 972acpi_ds_obj_stack_pop_object(union acpi_operand_object **object,
973 struct acpi_walk_state *walk_state) 973 struct acpi_walk_state *walk_state)
974{ 974{
975 ACPI_FUNCTION_NAME("ds_obj_stack_pop_object"); 975 ACPI_FUNCTION_NAME(ds_obj_stack_pop_object);
976 976
977 /* Check for stack underflow */ 977 /* Check for stack underflow */
978 978
@@ -1028,7 +1028,7 @@ acpi_ds_obj_stack_pop_object(union acpi_operand_object **object,
1028void *acpi_ds_obj_stack_get_value(u32 index, struct acpi_walk_state *walk_state) 1028void *acpi_ds_obj_stack_get_value(u32 index, struct acpi_walk_state *walk_state)
1029{ 1029{
1030 1030
1031 ACPI_FUNCTION_TRACE_PTR("ds_obj_stack_get_value", walk_state); 1031 ACPI_FUNCTION_TRACE_PTR(ds_obj_stack_get_value, walk_state);
1032 1032
1033 /* Can't do it if the stack is empty */ 1033 /* Can't do it if the stack is empty */
1034 1034
diff --git a/drivers/acpi/events/evevent.c b/drivers/acpi/events/evevent.c
index c8d9752e3128..919037d6acff 100644
--- a/drivers/acpi/events/evevent.c
+++ b/drivers/acpi/events/evevent.c
@@ -68,7 +68,7 @@ acpi_status acpi_ev_initialize_events(void)
68{ 68{
69 acpi_status status; 69 acpi_status status;
70 70
71 ACPI_FUNCTION_TRACE("ev_initialize_events"); 71 ACPI_FUNCTION_TRACE(ev_initialize_events);
72 72
73 /* Make sure we have ACPI tables */ 73 /* Make sure we have ACPI tables */
74 74
@@ -118,7 +118,7 @@ acpi_status acpi_ev_install_fadt_gpes(void)
118{ 118{
119 acpi_status status; 119 acpi_status status;
120 120
121 ACPI_FUNCTION_TRACE("ev_install_fadt_gpes"); 121 ACPI_FUNCTION_TRACE(ev_install_fadt_gpes);
122 122
123 /* Namespace must be locked */ 123 /* Namespace must be locked */
124 124
@@ -157,7 +157,7 @@ acpi_status acpi_ev_install_xrupt_handlers(void)
157{ 157{
158 acpi_status status; 158 acpi_status status;
159 159
160 ACPI_FUNCTION_TRACE("ev_install_xrupt_handlers"); 160 ACPI_FUNCTION_TRACE(ev_install_xrupt_handlers);
161 161
162 /* Install the SCI handler */ 162 /* Install the SCI handler */
163 163
@@ -241,7 +241,7 @@ u32 acpi_ev_fixed_event_detect(void)
241 u32 fixed_enable; 241 u32 fixed_enable;
242 acpi_native_uint i; 242 acpi_native_uint i;
243 243
244 ACPI_FUNCTION_NAME("ev_fixed_event_detect"); 244 ACPI_FUNCTION_NAME(ev_fixed_event_detect);
245 245
246 /* 246 /*
247 * Read the fixed feature status and enable registers, as all the cases 247 * Read the fixed feature status and enable registers, as all the cases
diff --git a/drivers/acpi/events/evgpe.c b/drivers/acpi/events/evgpe.c
index 7d7b81af972e..25fd12a29a29 100644
--- a/drivers/acpi/events/evgpe.c
+++ b/drivers/acpi/events/evgpe.c
@@ -69,7 +69,7 @@ acpi_ev_set_gpe_type(struct acpi_gpe_event_info *gpe_event_info, u8 type)
69{ 69{
70 acpi_status status; 70 acpi_status status;
71 71
72 ACPI_FUNCTION_TRACE("ev_set_gpe_type"); 72 ACPI_FUNCTION_TRACE(ev_set_gpe_type);
73 73
74 /* Validate type and update register enable masks */ 74 /* Validate type and update register enable masks */
75 75
@@ -115,7 +115,7 @@ acpi_ev_update_gpe_enable_masks(struct acpi_gpe_event_info *gpe_event_info,
115 struct acpi_gpe_register_info *gpe_register_info; 115 struct acpi_gpe_register_info *gpe_register_info;
116 u8 register_bit; 116 u8 register_bit;
117 117
118 ACPI_FUNCTION_TRACE("ev_update_gpe_enable_masks"); 118 ACPI_FUNCTION_TRACE(ev_update_gpe_enable_masks);
119 119
120 gpe_register_info = gpe_event_info->register_info; 120 gpe_register_info = gpe_event_info->register_info;
121 if (!gpe_register_info) { 121 if (!gpe_register_info) {
@@ -178,7 +178,7 @@ acpi_ev_enable_gpe(struct acpi_gpe_event_info *gpe_event_info,
178{ 178{
179 acpi_status status; 179 acpi_status status;
180 180
181 ACPI_FUNCTION_TRACE("ev_enable_gpe"); 181 ACPI_FUNCTION_TRACE(ev_enable_gpe);
182 182
183 /* Make sure HW enable masks are updated */ 183 /* Make sure HW enable masks are updated */
184 184
@@ -244,7 +244,7 @@ acpi_status acpi_ev_disable_gpe(struct acpi_gpe_event_info *gpe_event_info)
244{ 244{
245 acpi_status status; 245 acpi_status status;
246 246
247 ACPI_FUNCTION_TRACE("ev_disable_gpe"); 247 ACPI_FUNCTION_TRACE(ev_disable_gpe);
248 248
249 if (!(gpe_event_info->flags & ACPI_GPE_ENABLE_MASK)) { 249 if (!(gpe_event_info->flags & ACPI_GPE_ENABLE_MASK)) {
250 return_ACPI_STATUS(AE_OK); 250 return_ACPI_STATUS(AE_OK);
@@ -385,7 +385,7 @@ u32 acpi_ev_gpe_detect(struct acpi_gpe_xrupt_info * gpe_xrupt_list)
385 acpi_native_uint i; 385 acpi_native_uint i;
386 acpi_native_uint j; 386 acpi_native_uint j;
387 387
388 ACPI_FUNCTION_NAME("ev_gpe_detect"); 388 ACPI_FUNCTION_NAME(ev_gpe_detect);
389 389
390 /* Check for the case where there are no GPEs */ 390 /* Check for the case where there are no GPEs */
391 391
@@ -504,7 +504,7 @@ static void ACPI_SYSTEM_XFACE acpi_ev_asynch_execute_gpe_method(void *context)
504 struct acpi_gpe_event_info local_gpe_event_info; 504 struct acpi_gpe_event_info local_gpe_event_info;
505 struct acpi_parameter_info info; 505 struct acpi_parameter_info info;
506 506
507 ACPI_FUNCTION_TRACE("ev_asynch_execute_gpe_method"); 507 ACPI_FUNCTION_TRACE(ev_asynch_execute_gpe_method);
508 508
509 status = acpi_ut_acquire_mutex(ACPI_MTX_EVENTS); 509 status = acpi_ut_acquire_mutex(ACPI_MTX_EVENTS);
510 if (ACPI_FAILURE(status)) { 510 if (ACPI_FAILURE(status)) {
@@ -598,7 +598,7 @@ acpi_ev_gpe_dispatch(struct acpi_gpe_event_info *gpe_event_info, u32 gpe_number)
598{ 598{
599 acpi_status status; 599 acpi_status status;
600 600
601 ACPI_FUNCTION_TRACE("ev_gpe_dispatch"); 601 ACPI_FUNCTION_TRACE(ev_gpe_dispatch);
602 602
603 /* 603 /*
604 * If edge-triggered, clear the GPE status bit now. Note that 604 * If edge-triggered, clear the GPE status bit now. Note that
@@ -721,7 +721,7 @@ acpi_ev_gpe_dispatch(struct acpi_gpe_event_info *gpe_event_info, u32 gpe_number)
721 * 721 *
722 * DESCRIPTION: Determine if a a GPE is "wake-only". 722 * DESCRIPTION: Determine if a a GPE is "wake-only".
723 * 723 *
724 * Called from Notify() code in interpreter when a "device_wake" 724 * Called from Notify() code in interpreter when a "DeviceWake"
725 * Notify comes in. 725 * Notify comes in.
726 * 726 *
727 ******************************************************************************/ 727 ******************************************************************************/
@@ -731,7 +731,7 @@ acpi_ev_check_for_wake_only_gpe(struct acpi_gpe_event_info *gpe_event_info)
731{ 731{
732 acpi_status status; 732 acpi_status status;
733 733
734 ACPI_FUNCTION_TRACE("ev_check_for_wake_only_gpe"); 734 ACPI_FUNCTION_TRACE(ev_check_for_wake_only_gpe);
735 735
736 if ((gpe_event_info) && /* Only >0 for _Lxx/_Exx */ 736 if ((gpe_event_info) && /* Only >0 for _Lxx/_Exx */
737 ((gpe_event_info->flags & ACPI_GPE_SYSTEM_MASK) == ACPI_GPE_SYSTEM_RUNNING)) { /* System state at GPE time */ 737 ((gpe_event_info->flags & ACPI_GPE_SYSTEM_MASK) == ACPI_GPE_SYSTEM_RUNNING)) { /* System state at GPE time */
diff --git a/drivers/acpi/events/evgpeblk.c b/drivers/acpi/events/evgpeblk.c
index 4e90c1f837c3..95ddeb48bc0f 100644
--- a/drivers/acpi/events/evgpeblk.c
+++ b/drivers/acpi/events/evgpeblk.c
@@ -138,7 +138,7 @@ acpi_status acpi_ev_walk_gpe_list(acpi_gpe_callback gpe_walk_callback)
138 acpi_status status = AE_OK; 138 acpi_status status = AE_OK;
139 acpi_cpu_flags flags; 139 acpi_cpu_flags flags;
140 140
141 ACPI_FUNCTION_TRACE("ev_walk_gpe_list"); 141 ACPI_FUNCTION_TRACE(ev_walk_gpe_list);
142 142
143 flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock); 143 flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
144 144
@@ -192,7 +192,7 @@ acpi_ev_delete_gpe_handlers(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
192 acpi_native_uint i; 192 acpi_native_uint i;
193 acpi_native_uint j; 193 acpi_native_uint j;
194 194
195 ACPI_FUNCTION_TRACE("ev_delete_gpe_handlers"); 195 ACPI_FUNCTION_TRACE(ev_delete_gpe_handlers);
196 196
197 /* Examine each GPE Register within the block */ 197 /* Examine each GPE Register within the block */
198 198
@@ -251,7 +251,7 @@ acpi_ev_save_method_info(acpi_handle obj_handle,
251 u8 type; 251 u8 type;
252 acpi_status status; 252 acpi_status status;
253 253
254 ACPI_FUNCTION_TRACE("ev_save_method_info"); 254 ACPI_FUNCTION_TRACE(ev_save_method_info);
255 255
256 /* 256 /*
257 * _Lxx and _Exx GPE method support 257 * _Lxx and _Exx GPE method support
@@ -282,9 +282,9 @@ acpi_ev_save_method_info(acpi_handle obj_handle,
282 default: 282 default:
283 /* Unknown method type, just ignore it! */ 283 /* Unknown method type, just ignore it! */
284 284
285 ACPI_ERROR((AE_INFO, 285 ACPI_DEBUG_PRINT((ACPI_DB_LOAD,
286 "Unknown GPE method type: %s (name not of form _Lxx or _Exx)", 286 "Ignoring unknown GPE method type: %s (name not of form _Lxx or _Exx)",
287 name)); 287 name));
288 return_ACPI_STATUS(AE_OK); 288 return_ACPI_STATUS(AE_OK);
289 } 289 }
290 290
@@ -295,9 +295,9 @@ acpi_ev_save_method_info(acpi_handle obj_handle,
295 295
296 /* Conversion failed; invalid method, just ignore it */ 296 /* Conversion failed; invalid method, just ignore it */
297 297
298 ACPI_ERROR((AE_INFO, 298 ACPI_DEBUG_PRINT((ACPI_DB_LOAD,
299 "Could not extract GPE number from name: %s (name is not of form _Lxx or _Exx)", 299 "Could not extract GPE number from name: %s (name is not of form _Lxx or _Exx)",
300 name)); 300 name));
301 return_ACPI_STATUS(AE_OK); 301 return_ACPI_STATUS(AE_OK);
302 } 302 }
303 303
@@ -368,7 +368,7 @@ acpi_ev_match_prw_and_gpe(acpi_handle obj_handle,
368 u32 gpe_number; 368 u32 gpe_number;
369 acpi_status status; 369 acpi_status status;
370 370
371 ACPI_FUNCTION_TRACE("ev_match_prw_and_gpe"); 371 ACPI_FUNCTION_TRACE(ev_match_prw_and_gpe);
372 372
373 /* Check for a _PRW method under this device */ 373 /* Check for a _PRW method under this device */
374 374
@@ -489,7 +489,7 @@ static struct acpi_gpe_xrupt_info *acpi_ev_get_gpe_xrupt_block(u32
489 acpi_status status; 489 acpi_status status;
490 acpi_cpu_flags flags; 490 acpi_cpu_flags flags;
491 491
492 ACPI_FUNCTION_TRACE("ev_get_gpe_xrupt_block"); 492 ACPI_FUNCTION_TRACE(ev_get_gpe_xrupt_block);
493 493
494 /* No need for lock since we are not changing any list elements here */ 494 /* No need for lock since we are not changing any list elements here */
495 495
@@ -563,7 +563,7 @@ acpi_ev_delete_gpe_xrupt(struct acpi_gpe_xrupt_info *gpe_xrupt)
563 acpi_status status; 563 acpi_status status;
564 acpi_cpu_flags flags; 564 acpi_cpu_flags flags;
565 565
566 ACPI_FUNCTION_TRACE("ev_delete_gpe_xrupt"); 566 ACPI_FUNCTION_TRACE(ev_delete_gpe_xrupt);
567 567
568 /* We never want to remove the SCI interrupt handler */ 568 /* We never want to remove the SCI interrupt handler */
569 569
@@ -621,7 +621,7 @@ acpi_ev_install_gpe_block(struct acpi_gpe_block_info *gpe_block,
621 acpi_status status; 621 acpi_status status;
622 acpi_cpu_flags flags; 622 acpi_cpu_flags flags;
623 623
624 ACPI_FUNCTION_TRACE("ev_install_gpe_block"); 624 ACPI_FUNCTION_TRACE(ev_install_gpe_block);
625 625
626 status = acpi_ut_acquire_mutex(ACPI_MTX_EVENTS); 626 status = acpi_ut_acquire_mutex(ACPI_MTX_EVENTS);
627 if (ACPI_FAILURE(status)) { 627 if (ACPI_FAILURE(status)) {
@@ -674,7 +674,7 @@ acpi_status acpi_ev_delete_gpe_block(struct acpi_gpe_block_info *gpe_block)
674 acpi_status status; 674 acpi_status status;
675 acpi_cpu_flags flags; 675 acpi_cpu_flags flags;
676 676
677 ACPI_FUNCTION_TRACE("ev_install_gpe_block"); 677 ACPI_FUNCTION_TRACE(ev_install_gpe_block);
678 678
679 status = acpi_ut_acquire_mutex(ACPI_MTX_EVENTS); 679 status = acpi_ut_acquire_mutex(ACPI_MTX_EVENTS);
680 if (ACPI_FAILURE(status)) { 680 if (ACPI_FAILURE(status)) {
@@ -744,7 +744,7 @@ acpi_ev_create_gpe_info_blocks(struct acpi_gpe_block_info *gpe_block)
744 acpi_native_uint j; 744 acpi_native_uint j;
745 acpi_status status; 745 acpi_status status;
746 746
747 ACPI_FUNCTION_TRACE("ev_create_gpe_info_blocks"); 747 ACPI_FUNCTION_TRACE(ev_create_gpe_info_blocks);
748 748
749 /* Allocate the GPE register information block */ 749 /* Allocate the GPE register information block */
750 750
@@ -754,7 +754,7 @@ acpi_ev_create_gpe_info_blocks(struct acpi_gpe_block_info *gpe_block)
754 acpi_gpe_register_info)); 754 acpi_gpe_register_info));
755 if (!gpe_register_info) { 755 if (!gpe_register_info) {
756 ACPI_ERROR((AE_INFO, 756 ACPI_ERROR((AE_INFO,
757 "Could not allocate the gpe_register_info table")); 757 "Could not allocate the GpeRegisterInfo table"));
758 return_ACPI_STATUS(AE_NO_MEMORY); 758 return_ACPI_STATUS(AE_NO_MEMORY);
759 } 759 }
760 760
@@ -769,7 +769,7 @@ acpi_ev_create_gpe_info_blocks(struct acpi_gpe_block_info *gpe_block)
769 acpi_gpe_event_info)); 769 acpi_gpe_event_info));
770 if (!gpe_event_info) { 770 if (!gpe_event_info) {
771 ACPI_ERROR((AE_INFO, 771 ACPI_ERROR((AE_INFO,
772 "Could not allocate the gpe_event_info table")); 772 "Could not allocate the GpeEventInfo table"));
773 status = AE_NO_MEMORY; 773 status = AE_NO_MEMORY;
774 goto error_exit; 774 goto error_exit;
775 } 775 }
@@ -888,7 +888,7 @@ acpi_ev_create_gpe_block(struct acpi_namespace_node *gpe_device,
888 acpi_status status; 888 acpi_status status;
889 struct acpi_gpe_block_info *gpe_block; 889 struct acpi_gpe_block_info *gpe_block;
890 890
891 ACPI_FUNCTION_TRACE("ev_create_gpe_block"); 891 ACPI_FUNCTION_TRACE(ev_create_gpe_block);
892 892
893 if (!register_count) { 893 if (!register_count) {
894 return_ACPI_STATUS(AE_OK); 894 return_ACPI_STATUS(AE_OK);
@@ -981,7 +981,7 @@ acpi_ev_initialize_gpe_block(struct acpi_namespace_node *gpe_device,
981 acpi_native_uint i; 981 acpi_native_uint i;
982 acpi_native_uint j; 982 acpi_native_uint j;
983 983
984 ACPI_FUNCTION_TRACE("ev_initialize_gpe_block"); 984 ACPI_FUNCTION_TRACE(ev_initialize_gpe_block);
985 985
986 /* Ignore a null GPE block (e.g., if no GPE block 1 exists) */ 986 /* Ignore a null GPE block (e.g., if no GPE block 1 exists) */
987 987
@@ -1051,7 +1051,7 @@ acpi_ev_initialize_gpe_block(struct acpi_namespace_node *gpe_device,
1051 1051
1052 status = acpi_hw_enable_runtime_gpe_block(NULL, gpe_block); 1052 status = acpi_hw_enable_runtime_gpe_block(NULL, gpe_block);
1053 if (ACPI_FAILURE(status)) { 1053 if (ACPI_FAILURE(status)) {
1054 ACPI_ERROR((AE_INFO, "Could not enable GPEs in gpe_block %p", 1054 ACPI_ERROR((AE_INFO, "Could not enable GPEs in GpeBlock %p",
1055 gpe_block)); 1055 gpe_block));
1056 } 1056 }
1057 1057
@@ -1077,7 +1077,7 @@ acpi_status acpi_ev_gpe_initialize(void)
1077 u32 gpe_number_max = 0; 1077 u32 gpe_number_max = 0;
1078 acpi_status status; 1078 acpi_status status;
1079 1079
1080 ACPI_FUNCTION_TRACE("ev_gpe_initialize"); 1080 ACPI_FUNCTION_TRACE(ev_gpe_initialize);
1081 1081
1082 status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE); 1082 status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
1083 if (ACPI_FAILURE(status)) { 1083 if (ACPI_FAILURE(status)) {
diff --git a/drivers/acpi/events/evmisc.c b/drivers/acpi/events/evmisc.c
index b216b3229e27..97e05481aa7c 100644
--- a/drivers/acpi/events/evmisc.c
+++ b/drivers/acpi/events/evmisc.c
@@ -124,7 +124,7 @@ acpi_ev_queue_notify_request(struct acpi_namespace_node * node,
124 union acpi_generic_state *notify_info; 124 union acpi_generic_state *notify_info;
125 acpi_status status = AE_OK; 125 acpi_status status = AE_OK;
126 126
127 ACPI_FUNCTION_NAME("ev_queue_notify_request"); 127 ACPI_FUNCTION_NAME(ev_queue_notify_request);
128 128
129 /* 129 /*
130 * For value 3 (Ejection Request), some device method may need to be run. 130 * For value 3 (Ejection Request), some device method may need to be run.
@@ -376,7 +376,7 @@ acpi_status acpi_ev_init_global_lock_handler(void)
376{ 376{
377 acpi_status status; 377 acpi_status status;
378 378
379 ACPI_FUNCTION_TRACE("ev_init_global_lock_handler"); 379 ACPI_FUNCTION_TRACE(ev_init_global_lock_handler);
380 380
381 acpi_gbl_global_lock_present = TRUE; 381 acpi_gbl_global_lock_present = TRUE;
382 status = acpi_install_fixed_event_handler(ACPI_EVENT_GLOBAL, 382 status = acpi_install_fixed_event_handler(ACPI_EVENT_GLOBAL,
@@ -418,7 +418,7 @@ acpi_status acpi_ev_acquire_global_lock(u16 timeout)
418 acpi_status status = AE_OK; 418 acpi_status status = AE_OK;
419 u8 acquired = FALSE; 419 u8 acquired = FALSE;
420 420
421 ACPI_FUNCTION_TRACE("ev_acquire_global_lock"); 421 ACPI_FUNCTION_TRACE(ev_acquire_global_lock);
422 422
423#ifndef ACPI_APPLICATION 423#ifndef ACPI_APPLICATION
424 /* Make sure that we actually have a global lock */ 424 /* Make sure that we actually have a global lock */
@@ -486,7 +486,7 @@ acpi_status acpi_ev_release_global_lock(void)
486 u8 pending = FALSE; 486 u8 pending = FALSE;
487 acpi_status status = AE_OK; 487 acpi_status status = AE_OK;
488 488
489 ACPI_FUNCTION_TRACE("ev_release_global_lock"); 489 ACPI_FUNCTION_TRACE(ev_release_global_lock);
490 490
491 if (!acpi_gbl_global_lock_thread_count) { 491 if (!acpi_gbl_global_lock_thread_count) {
492 ACPI_WARNING((AE_INFO, 492 ACPI_WARNING((AE_INFO,
@@ -540,7 +540,7 @@ void acpi_ev_terminate(void)
540 acpi_native_uint i; 540 acpi_native_uint i;
541 acpi_status status; 541 acpi_status status;
542 542
543 ACPI_FUNCTION_TRACE("ev_terminate"); 543 ACPI_FUNCTION_TRACE(ev_terminate);
544 544
545 if (acpi_gbl_events_initialized) { 545 if (acpi_gbl_events_initialized) {
546 /* 546 /*
@@ -580,7 +580,7 @@ void acpi_ev_terminate(void)
580 if (acpi_gbl_original_mode == ACPI_SYS_MODE_LEGACY) { 580 if (acpi_gbl_original_mode == ACPI_SYS_MODE_LEGACY) {
581 status = acpi_disable(); 581 status = acpi_disable();
582 if (ACPI_FAILURE(status)) { 582 if (ACPI_FAILURE(status)) {
583 ACPI_WARNING((AE_INFO, "acpi_disable failed")); 583 ACPI_WARNING((AE_INFO, "AcpiDisable failed"));
584 } 584 }
585 } 585 }
586 return_VOID; 586 return_VOID;
diff --git a/drivers/acpi/events/evregion.c b/drivers/acpi/events/evregion.c
index 0337ad222b26..eb29e96f053c 100644
--- a/drivers/acpi/events/evregion.c
+++ b/drivers/acpi/events/evregion.c
@@ -83,7 +83,7 @@ acpi_status acpi_ev_install_region_handlers(void)
83 acpi_status status; 83 acpi_status status;
84 acpi_native_uint i; 84 acpi_native_uint i;
85 85
86 ACPI_FUNCTION_TRACE("ev_install_region_handlers"); 86 ACPI_FUNCTION_TRACE(ev_install_region_handlers);
87 87
88 status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE); 88 status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
89 if (ACPI_FAILURE(status)) { 89 if (ACPI_FAILURE(status)) {
@@ -153,7 +153,7 @@ acpi_status acpi_ev_initialize_op_regions(void)
153 acpi_status status; 153 acpi_status status;
154 acpi_native_uint i; 154 acpi_native_uint i;
155 155
156 ACPI_FUNCTION_TRACE("ev_initialize_op_regions"); 156 ACPI_FUNCTION_TRACE(ev_initialize_op_regions);
157 157
158 status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE); 158 status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
159 if (ACPI_FAILURE(status)) { 159 if (ACPI_FAILURE(status)) {
@@ -198,7 +198,7 @@ acpi_ev_execute_reg_method(union acpi_operand_object *region_obj, u32 function)
198 union acpi_operand_object *region_obj2; 198 union acpi_operand_object *region_obj2;
199 acpi_status status; 199 acpi_status status;
200 200
201 ACPI_FUNCTION_TRACE("ev_execute_reg_method"); 201 ACPI_FUNCTION_TRACE(ev_execute_reg_method);
202 202
203 region_obj2 = acpi_ns_get_secondary_object(region_obj); 203 region_obj2 = acpi_ns_get_secondary_object(region_obj);
204 if (!region_obj2) { 204 if (!region_obj2) {
@@ -284,7 +284,7 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
284 union acpi_operand_object *region_obj2; 284 union acpi_operand_object *region_obj2;
285 void *region_context = NULL; 285 void *region_context = NULL;
286 286
287 ACPI_FUNCTION_TRACE("ev_address_space_dispatch"); 287 ACPI_FUNCTION_TRACE(ev_address_space_dispatch);
288 288
289 region_obj2 = acpi_ns_get_secondary_object(region_obj); 289 region_obj2 = acpi_ns_get_secondary_object(region_obj);
290 if (!region_obj2) { 290 if (!region_obj2) {
@@ -451,7 +451,7 @@ acpi_ev_detach_region(union acpi_operand_object *region_obj,
451 union acpi_operand_object *region_obj2; 451 union acpi_operand_object *region_obj2;
452 acpi_status status; 452 acpi_status status;
453 453
454 ACPI_FUNCTION_TRACE("ev_detach_region"); 454 ACPI_FUNCTION_TRACE(ev_detach_region);
455 455
456 region_obj2 = acpi_ns_get_secondary_object(region_obj); 456 region_obj2 = acpi_ns_get_secondary_object(region_obj);
457 if (!region_obj2) { 457 if (!region_obj2) {
@@ -585,7 +585,7 @@ acpi_ev_attach_region(union acpi_operand_object *handler_obj,
585 u8 acpi_ns_is_locked) 585 u8 acpi_ns_is_locked)
586{ 586{
587 587
588 ACPI_FUNCTION_TRACE("ev_attach_region"); 588 ACPI_FUNCTION_TRACE(ev_attach_region);
589 589
590 ACPI_DEBUG_PRINT((ACPI_DB_OPREGION, 590 ACPI_DEBUG_PRINT((ACPI_DB_OPREGION,
591 "Adding Region [%4.4s] %p to address handler %p [%s]\n", 591 "Adding Region [%4.4s] %p to address handler %p [%s]\n",
@@ -638,7 +638,7 @@ acpi_ev_install_handler(acpi_handle obj_handle,
638 struct acpi_namespace_node *node; 638 struct acpi_namespace_node *node;
639 acpi_status status; 639 acpi_status status;
640 640
641 ACPI_FUNCTION_NAME("ev_install_handler"); 641 ACPI_FUNCTION_NAME(ev_install_handler);
642 642
643 handler_obj = (union acpi_operand_object *)context; 643 handler_obj = (union acpi_operand_object *)context;
644 644
@@ -771,7 +771,7 @@ acpi_ev_install_space_handler(struct acpi_namespace_node * node,
771 acpi_object_type type; 771 acpi_object_type type;
772 u8 flags = 0; 772 u8 flags = 0;
773 773
774 ACPI_FUNCTION_TRACE("ev_install_space_handler"); 774 ACPI_FUNCTION_TRACE(ev_install_space_handler);
775 775
776 /* 776 /*
777 * This registration is valid for only the types below 777 * This registration is valid for only the types below
@@ -985,7 +985,7 @@ acpi_ev_execute_reg_methods(struct acpi_namespace_node *node,
985{ 985{
986 acpi_status status; 986 acpi_status status;
987 987
988 ACPI_FUNCTION_TRACE("ev_execute_reg_methods"); 988 ACPI_FUNCTION_TRACE(ev_execute_reg_methods);
989 989
990 /* 990 /*
991 * Run all _REG methods for all Operation Regions for this 991 * Run all _REG methods for all Operation Regions for this
diff --git a/drivers/acpi/events/evrgnini.c b/drivers/acpi/events/evrgnini.c
index d1809f4240a4..1cecd577b899 100644
--- a/drivers/acpi/events/evrgnini.c
+++ b/drivers/acpi/events/evrgnini.c
@@ -71,7 +71,7 @@ acpi_ev_system_memory_region_setup(acpi_handle handle,
71 (union acpi_operand_object *)handle; 71 (union acpi_operand_object *)handle;
72 struct acpi_mem_space_context *local_region_context; 72 struct acpi_mem_space_context *local_region_context;
73 73
74 ACPI_FUNCTION_TRACE("ev_system_memory_region_setup"); 74 ACPI_FUNCTION_TRACE(ev_system_memory_region_setup);
75 75
76 if (function == ACPI_REGION_DEACTIVATE) { 76 if (function == ACPI_REGION_DEACTIVATE) {
77 if (*region_context) { 77 if (*region_context) {
@@ -129,7 +129,7 @@ acpi_ev_io_space_region_setup(acpi_handle handle,
129 u32 function, 129 u32 function,
130 void *handler_context, void **region_context) 130 void *handler_context, void **region_context)
131{ 131{
132 ACPI_FUNCTION_TRACE("ev_io_space_region_setup"); 132 ACPI_FUNCTION_TRACE(ev_io_space_region_setup);
133 133
134 if (function == ACPI_REGION_DEACTIVATE) { 134 if (function == ACPI_REGION_DEACTIVATE) {
135 *region_context = NULL; 135 *region_context = NULL;
@@ -172,7 +172,7 @@ acpi_ev_pci_config_region_setup(acpi_handle handle,
172 (union acpi_operand_object *)handle; 172 (union acpi_operand_object *)handle;
173 struct acpi_device_id object_hID; 173 struct acpi_device_id object_hID;
174 174
175 ACPI_FUNCTION_TRACE("ev_pci_config_region_setup"); 175 ACPI_FUNCTION_TRACE(ev_pci_config_region_setup);
176 176
177 handler_obj = region_obj->region.handler; 177 handler_obj = region_obj->region.handler;
178 if (!handler_obj) { 178 if (!handler_obj) {
@@ -248,7 +248,7 @@ acpi_ev_pci_config_region_setup(acpi_handle handle,
248 } else { 248 } else {
249 ACPI_EXCEPTION((AE_INFO, 249 ACPI_EXCEPTION((AE_INFO,
250 status, 250 status,
251 "Could not install pci_config handler for Root Bridge %4.4s", 251 "Could not install PciConfig handler for Root Bridge %4.4s",
252 acpi_ut_get_node_name 252 acpi_ut_get_node_name
253 (pci_root_node))); 253 (pci_root_node)));
254 } 254 }
@@ -350,7 +350,7 @@ acpi_ev_pci_bar_region_setup(acpi_handle handle,
350 u32 function, 350 u32 function,
351 void *handler_context, void **region_context) 351 void *handler_context, void **region_context)
352{ 352{
353 ACPI_FUNCTION_TRACE("ev_pci_bar_region_setup"); 353 ACPI_FUNCTION_TRACE(ev_pci_bar_region_setup);
354 354
355 return_ACPI_STATUS(AE_OK); 355 return_ACPI_STATUS(AE_OK);
356} 356}
@@ -377,7 +377,7 @@ acpi_ev_cmos_region_setup(acpi_handle handle,
377 u32 function, 377 u32 function,
378 void *handler_context, void **region_context) 378 void *handler_context, void **region_context)
379{ 379{
380 ACPI_FUNCTION_TRACE("ev_cmos_region_setup"); 380 ACPI_FUNCTION_TRACE(ev_cmos_region_setup);
381 381
382 return_ACPI_STATUS(AE_OK); 382 return_ACPI_STATUS(AE_OK);
383} 383}
@@ -402,7 +402,7 @@ acpi_ev_default_region_setup(acpi_handle handle,
402 u32 function, 402 u32 function,
403 void *handler_context, void **region_context) 403 void *handler_context, void **region_context)
404{ 404{
405 ACPI_FUNCTION_TRACE("ev_default_region_setup"); 405 ACPI_FUNCTION_TRACE(ev_default_region_setup);
406 406
407 if (function == ACPI_REGION_DEACTIVATE) { 407 if (function == ACPI_REGION_DEACTIVATE) {
408 *region_context = NULL; 408 *region_context = NULL;
@@ -448,7 +448,7 @@ acpi_ev_initialize_region(union acpi_operand_object *region_obj,
448 acpi_name *reg_name_ptr = (acpi_name *) METHOD_NAME__REG; 448 acpi_name *reg_name_ptr = (acpi_name *) METHOD_NAME__REG;
449 union acpi_operand_object *region_obj2; 449 union acpi_operand_object *region_obj2;
450 450
451 ACPI_FUNCTION_TRACE_U32("ev_initialize_region", acpi_ns_locked); 451 ACPI_FUNCTION_TRACE_U32(ev_initialize_region, acpi_ns_locked);
452 452
453 if (!region_obj) { 453 if (!region_obj) {
454 return_ACPI_STATUS(AE_BAD_PARAMETER); 454 return_ACPI_STATUS(AE_BAD_PARAMETER);
@@ -588,7 +588,7 @@ acpi_ev_initialize_region(union acpi_operand_object *region_obj,
588 /* If we get here, there is no handler for this region */ 588 /* If we get here, there is no handler for this region */
589 589
590 ACPI_DEBUG_PRINT((ACPI_DB_OPREGION, 590 ACPI_DEBUG_PRINT((ACPI_DB_OPREGION,
591 "No handler for region_type %s(%X) (region_obj %p)\n", 591 "No handler for RegionType %s(%X) (RegionObj %p)\n",
592 acpi_ut_get_region_name(space_id), space_id, 592 acpi_ut_get_region_name(space_id), space_id,
593 region_obj)); 593 region_obj));
594 594
diff --git a/drivers/acpi/events/evsci.c b/drivers/acpi/events/evsci.c
index 9a622169008a..8106215ad554 100644
--- a/drivers/acpi/events/evsci.c
+++ b/drivers/acpi/events/evsci.c
@@ -69,7 +69,7 @@ static u32 ACPI_SYSTEM_XFACE acpi_ev_sci_xrupt_handler(void *context)
69 struct acpi_gpe_xrupt_info *gpe_xrupt_list = context; 69 struct acpi_gpe_xrupt_info *gpe_xrupt_list = context;
70 u32 interrupt_handled = ACPI_INTERRUPT_NOT_HANDLED; 70 u32 interrupt_handled = ACPI_INTERRUPT_NOT_HANDLED;
71 71
72 ACPI_FUNCTION_TRACE("ev_sci_xrupt_handler"); 72 ACPI_FUNCTION_TRACE(ev_sci_xrupt_handler);
73 73
74 /* 74 /*
75 * We are guaranteed by the ACPI CA initialization/shutdown code that 75 * We are guaranteed by the ACPI CA initialization/shutdown code that
@@ -108,7 +108,7 @@ u32 ACPI_SYSTEM_XFACE acpi_ev_gpe_xrupt_handler(void *context)
108 struct acpi_gpe_xrupt_info *gpe_xrupt_list = context; 108 struct acpi_gpe_xrupt_info *gpe_xrupt_list = context;
109 u32 interrupt_handled = ACPI_INTERRUPT_NOT_HANDLED; 109 u32 interrupt_handled = ACPI_INTERRUPT_NOT_HANDLED;
110 110
111 ACPI_FUNCTION_TRACE("ev_gpe_xrupt_handler"); 111 ACPI_FUNCTION_TRACE(ev_gpe_xrupt_handler);
112 112
113 /* 113 /*
114 * We are guaranteed by the ACPI CA initialization/shutdown code that 114 * We are guaranteed by the ACPI CA initialization/shutdown code that
@@ -140,7 +140,7 @@ u32 acpi_ev_install_sci_handler(void)
140{ 140{
141 u32 status = AE_OK; 141 u32 status = AE_OK;
142 142
143 ACPI_FUNCTION_TRACE("ev_install_sci_handler"); 143 ACPI_FUNCTION_TRACE(ev_install_sci_handler);
144 144
145 status = acpi_os_install_interrupt_handler((u32) acpi_gbl_FADT->sci_int, 145 status = acpi_os_install_interrupt_handler((u32) acpi_gbl_FADT->sci_int,
146 acpi_ev_sci_xrupt_handler, 146 acpi_ev_sci_xrupt_handler,
@@ -171,7 +171,7 @@ acpi_status acpi_ev_remove_sci_handler(void)
171{ 171{
172 acpi_status status; 172 acpi_status status;
173 173
174 ACPI_FUNCTION_TRACE("ev_remove_sci_handler"); 174 ACPI_FUNCTION_TRACE(ev_remove_sci_handler);
175 175
176 /* Just let the OS remove the handler and disable the level */ 176 /* Just let the OS remove the handler and disable the level */
177 177
diff --git a/drivers/acpi/events/evxface.c b/drivers/acpi/events/evxface.c
index 7d1cebc871f6..76c34a66e0e0 100644
--- a/drivers/acpi/events/evxface.c
+++ b/drivers/acpi/events/evxface.c
@@ -66,7 +66,7 @@ acpi_status acpi_install_exception_handler(acpi_exception_handler handler)
66{ 66{
67 acpi_status status; 67 acpi_status status;
68 68
69 ACPI_FUNCTION_TRACE("acpi_install_exception_handler"); 69 ACPI_FUNCTION_TRACE(acpi_install_exception_handler);
70 70
71 status = acpi_ut_acquire_mutex(ACPI_MTX_EVENTS); 71 status = acpi_ut_acquire_mutex(ACPI_MTX_EVENTS);
72 if (ACPI_FAILURE(status)) { 72 if (ACPI_FAILURE(status)) {
@@ -113,7 +113,7 @@ acpi_install_fixed_event_handler(u32 event,
113{ 113{
114 acpi_status status; 114 acpi_status status;
115 115
116 ACPI_FUNCTION_TRACE("acpi_install_fixed_event_handler"); 116 ACPI_FUNCTION_TRACE(acpi_install_fixed_event_handler);
117 117
118 /* Parameter validation */ 118 /* Parameter validation */
119 119
@@ -179,7 +179,7 @@ acpi_remove_fixed_event_handler(u32 event, acpi_event_handler handler)
179{ 179{
180 acpi_status status = AE_OK; 180 acpi_status status = AE_OK;
181 181
182 ACPI_FUNCTION_TRACE("acpi_remove_fixed_event_handler"); 182 ACPI_FUNCTION_TRACE(acpi_remove_fixed_event_handler);
183 183
184 /* Parameter validation */ 184 /* Parameter validation */
185 185
@@ -243,7 +243,7 @@ acpi_install_notify_handler(acpi_handle device,
243 struct acpi_namespace_node *node; 243 struct acpi_namespace_node *node;
244 acpi_status status; 244 acpi_status status;
245 245
246 ACPI_FUNCTION_TRACE("acpi_install_notify_handler"); 246 ACPI_FUNCTION_TRACE(acpi_install_notify_handler);
247 247
248 /* Parameter validation */ 248 /* Parameter validation */
249 249
@@ -408,7 +408,7 @@ acpi_remove_notify_handler(acpi_handle device,
408 struct acpi_namespace_node *node; 408 struct acpi_namespace_node *node;
409 acpi_status status; 409 acpi_status status;
410 410
411 ACPI_FUNCTION_TRACE("acpi_remove_notify_handler"); 411 ACPI_FUNCTION_TRACE(acpi_remove_notify_handler);
412 412
413 /* Parameter validation */ 413 /* Parameter validation */
414 414
@@ -563,7 +563,7 @@ acpi_install_gpe_handler(acpi_handle gpe_device,
563 acpi_status status; 563 acpi_status status;
564 acpi_cpu_flags flags; 564 acpi_cpu_flags flags;
565 565
566 ACPI_FUNCTION_TRACE("acpi_install_gpe_handler"); 566 ACPI_FUNCTION_TRACE(acpi_install_gpe_handler);
567 567
568 /* Parameter validation */ 568 /* Parameter validation */
569 569
@@ -653,7 +653,7 @@ acpi_remove_gpe_handler(acpi_handle gpe_device,
653 acpi_status status; 653 acpi_status status;
654 acpi_cpu_flags flags; 654 acpi_cpu_flags flags;
655 655
656 ACPI_FUNCTION_TRACE("acpi_remove_gpe_handler"); 656 ACPI_FUNCTION_TRACE(acpi_remove_gpe_handler);
657 657
658 /* Parameter validation */ 658 /* Parameter validation */
659 659
diff --git a/drivers/acpi/events/evxfevnt.c b/drivers/acpi/events/evxfevnt.c
index 4a36559fa816..7ebc2efac936 100644
--- a/drivers/acpi/events/evxfevnt.c
+++ b/drivers/acpi/events/evxfevnt.c
@@ -63,7 +63,7 @@ acpi_status acpi_enable(void)
63{ 63{
64 acpi_status status = AE_OK; 64 acpi_status status = AE_OK;
65 65
66 ACPI_FUNCTION_TRACE("acpi_enable"); 66 ACPI_FUNCTION_TRACE(acpi_enable);
67 67
68 /* Make sure we have the FADT */ 68 /* Make sure we have the FADT */
69 69
@@ -109,7 +109,7 @@ acpi_status acpi_disable(void)
109{ 109{
110 acpi_status status = AE_OK; 110 acpi_status status = AE_OK;
111 111
112 ACPI_FUNCTION_TRACE("acpi_disable"); 112 ACPI_FUNCTION_TRACE(acpi_disable);
113 113
114 if (!acpi_gbl_FADT) { 114 if (!acpi_gbl_FADT) {
115 ACPI_WARNING((AE_INFO, "No FADT information present!")); 115 ACPI_WARNING((AE_INFO, "No FADT information present!"));
@@ -155,7 +155,7 @@ acpi_status acpi_enable_event(u32 event, u32 flags)
155 acpi_status status = AE_OK; 155 acpi_status status = AE_OK;
156 u32 value; 156 u32 value;
157 157
158 ACPI_FUNCTION_TRACE("acpi_enable_event"); 158 ACPI_FUNCTION_TRACE(acpi_enable_event);
159 159
160 /* Decode the Fixed Event */ 160 /* Decode the Fixed Event */
161 161
@@ -213,7 +213,7 @@ acpi_status acpi_set_gpe_type(acpi_handle gpe_device, u32 gpe_number, u8 type)
213 acpi_status status = AE_OK; 213 acpi_status status = AE_OK;
214 struct acpi_gpe_event_info *gpe_event_info; 214 struct acpi_gpe_event_info *gpe_event_info;
215 215
216 ACPI_FUNCTION_TRACE("acpi_set_gpe_type"); 216 ACPI_FUNCTION_TRACE(acpi_set_gpe_type);
217 217
218 /* Ensure that we have a valid GPE number */ 218 /* Ensure that we have a valid GPE number */
219 219
@@ -256,7 +256,7 @@ acpi_status acpi_enable_gpe(acpi_handle gpe_device, u32 gpe_number, u32 flags)
256 acpi_status status = AE_OK; 256 acpi_status status = AE_OK;
257 struct acpi_gpe_event_info *gpe_event_info; 257 struct acpi_gpe_event_info *gpe_event_info;
258 258
259 ACPI_FUNCTION_TRACE("acpi_enable_gpe"); 259 ACPI_FUNCTION_TRACE(acpi_enable_gpe);
260 260
261 /* Use semaphore lock if not executing at interrupt level */ 261 /* Use semaphore lock if not executing at interrupt level */
262 262
@@ -307,7 +307,7 @@ acpi_status acpi_disable_gpe(acpi_handle gpe_device, u32 gpe_number, u32 flags)
307 acpi_status status = AE_OK; 307 acpi_status status = AE_OK;
308 struct acpi_gpe_event_info *gpe_event_info; 308 struct acpi_gpe_event_info *gpe_event_info;
309 309
310 ACPI_FUNCTION_TRACE("acpi_disable_gpe"); 310 ACPI_FUNCTION_TRACE(acpi_disable_gpe);
311 311
312 /* Use semaphore lock if not executing at interrupt level */ 312 /* Use semaphore lock if not executing at interrupt level */
313 313
@@ -354,7 +354,7 @@ acpi_status acpi_disable_event(u32 event, u32 flags)
354 acpi_status status = AE_OK; 354 acpi_status status = AE_OK;
355 u32 value; 355 u32 value;
356 356
357 ACPI_FUNCTION_TRACE("acpi_disable_event"); 357 ACPI_FUNCTION_TRACE(acpi_disable_event);
358 358
359 /* Decode the Fixed Event */ 359 /* Decode the Fixed Event */
360 360
@@ -407,7 +407,7 @@ acpi_status acpi_clear_event(u32 event)
407{ 407{
408 acpi_status status = AE_OK; 408 acpi_status status = AE_OK;
409 409
410 ACPI_FUNCTION_TRACE("acpi_clear_event"); 410 ACPI_FUNCTION_TRACE(acpi_clear_event);
411 411
412 /* Decode the Fixed Event */ 412 /* Decode the Fixed Event */
413 413
@@ -446,7 +446,7 @@ acpi_status acpi_clear_gpe(acpi_handle gpe_device, u32 gpe_number, u32 flags)
446 acpi_status status = AE_OK; 446 acpi_status status = AE_OK;
447 struct acpi_gpe_event_info *gpe_event_info; 447 struct acpi_gpe_event_info *gpe_event_info;
448 448
449 ACPI_FUNCTION_TRACE("acpi_clear_gpe"); 449 ACPI_FUNCTION_TRACE(acpi_clear_gpe);
450 450
451 /* Use semaphore lock if not executing at interrupt level */ 451 /* Use semaphore lock if not executing at interrupt level */
452 452
@@ -494,7 +494,7 @@ acpi_status acpi_get_event_status(u32 event, acpi_event_status * event_status)
494{ 494{
495 acpi_status status = AE_OK; 495 acpi_status status = AE_OK;
496 496
497 ACPI_FUNCTION_TRACE("acpi_get_event_status"); 497 ACPI_FUNCTION_TRACE(acpi_get_event_status);
498 498
499 if (!event_status) { 499 if (!event_status) {
500 return_ACPI_STATUS(AE_BAD_PARAMETER); 500 return_ACPI_STATUS(AE_BAD_PARAMETER);
@@ -539,7 +539,7 @@ acpi_get_gpe_status(acpi_handle gpe_device,
539 acpi_status status = AE_OK; 539 acpi_status status = AE_OK;
540 struct acpi_gpe_event_info *gpe_event_info; 540 struct acpi_gpe_event_info *gpe_event_info;
541 541
542 ACPI_FUNCTION_TRACE("acpi_get_gpe_status"); 542 ACPI_FUNCTION_TRACE(acpi_get_gpe_status);
543 543
544 /* Use semaphore lock if not executing at interrupt level */ 544 /* Use semaphore lock if not executing at interrupt level */
545 545
@@ -596,7 +596,7 @@ acpi_install_gpe_block(acpi_handle gpe_device,
596 struct acpi_namespace_node *node; 596 struct acpi_namespace_node *node;
597 struct acpi_gpe_block_info *gpe_block; 597 struct acpi_gpe_block_info *gpe_block;
598 598
599 ACPI_FUNCTION_TRACE("acpi_install_gpe_block"); 599 ACPI_FUNCTION_TRACE(acpi_install_gpe_block);
600 600
601 if ((!gpe_device) || (!gpe_block_address) || (!register_count)) { 601 if ((!gpe_device) || (!gpe_block_address) || (!register_count)) {
602 return_ACPI_STATUS(AE_BAD_PARAMETER); 602 return_ACPI_STATUS(AE_BAD_PARAMETER);
@@ -684,7 +684,7 @@ acpi_status acpi_remove_gpe_block(acpi_handle gpe_device)
684 acpi_status status; 684 acpi_status status;
685 struct acpi_namespace_node *node; 685 struct acpi_namespace_node *node;
686 686
687 ACPI_FUNCTION_TRACE("acpi_remove_gpe_block"); 687 ACPI_FUNCTION_TRACE(acpi_remove_gpe_block);
688 688
689 if (!gpe_device) { 689 if (!gpe_device) {
690 return_ACPI_STATUS(AE_BAD_PARAMETER); 690 return_ACPI_STATUS(AE_BAD_PARAMETER);
diff --git a/drivers/acpi/events/evxfregn.c b/drivers/acpi/events/evxfregn.c
index 63a070bb9d17..e8b86a0baad0 100644
--- a/drivers/acpi/events/evxfregn.c
+++ b/drivers/acpi/events/evxfregn.c
@@ -73,7 +73,7 @@ acpi_install_address_space_handler(acpi_handle device,
73 struct acpi_namespace_node *node; 73 struct acpi_namespace_node *node;
74 acpi_status status; 74 acpi_status status;
75 75
76 ACPI_FUNCTION_TRACE("acpi_install_address_space_handler"); 76 ACPI_FUNCTION_TRACE(acpi_install_address_space_handler);
77 77
78 /* Parameter validation */ 78 /* Parameter validation */
79 79
@@ -139,7 +139,7 @@ acpi_remove_address_space_handler(acpi_handle device,
139 struct acpi_namespace_node *node; 139 struct acpi_namespace_node *node;
140 acpi_status status; 140 acpi_status status;
141 141
142 ACPI_FUNCTION_TRACE("acpi_remove_address_space_handler"); 142 ACPI_FUNCTION_TRACE(acpi_remove_address_space_handler);
143 143
144 /* Parameter validation */ 144 /* Parameter validation */
145 145
@@ -228,7 +228,7 @@ acpi_remove_address_space_handler(acpi_handle device,
228 /* The handler does not exist */ 228 /* The handler does not exist */
229 229
230 ACPI_DEBUG_PRINT((ACPI_DB_OPREGION, 230 ACPI_DEBUG_PRINT((ACPI_DB_OPREGION,
231 "Unable to remove address handler %p for %s(%X), dev_node %p, obj %p\n", 231 "Unable to remove address handler %p for %s(%X), DevNode %p, obj %p\n",
232 handler, acpi_ut_get_region_name(space_id), space_id, 232 handler, acpi_ut_get_region_name(space_id), space_id,
233 node, obj_desc)); 233 node, obj_desc));
234 234
diff --git a/drivers/acpi/executer/exconfig.c b/drivers/acpi/executer/exconfig.c
index e0deffb56790..9c46f3338640 100644
--- a/drivers/acpi/executer/exconfig.c
+++ b/drivers/acpi/executer/exconfig.c
@@ -82,7 +82,7 @@ acpi_ex_add_table(struct acpi_table_header *table,
82 struct acpi_table_desc table_info; 82 struct acpi_table_desc table_info;
83 union acpi_operand_object *obj_desc; 83 union acpi_operand_object *obj_desc;
84 84
85 ACPI_FUNCTION_TRACE("ex_add_table"); 85 ACPI_FUNCTION_TRACE(ex_add_table);
86 86
87 /* Create an object to be the table handle */ 87 /* Create an object to be the table handle */
88 88
@@ -100,7 +100,7 @@ acpi_ex_add_table(struct acpi_table_header *table,
100 100
101 ACPI_MEMSET(&table_info, 0, sizeof(struct acpi_table_desc)); 101 ACPI_MEMSET(&table_info, 0, sizeof(struct acpi_table_desc));
102 102
103 table_info.type = ACPI_TABLE_SSDT; 103 table_info.type = ACPI_TABLE_ID_SSDT;
104 table_info.pointer = table; 104 table_info.pointer = table;
105 table_info.length = (acpi_size) table->length; 105 table_info.length = (acpi_size) table->length;
106 table_info.allocation = ACPI_MEM_ALLOCATED; 106 table_info.allocation = ACPI_MEM_ALLOCATED;
@@ -162,7 +162,7 @@ acpi_ex_load_table_op(struct acpi_walk_state *walk_state,
162 struct acpi_namespace_node *parameter_node = NULL; 162 struct acpi_namespace_node *parameter_node = NULL;
163 union acpi_operand_object *ddb_handle; 163 union acpi_operand_object *ddb_handle;
164 164
165 ACPI_FUNCTION_TRACE("ex_load_table_op"); 165 ACPI_FUNCTION_TRACE(ex_load_table_op);
166 166
167#if 0 167#if 0
168 /* 168 /*
@@ -300,7 +300,7 @@ acpi_ex_load_op(union acpi_operand_object *obj_desc,
300 struct acpi_table_header table_header; 300 struct acpi_table_header table_header;
301 u32 i; 301 u32 i;
302 302
303 ACPI_FUNCTION_TRACE("ex_load_op"); 303 ACPI_FUNCTION_TRACE(ex_load_op);
304 304
305 /* Object can be either an op_region or a Field */ 305 /* Object can be either an op_region or a Field */
306 306
@@ -411,12 +411,8 @@ acpi_ex_load_op(union acpi_operand_object *obj_desc,
411 411
412 /* The table must be either an SSDT or a PSDT */ 412 /* The table must be either an SSDT or a PSDT */
413 413
414 if ((!ACPI_STRNCMP(table_ptr->signature, 414 if ((!ACPI_COMPARE_NAME(table_ptr->signature, PSDT_SIG)) &&
415 acpi_gbl_table_data[ACPI_TABLE_PSDT].signature, 415 (!ACPI_COMPARE_NAME(table_ptr->signature, SSDT_SIG))) {
416 acpi_gbl_table_data[ACPI_TABLE_PSDT].sig_length)) &&
417 (!ACPI_STRNCMP(table_ptr->signature,
418 acpi_gbl_table_data[ACPI_TABLE_SSDT].signature,
419 acpi_gbl_table_data[ACPI_TABLE_SSDT].sig_length))) {
420 ACPI_ERROR((AE_INFO, 416 ACPI_ERROR((AE_INFO,
421 "Table has invalid signature [%4.4s], must be SSDT or PSDT", 417 "Table has invalid signature [%4.4s], must be SSDT or PSDT",
422 table_ptr->signature)); 418 table_ptr->signature));
@@ -470,7 +466,7 @@ acpi_status acpi_ex_unload_table(union acpi_operand_object *ddb_handle)
470 union acpi_operand_object *table_desc = ddb_handle; 466 union acpi_operand_object *table_desc = ddb_handle;
471 struct acpi_table_desc *table_info; 467 struct acpi_table_desc *table_info;
472 468
473 ACPI_FUNCTION_TRACE("ex_unload_table"); 469 ACPI_FUNCTION_TRACE(ex_unload_table);
474 470
475 /* 471 /*
476 * Validate the handle 472 * Validate the handle
diff --git a/drivers/acpi/executer/exconvrt.c b/drivers/acpi/executer/exconvrt.c
index a2c93c9ba07c..b732e399b1ef 100644
--- a/drivers/acpi/executer/exconvrt.c
+++ b/drivers/acpi/executer/exconvrt.c
@@ -79,7 +79,7 @@ acpi_ex_convert_to_integer(union acpi_operand_object *obj_desc,
79 u32 count; 79 u32 count;
80 acpi_status status; 80 acpi_status status;
81 81
82 ACPI_FUNCTION_TRACE_PTR("ex_convert_to_integer", obj_desc); 82 ACPI_FUNCTION_TRACE_PTR(ex_convert_to_integer, obj_desc);
83 83
84 switch (ACPI_GET_OBJECT_TYPE(obj_desc)) { 84 switch (ACPI_GET_OBJECT_TYPE(obj_desc)) {
85 case ACPI_TYPE_INTEGER: 85 case ACPI_TYPE_INTEGER:
@@ -199,7 +199,7 @@ acpi_ex_convert_to_buffer(union acpi_operand_object *obj_desc,
199 union acpi_operand_object *return_desc; 199 union acpi_operand_object *return_desc;
200 u8 *new_buf; 200 u8 *new_buf;
201 201
202 ACPI_FUNCTION_TRACE_PTR("ex_convert_to_buffer", obj_desc); 202 ACPI_FUNCTION_TRACE_PTR(ex_convert_to_buffer, obj_desc);
203 203
204 switch (ACPI_GET_OBJECT_TYPE(obj_desc)) { 204 switch (ACPI_GET_OBJECT_TYPE(obj_desc)) {
205 case ACPI_TYPE_BUFFER: 205 case ACPI_TYPE_BUFFER:
@@ -402,7 +402,7 @@ acpi_ex_convert_to_string(union acpi_operand_object * obj_desc,
402 u16 base = 16; 402 u16 base = 16;
403 u8 separator = ','; 403 u8 separator = ',';
404 404
405 ACPI_FUNCTION_TRACE_PTR("ex_convert_to_string", obj_desc); 405 ACPI_FUNCTION_TRACE_PTR(ex_convert_to_string, obj_desc);
406 406
407 switch (ACPI_GET_OBJECT_TYPE(obj_desc)) { 407 switch (ACPI_GET_OBJECT_TYPE(obj_desc)) {
408 case ACPI_TYPE_STRING: 408 case ACPI_TYPE_STRING:
@@ -569,7 +569,7 @@ acpi_ex_convert_to_target_type(acpi_object_type destination_type,
569{ 569{
570 acpi_status status = AE_OK; 570 acpi_status status = AE_OK;
571 571
572 ACPI_FUNCTION_TRACE("ex_convert_to_target_type"); 572 ACPI_FUNCTION_TRACE(ex_convert_to_target_type);
573 573
574 /* Default behavior */ 574 /* Default behavior */
575 575
@@ -659,7 +659,7 @@ acpi_ex_convert_to_target_type(acpi_object_type destination_type,
659 659
660 default: 660 default:
661 ACPI_ERROR((AE_INFO, 661 ACPI_ERROR((AE_INFO,
662 "Unknown Target type ID 0x%X aml_opcode %X dest_type %s", 662 "Unknown Target type ID 0x%X AmlOpcode %X DestType %s",
663 GET_CURRENT_ARG_TYPE(walk_state->op_info-> 663 GET_CURRENT_ARG_TYPE(walk_state->op_info->
664 runtime_args), 664 runtime_args),
665 walk_state->opcode, 665 walk_state->opcode,
diff --git a/drivers/acpi/executer/excreate.c b/drivers/acpi/executer/excreate.c
index 763e132da4c6..106dc7219df7 100644
--- a/drivers/acpi/executer/excreate.c
+++ b/drivers/acpi/executer/excreate.c
@@ -69,7 +69,7 @@ acpi_status acpi_ex_create_alias(struct acpi_walk_state *walk_state)
69 struct acpi_namespace_node *alias_node; 69 struct acpi_namespace_node *alias_node;
70 acpi_status status = AE_OK; 70 acpi_status status = AE_OK;
71 71
72 ACPI_FUNCTION_TRACE("ex_create_alias"); 72 ACPI_FUNCTION_TRACE(ex_create_alias);
73 73
74 /* Get the source/alias operands (both namespace nodes) */ 74 /* Get the source/alias operands (both namespace nodes) */
75 75
@@ -164,7 +164,7 @@ acpi_status acpi_ex_create_event(struct acpi_walk_state *walk_state)
164 acpi_status status; 164 acpi_status status;
165 union acpi_operand_object *obj_desc; 165 union acpi_operand_object *obj_desc;
166 166
167 ACPI_FUNCTION_TRACE("ex_create_event"); 167 ACPI_FUNCTION_TRACE(ex_create_event);
168 168
169 obj_desc = acpi_ut_create_internal_object(ACPI_TYPE_EVENT); 169 obj_desc = acpi_ut_create_internal_object(ACPI_TYPE_EVENT);
170 if (!obj_desc) { 170 if (!obj_desc) {
@@ -216,7 +216,7 @@ acpi_status acpi_ex_create_mutex(struct acpi_walk_state *walk_state)
216 acpi_status status = AE_OK; 216 acpi_status status = AE_OK;
217 union acpi_operand_object *obj_desc; 217 union acpi_operand_object *obj_desc;
218 218
219 ACPI_FUNCTION_TRACE_PTR("ex_create_mutex", ACPI_WALK_OPERANDS); 219 ACPI_FUNCTION_TRACE_PTR(ex_create_mutex, ACPI_WALK_OPERANDS);
220 220
221 /* Create the new mutex object */ 221 /* Create the new mutex object */
222 222
@@ -281,7 +281,7 @@ acpi_ex_create_region(u8 * aml_start,
281 struct acpi_namespace_node *node; 281 struct acpi_namespace_node *node;
282 union acpi_operand_object *region_obj2; 282 union acpi_operand_object *region_obj2;
283 283
284 ACPI_FUNCTION_TRACE("ex_create_region"); 284 ACPI_FUNCTION_TRACE(ex_create_region);
285 285
286 /* Get the Namespace Node */ 286 /* Get the Namespace Node */
287 287
@@ -301,7 +301,7 @@ acpi_ex_create_region(u8 * aml_start,
301 */ 301 */
302 if ((region_space >= ACPI_NUM_PREDEFINED_REGIONS) && 302 if ((region_space >= ACPI_NUM_PREDEFINED_REGIONS) &&
303 (region_space < ACPI_USER_REGION_BEGIN)) { 303 (region_space < ACPI_USER_REGION_BEGIN)) {
304 ACPI_ERROR((AE_INFO, "Invalid address_space type %X", 304 ACPI_ERROR((AE_INFO, "Invalid AddressSpace type %X",
305 region_space)); 305 region_space));
306 return_ACPI_STATUS(AE_AML_INVALID_SPACE_ID); 306 return_ACPI_STATUS(AE_AML_INVALID_SPACE_ID);
307 } 307 }
@@ -365,7 +365,7 @@ acpi_status acpi_ex_create_table_region(struct acpi_walk_state *walk_state)
365 struct acpi_table_header *table; 365 struct acpi_table_header *table;
366 union acpi_operand_object *region_obj2; 366 union acpi_operand_object *region_obj2;
367 367
368 ACPI_FUNCTION_TRACE("ex_create_table_region"); 368 ACPI_FUNCTION_TRACE(ex_create_table_region);
369 369
370 /* Get the Node from the object stack */ 370 /* Get the Node from the object stack */
371 371
@@ -453,7 +453,7 @@ acpi_status acpi_ex_create_processor(struct acpi_walk_state *walk_state)
453 union acpi_operand_object *obj_desc; 453 union acpi_operand_object *obj_desc;
454 acpi_status status; 454 acpi_status status;
455 455
456 ACPI_FUNCTION_TRACE_PTR("ex_create_processor", walk_state); 456 ACPI_FUNCTION_TRACE_PTR(ex_create_processor, walk_state);
457 457
458 /* Create the processor object */ 458 /* Create the processor object */
459 459
@@ -500,7 +500,7 @@ acpi_status acpi_ex_create_power_resource(struct acpi_walk_state *walk_state)
500 acpi_status status; 500 acpi_status status;
501 union acpi_operand_object *obj_desc; 501 union acpi_operand_object *obj_desc;
502 502
503 ACPI_FUNCTION_TRACE_PTR("ex_create_power_resource", walk_state); 503 ACPI_FUNCTION_TRACE_PTR(ex_create_power_resource, walk_state);
504 504
505 /* Create the power resource object */ 505 /* Create the power resource object */
506 506
@@ -550,7 +550,7 @@ acpi_ex_create_method(u8 * aml_start,
550 acpi_status status; 550 acpi_status status;
551 u8 method_flags; 551 u8 method_flags;
552 552
553 ACPI_FUNCTION_TRACE_PTR("ex_create_method", walk_state); 553 ACPI_FUNCTION_TRACE_PTR(ex_create_method, walk_state);
554 554
555 /* Create a new method object */ 555 /* Create a new method object */
556 556
diff --git a/drivers/acpi/executer/exdump.c b/drivers/acpi/executer/exdump.c
index 1dfebf9e7074..7b9718e976bf 100644
--- a/drivers/acpi/executer/exdump.c
+++ b/drivers/acpi/executer/exdump.c
@@ -123,7 +123,7 @@ static struct acpi_exdump_info acpi_ex_dump_event[2] = {
123 123
124static struct acpi_exdump_info acpi_ex_dump_method[8] = { 124static struct acpi_exdump_info acpi_ex_dump_method[8] = {
125 {ACPI_EXD_INIT, ACPI_EXD_TABLE_SIZE(acpi_ex_dump_method), NULL}, 125 {ACPI_EXD_INIT, ACPI_EXD_TABLE_SIZE(acpi_ex_dump_method), NULL},
126 {ACPI_EXD_UINT8, ACPI_EXD_OFFSET(method.param_count), "param_count"}, 126 {ACPI_EXD_UINT8, ACPI_EXD_OFFSET(method.param_count), "ParamCount"},
127 {ACPI_EXD_UINT8, ACPI_EXD_OFFSET(method.concurrency), "Concurrency"}, 127 {ACPI_EXD_UINT8, ACPI_EXD_OFFSET(method.concurrency), "Concurrency"},
128 {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(method.semaphore), "Semaphore"}, 128 {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(method.semaphore), "Semaphore"},
129 {ACPI_EXD_UINT8, ACPI_EXD_OFFSET(method.owner_id), "Owner Id"}, 129 {ACPI_EXD_UINT8, ACPI_EXD_OFFSET(method.owner_id), "Owner Id"},
@@ -332,7 +332,7 @@ acpi_ex_dump_object(union acpi_operand_object *obj_desc,
332 332
333 if (!info) { 333 if (!info) {
334 acpi_os_printf 334 acpi_os_printf
335 ("ex_dump_object: Display not implemented for object type %s\n", 335 ("ExDumpObject: Display not implemented for object type %s\n",
336 acpi_ut_get_object_type_name(obj_desc)); 336 acpi_ut_get_object_type_name(obj_desc));
337 return; 337 return;
338 } 338 }
@@ -456,7 +456,7 @@ void acpi_ex_dump_operand(union acpi_operand_object *obj_desc, u32 depth)
456 u32 length; 456 u32 length;
457 u32 index; 457 u32 index;
458 458
459 ACPI_FUNCTION_NAME("ex_dump_operand") 459 ACPI_FUNCTION_NAME(ex_dump_operand)
460 460
461 if (! 461 if (!
462 ((ACPI_LV_EXEC & acpi_dbg_level) 462 ((ACPI_LV_EXEC & acpi_dbg_level)
@@ -525,7 +525,7 @@ void acpi_ex_dump_operand(union acpi_operand_object *obj_desc, u32 depth)
525 525
526 case AML_REF_OF_OP: 526 case AML_REF_OF_OP:
527 527
528 acpi_os_printf("Reference: (ref_of) %p\n", 528 acpi_os_printf("Reference: (RefOf) %p\n",
529 obj_desc->reference.object); 529 obj_desc->reference.object);
530 break; 530 break;
531 531
@@ -614,7 +614,7 @@ void acpi_ex_dump_operand(union acpi_operand_object *obj_desc, u32 depth)
614 614
615 case ACPI_TYPE_PACKAGE: 615 case ACPI_TYPE_PACKAGE:
616 616
617 acpi_os_printf("Package [Len %X] element_array %p\n", 617 acpi_os_printf("Package [Len %X] ElementArray %p\n",
618 obj_desc->package.count, 618 obj_desc->package.count,
619 obj_desc->package.elements); 619 obj_desc->package.elements);
620 620
@@ -666,13 +666,13 @@ void acpi_ex_dump_operand(union acpi_operand_object *obj_desc, u32 depth)
666 666
667 case ACPI_TYPE_LOCAL_BANK_FIELD: 667 case ACPI_TYPE_LOCAL_BANK_FIELD:
668 668
669 acpi_os_printf("bank_field\n"); 669 acpi_os_printf("BankField\n");
670 break; 670 break;
671 671
672 case ACPI_TYPE_LOCAL_REGION_FIELD: 672 case ACPI_TYPE_LOCAL_REGION_FIELD:
673 673
674 acpi_os_printf 674 acpi_os_printf
675 ("region_field: Bits=%X acc_width=%X Lock=%X Update=%X at byte=%X bit=%X of below:\n", 675 ("RegionField: Bits=%X AccWidth=%X Lock=%X Update=%X at byte=%X bit=%X of below:\n",
676 obj_desc->field.bit_length, 676 obj_desc->field.bit_length,
677 obj_desc->field.access_byte_width, 677 obj_desc->field.access_byte_width,
678 obj_desc->field.field_flags & AML_FIELD_LOCK_RULE_MASK, 678 obj_desc->field.field_flags & AML_FIELD_LOCK_RULE_MASK,
@@ -685,12 +685,12 @@ void acpi_ex_dump_operand(union acpi_operand_object *obj_desc, u32 depth)
685 685
686 case ACPI_TYPE_LOCAL_INDEX_FIELD: 686 case ACPI_TYPE_LOCAL_INDEX_FIELD:
687 687
688 acpi_os_printf("index_field\n"); 688 acpi_os_printf("IndexField\n");
689 break; 689 break;
690 690
691 case ACPI_TYPE_BUFFER_FIELD: 691 case ACPI_TYPE_BUFFER_FIELD:
692 692
693 acpi_os_printf("buffer_field: %X bits at byte %X bit %X of\n", 693 acpi_os_printf("BufferField: %X bits at byte %X bit %X of\n",
694 obj_desc->buffer_field.bit_length, 694 obj_desc->buffer_field.bit_length,
695 obj_desc->buffer_field.base_byte_offset, 695 obj_desc->buffer_field.base_byte_offset,
696 obj_desc->buffer_field.start_field_bit_offset); 696 obj_desc->buffer_field.start_field_bit_offset);
@@ -781,7 +781,7 @@ acpi_ex_dump_operands(union acpi_operand_object **operands,
781{ 781{
782 acpi_native_uint i; 782 acpi_native_uint i;
783 783
784 ACPI_FUNCTION_NAME("ex_dump_operands"); 784 ACPI_FUNCTION_NAME(ex_dump_operands);
785 785
786 if (!ident) { 786 if (!ident) {
787 ident = "?"; 787 ident = "?";
@@ -1021,7 +1021,7 @@ acpi_ex_dump_package_obj(union acpi_operand_object *obj_desc,
1021void 1021void
1022acpi_ex_dump_object_descriptor(union acpi_operand_object *obj_desc, u32 flags) 1022acpi_ex_dump_object_descriptor(union acpi_operand_object *obj_desc, u32 flags)
1023{ 1023{
1024 ACPI_FUNCTION_TRACE("ex_dump_object_descriptor"); 1024 ACPI_FUNCTION_TRACE(ex_dump_object_descriptor);
1025 1025
1026 if (!obj_desc) { 1026 if (!obj_desc) {
1027 return_VOID; 1027 return_VOID;
@@ -1050,7 +1050,7 @@ acpi_ex_dump_object_descriptor(union acpi_operand_object *obj_desc, u32 flags)
1050 1050
1051 if (ACPI_GET_DESCRIPTOR_TYPE(obj_desc) != ACPI_DESC_TYPE_OPERAND) { 1051 if (ACPI_GET_DESCRIPTOR_TYPE(obj_desc) != ACPI_DESC_TYPE_OPERAND) {
1052 acpi_os_printf 1052 acpi_os_printf
1053 ("ex_dump_object_descriptor: %p is not an ACPI operand object: [%s]\n", 1053 ("ExDumpObjectDescriptor: %p is not an ACPI operand object: [%s]\n",
1054 obj_desc, acpi_ut_get_descriptor_name(obj_desc)); 1054 obj_desc, acpi_ut_get_descriptor_name(obj_desc));
1055 return_VOID; 1055 return_VOID;
1056 } 1056 }
diff --git a/drivers/acpi/executer/exfield.c b/drivers/acpi/executer/exfield.c
index 36c265a00c26..9ea9c3a67ca9 100644
--- a/drivers/acpi/executer/exfield.c
+++ b/drivers/acpi/executer/exfield.c
@@ -73,7 +73,7 @@ acpi_ex_read_data_from_field(struct acpi_walk_state *walk_state,
73 void *buffer; 73 void *buffer;
74 u8 locked; 74 u8 locked;
75 75
76 ACPI_FUNCTION_TRACE_PTR("ex_read_data_from_field", obj_desc); 76 ACPI_FUNCTION_TRACE_PTR(ex_read_data_from_field, obj_desc);
77 77
78 /* Parameter validation */ 78 /* Parameter validation */
79 79
@@ -164,11 +164,11 @@ acpi_ex_read_data_from_field(struct acpi_walk_state *walk_state,
164 } 164 }
165 165
166 ACPI_DEBUG_PRINT((ACPI_DB_BFIELD, 166 ACPI_DEBUG_PRINT((ACPI_DB_BFIELD,
167 "field_read [TO]: Obj %p, Type %X, Buf %p, byte_len %X\n", 167 "FieldRead [TO]: Obj %p, Type %X, Buf %p, ByteLen %X\n",
168 obj_desc, ACPI_GET_OBJECT_TYPE(obj_desc), buffer, 168 obj_desc, ACPI_GET_OBJECT_TYPE(obj_desc), buffer,
169 (u32) length)); 169 (u32) length));
170 ACPI_DEBUG_PRINT((ACPI_DB_BFIELD, 170 ACPI_DEBUG_PRINT((ACPI_DB_BFIELD,
171 "field_read [FROM]: bit_len %X, bit_off %X, byte_off %X\n", 171 "FieldRead [FROM]: BitLen %X, BitOff %X, ByteOff %X\n",
172 obj_desc->common_field.bit_length, 172 obj_desc->common_field.bit_length,
173 obj_desc->common_field.start_field_bit_offset, 173 obj_desc->common_field.start_field_bit_offset,
174 obj_desc->common_field.base_byte_offset)); 174 obj_desc->common_field.base_byte_offset));
@@ -220,7 +220,7 @@ acpi_ex_write_data_to_field(union acpi_operand_object *source_desc,
220 u8 locked; 220 u8 locked;
221 union acpi_operand_object *buffer_desc; 221 union acpi_operand_object *buffer_desc;
222 222
223 ACPI_FUNCTION_TRACE_PTR("ex_write_data_to_field", obj_desc); 223 ACPI_FUNCTION_TRACE_PTR(ex_write_data_to_field, obj_desc);
224 224
225 /* Parameter validation */ 225 /* Parameter validation */
226 226
@@ -349,14 +349,14 @@ acpi_ex_write_data_to_field(union acpi_operand_object *source_desc,
349 } 349 }
350 350
351 ACPI_DEBUG_PRINT((ACPI_DB_BFIELD, 351 ACPI_DEBUG_PRINT((ACPI_DB_BFIELD,
352 "field_write [FROM]: Obj %p (%s:%X), Buf %p, byte_len %X\n", 352 "FieldWrite [FROM]: Obj %p (%s:%X), Buf %p, ByteLen %X\n",
353 source_desc, 353 source_desc,
354 acpi_ut_get_type_name(ACPI_GET_OBJECT_TYPE 354 acpi_ut_get_type_name(ACPI_GET_OBJECT_TYPE
355 (source_desc)), 355 (source_desc)),
356 ACPI_GET_OBJECT_TYPE(source_desc), buffer, length)); 356 ACPI_GET_OBJECT_TYPE(source_desc), buffer, length));
357 357
358 ACPI_DEBUG_PRINT((ACPI_DB_BFIELD, 358 ACPI_DEBUG_PRINT((ACPI_DB_BFIELD,
359 "field_write [TO]: Obj %p (%s:%X), bit_len %X, bit_off %X, byte_off %X\n", 359 "FieldWrite [TO]: Obj %p (%s:%X), BitLen %X, BitOff %X, ByteOff %X\n",
360 obj_desc, 360 obj_desc,
361 acpi_ut_get_type_name(ACPI_GET_OBJECT_TYPE(obj_desc)), 361 acpi_ut_get_type_name(ACPI_GET_OBJECT_TYPE(obj_desc)),
362 ACPI_GET_OBJECT_TYPE(obj_desc), 362 ACPI_GET_OBJECT_TYPE(obj_desc),
diff --git a/drivers/acpi/executer/exfldio.c b/drivers/acpi/executer/exfldio.c
index d5a4b2627c19..ca9925c0d011 100644
--- a/drivers/acpi/executer/exfldio.c
+++ b/drivers/acpi/executer/exfldio.c
@@ -87,7 +87,7 @@ acpi_ex_setup_region(union acpi_operand_object *obj_desc,
87 acpi_status status = AE_OK; 87 acpi_status status = AE_OK;
88 union acpi_operand_object *rgn_desc; 88 union acpi_operand_object *rgn_desc;
89 89
90 ACPI_FUNCTION_TRACE_U32("ex_setup_region", field_datum_byte_offset); 90 ACPI_FUNCTION_TRACE_U32(ex_setup_region, field_datum_byte_offset);
91 91
92 rgn_desc = obj_desc->common_field.region_obj; 92 rgn_desc = obj_desc->common_field.region_obj;
93 93
@@ -112,6 +112,16 @@ acpi_ex_setup_region(union acpi_operand_object *obj_desc,
112 } 112 }
113 } 113 }
114 114
115 /* Exit if Address/Length have been disallowed by the host OS */
116
117 if (rgn_desc->common.flags & AOPOBJ_INVALID) {
118 return_ACPI_STATUS(AE_AML_ILLEGAL_ADDRESS);
119 }
120
121 /*
122 * Exit now for SMBus address space, it has a non-linear address space
123 * and the request cannot be directly validated
124 */
115 if (rgn_desc->region.space_id == ACPI_ADR_SPACE_SMBUS) { 125 if (rgn_desc->region.space_id == ACPI_ADR_SPACE_SMBUS) {
116 126
117 /* SMBus has a non-linear address space */ 127 /* SMBus has a non-linear address space */
@@ -218,7 +228,7 @@ acpi_ex_access_region(union acpi_operand_object *obj_desc,
218 union acpi_operand_object *rgn_desc; 228 union acpi_operand_object *rgn_desc;
219 acpi_physical_address address; 229 acpi_physical_address address;
220 230
221 ACPI_FUNCTION_TRACE("ex_access_region"); 231 ACPI_FUNCTION_TRACE(ex_access_region);
222 232
223 /* 233 /*
224 * Ensure that the region operands are fully evaluated and verify 234 * Ensure that the region operands are fully evaluated and verify
@@ -247,7 +257,7 @@ acpi_ex_access_region(union acpi_operand_object *obj_desc,
247 } 257 }
248 258
249 ACPI_DEBUG_PRINT_RAW((ACPI_DB_BFIELD, 259 ACPI_DEBUG_PRINT_RAW((ACPI_DB_BFIELD,
250 " Region [%s:%X], Width %X, byte_base %X, Offset %X at %8.8X%8.8X\n", 260 " Region [%s:%X], Width %X, ByteBase %X, Offset %X at %8.8X%8.8X\n",
251 acpi_ut_get_region_name(rgn_desc->region. 261 acpi_ut_get_region_name(rgn_desc->region.
252 space_id), 262 space_id),
253 rgn_desc->region.space_id, 263 rgn_desc->region.space_id,
@@ -353,7 +363,7 @@ acpi_ex_field_datum_io(union acpi_operand_object *obj_desc,
353 acpi_status status; 363 acpi_status status;
354 acpi_integer local_value; 364 acpi_integer local_value;
355 365
356 ACPI_FUNCTION_TRACE_U32("ex_field_datum_io", field_datum_byte_offset); 366 ACPI_FUNCTION_TRACE_U32(ex_field_datum_io, field_datum_byte_offset);
357 367
358 if (read_write == ACPI_READ) { 368 if (read_write == ACPI_READ) {
359 if (!value) { 369 if (!value) {
@@ -488,7 +498,7 @@ acpi_ex_field_datum_io(union acpi_operand_object *obj_desc,
488 } 498 }
489 499
490 ACPI_DEBUG_PRINT((ACPI_DB_BFIELD, 500 ACPI_DEBUG_PRINT((ACPI_DB_BFIELD,
491 "I/O to Data Register: value_ptr %p\n", 501 "I/O to Data Register: ValuePtr %p\n",
492 value)); 502 value));
493 503
494 if (read_write == ACPI_READ) { 504 if (read_write == ACPI_READ) {
@@ -561,7 +571,7 @@ acpi_ex_write_with_update_rule(union acpi_operand_object *obj_desc,
561 acpi_integer merged_value; 571 acpi_integer merged_value;
562 acpi_integer current_value; 572 acpi_integer current_value;
563 573
564 ACPI_FUNCTION_TRACE_U32("ex_write_with_update_rule", mask); 574 ACPI_FUNCTION_TRACE_U32(ex_write_with_update_rule, mask);
565 575
566 /* Start with the new bits */ 576 /* Start with the new bits */
567 577
@@ -617,7 +627,7 @@ acpi_ex_write_with_update_rule(union acpi_operand_object *obj_desc,
617 default: 627 default:
618 628
619 ACPI_ERROR((AE_INFO, 629 ACPI_ERROR((AE_INFO,
620 "Unknown update_rule value: %X", 630 "Unknown UpdateRule value: %X",
621 (obj_desc->common_field. 631 (obj_desc->common_field.
622 field_flags & 632 field_flags &
623 AML_FIELD_UPDATE_RULE_MASK))); 633 AML_FIELD_UPDATE_RULE_MASK)));
@@ -626,7 +636,7 @@ acpi_ex_write_with_update_rule(union acpi_operand_object *obj_desc,
626 } 636 }
627 637
628 ACPI_DEBUG_PRINT((ACPI_DB_BFIELD, 638 ACPI_DEBUG_PRINT((ACPI_DB_BFIELD,
629 "Mask %8.8X%8.8X, datum_offset %X, Width %X, Value %8.8X%8.8X, merged_value %8.8X%8.8X\n", 639 "Mask %8.8X%8.8X, DatumOffset %X, Width %X, Value %8.8X%8.8X, MergedValue %8.8X%8.8X\n",
630 ACPI_FORMAT_UINT64(mask), 640 ACPI_FORMAT_UINT64(mask),
631 field_datum_byte_offset, 641 field_datum_byte_offset,
632 obj_desc->common_field.access_byte_width, 642 obj_desc->common_field.access_byte_width,
@@ -669,7 +679,7 @@ acpi_ex_extract_from_field(union acpi_operand_object *obj_desc,
669 u32 field_datum_count; 679 u32 field_datum_count;
670 u32 i; 680 u32 i;
671 681
672 ACPI_FUNCTION_TRACE("ex_extract_from_field"); 682 ACPI_FUNCTION_TRACE(ex_extract_from_field);
673 683
674 /* Validate target buffer and clear it */ 684 /* Validate target buffer and clear it */
675 685
@@ -784,7 +794,7 @@ acpi_ex_insert_into_field(union acpi_operand_object *obj_desc,
784 u32 field_datum_count; 794 u32 field_datum_count;
785 u32 i; 795 u32 i;
786 796
787 ACPI_FUNCTION_TRACE("ex_insert_into_field"); 797 ACPI_FUNCTION_TRACE(ex_insert_into_field);
788 798
789 /* Validate input buffer */ 799 /* Validate input buffer */
790 800
diff --git a/drivers/acpi/executer/exmisc.c b/drivers/acpi/executer/exmisc.c
index 74f2c1a9bdaf..794d9b8de956 100644
--- a/drivers/acpi/executer/exmisc.c
+++ b/drivers/acpi/executer/exmisc.c
@@ -72,7 +72,7 @@ acpi_ex_get_object_reference(union acpi_operand_object *obj_desc,
72 union acpi_operand_object *reference_obj; 72 union acpi_operand_object *reference_obj;
73 union acpi_operand_object *referenced_obj; 73 union acpi_operand_object *referenced_obj;
74 74
75 ACPI_FUNCTION_TRACE_PTR("ex_get_object_reference", obj_desc); 75 ACPI_FUNCTION_TRACE_PTR(ex_get_object_reference, obj_desc);
76 76
77 *return_desc = NULL; 77 *return_desc = NULL;
78 78
@@ -168,7 +168,7 @@ acpi_ex_concat_template(union acpi_operand_object *operand0,
168 acpi_size length1; 168 acpi_size length1;
169 acpi_size new_length; 169 acpi_size new_length;
170 170
171 ACPI_FUNCTION_TRACE("ex_concat_template"); 171 ACPI_FUNCTION_TRACE(ex_concat_template);
172 172
173 /* 173 /*
174 * Find the end_tag descriptor in each resource template. 174 * Find the end_tag descriptor in each resource template.
@@ -250,7 +250,7 @@ acpi_ex_do_concatenate(union acpi_operand_object *operand0,
250 char *new_buf; 250 char *new_buf;
251 acpi_status status; 251 acpi_status status;
252 252
253 ACPI_FUNCTION_TRACE("ex_do_concatenate"); 253 ACPI_FUNCTION_TRACE(ex_do_concatenate);
254 254
255 /* 255 /*
256 * Convert the second operand if necessary. The first operand 256 * Convert the second operand if necessary. The first operand
@@ -489,7 +489,7 @@ acpi_ex_do_logical_numeric_op(u16 opcode,
489 acpi_status status = AE_OK; 489 acpi_status status = AE_OK;
490 u8 local_result = FALSE; 490 u8 local_result = FALSE;
491 491
492 ACPI_FUNCTION_TRACE("ex_do_logical_numeric_op"); 492 ACPI_FUNCTION_TRACE(ex_do_logical_numeric_op);
493 493
494 switch (opcode) { 494 switch (opcode) {
495 case AML_LAND_OP: /* LAnd (Integer0, Integer1) */ 495 case AML_LAND_OP: /* LAnd (Integer0, Integer1) */
@@ -557,7 +557,7 @@ acpi_ex_do_logical_op(u16 opcode,
557 u8 local_result = FALSE; 557 u8 local_result = FALSE;
558 int compare; 558 int compare;
559 559
560 ACPI_FUNCTION_TRACE("ex_do_logical_op"); 560 ACPI_FUNCTION_TRACE(ex_do_logical_op);
561 561
562 /* 562 /*
563 * Convert the second operand if necessary. The first operand 563 * Convert the second operand if necessary. The first operand
diff --git a/drivers/acpi/executer/exmutex.c b/drivers/acpi/executer/exmutex.c
index eaee1de5e90d..93098d68cadf 100644
--- a/drivers/acpi/executer/exmutex.c
+++ b/drivers/acpi/executer/exmutex.c
@@ -61,7 +61,7 @@ acpi_ex_link_mutex(union acpi_operand_object *obj_desc,
61 * 61 *
62 * RETURN: None 62 * RETURN: None
63 * 63 *
64 * DESCRIPTION: Remove a mutex from the "acquired_mutex" list 64 * DESCRIPTION: Remove a mutex from the "AcquiredMutex" list
65 * 65 *
66 ******************************************************************************/ 66 ******************************************************************************/
67 67
@@ -95,7 +95,7 @@ void acpi_ex_unlink_mutex(union acpi_operand_object *obj_desc)
95 * 95 *
96 * RETURN: None 96 * RETURN: None
97 * 97 *
98 * DESCRIPTION: Add a mutex to the "acquired_mutex" list for this walk 98 * DESCRIPTION: Add a mutex to the "AcquiredMutex" list for this walk
99 * 99 *
100 ******************************************************************************/ 100 ******************************************************************************/
101 101
@@ -144,7 +144,7 @@ acpi_ex_acquire_mutex(union acpi_operand_object *time_desc,
144{ 144{
145 acpi_status status; 145 acpi_status status;
146 146
147 ACPI_FUNCTION_TRACE_PTR("ex_acquire_mutex", obj_desc); 147 ACPI_FUNCTION_TRACE_PTR(ex_acquire_mutex, obj_desc);
148 148
149 if (!obj_desc) { 149 if (!obj_desc) {
150 return_ACPI_STATUS(AE_BAD_PARAMETER); 150 return_ACPI_STATUS(AE_BAD_PARAMETER);
@@ -165,7 +165,7 @@ acpi_ex_acquire_mutex(union acpi_operand_object *time_desc,
165 */ 165 */
166 if (walk_state->thread->current_sync_level > obj_desc->mutex.sync_level) { 166 if (walk_state->thread->current_sync_level > obj_desc->mutex.sync_level) {
167 ACPI_ERROR((AE_INFO, 167 ACPI_ERROR((AE_INFO,
168 "Cannot acquire Mutex [%4.4s], incorrect sync_level", 168 "Cannot acquire Mutex [%4.4s], incorrect SyncLevel",
169 acpi_ut_get_node_name(obj_desc->mutex.node))); 169 acpi_ut_get_node_name(obj_desc->mutex.node)));
170 return_ACPI_STATUS(AE_AML_MUTEX_ORDER); 170 return_ACPI_STATUS(AE_AML_MUTEX_ORDER);
171 } 171 }
@@ -234,7 +234,7 @@ acpi_ex_release_mutex(union acpi_operand_object *obj_desc,
234{ 234{
235 acpi_status status; 235 acpi_status status;
236 236
237 ACPI_FUNCTION_TRACE("ex_release_mutex"); 237 ACPI_FUNCTION_TRACE(ex_release_mutex);
238 238
239 if (!obj_desc) { 239 if (!obj_desc) {
240 return_ACPI_STATUS(AE_BAD_PARAMETER); 240 return_ACPI_STATUS(AE_BAD_PARAMETER);
@@ -279,7 +279,7 @@ acpi_ex_release_mutex(union acpi_operand_object *obj_desc,
279 */ 279 */
280 if (obj_desc->mutex.sync_level > walk_state->thread->current_sync_level) { 280 if (obj_desc->mutex.sync_level > walk_state->thread->current_sync_level) {
281 ACPI_ERROR((AE_INFO, 281 ACPI_ERROR((AE_INFO,
282 "Cannot release Mutex [%4.4s], incorrect sync_level", 282 "Cannot release Mutex [%4.4s], incorrect SyncLevel",
283 acpi_ut_get_node_name(obj_desc->mutex.node))); 283 acpi_ut_get_node_name(obj_desc->mutex.node)));
284 return_ACPI_STATUS(AE_AML_MUTEX_ORDER); 284 return_ACPI_STATUS(AE_AML_MUTEX_ORDER);
285 } 285 }
diff --git a/drivers/acpi/executer/exnames.c b/drivers/acpi/executer/exnames.c
index 085b18f8dd00..d3d70364626c 100644
--- a/drivers/acpi/executer/exnames.c
+++ b/drivers/acpi/executer/exnames.c
@@ -77,7 +77,7 @@ static char *acpi_ex_allocate_name_string(u32 prefix_count, u32 num_name_segs)
77 char *name_string; 77 char *name_string;
78 u32 size_needed; 78 u32 size_needed;
79 79
80 ACPI_FUNCTION_TRACE("ex_allocate_name_string"); 80 ACPI_FUNCTION_TRACE(ex_allocate_name_string);
81 81
82 /* 82 /*
83 * Allow room for all \ and ^ prefixes, all segments and a multi_name_prefix. 83 * Allow room for all \ and ^ prefixes, all segments and a multi_name_prefix.
@@ -162,7 +162,7 @@ static acpi_status acpi_ex_name_segment(u8 ** in_aml_address, char *name_string)
162 u32 index; 162 u32 index;
163 char char_buf[5]; 163 char char_buf[5];
164 164
165 ACPI_FUNCTION_TRACE("ex_name_segment"); 165 ACPI_FUNCTION_TRACE(ex_name_segment);
166 166
167 /* 167 /*
168 * If first character is a digit, then we know that we aren't looking at a 168 * If first character is a digit, then we know that we aren't looking at a
@@ -253,7 +253,7 @@ acpi_ex_get_name_string(acpi_object_type data_type,
253 u32 prefix_count = 0; 253 u32 prefix_count = 0;
254 u8 has_prefix = FALSE; 254 u8 has_prefix = FALSE;
255 255
256 ACPI_FUNCTION_TRACE_PTR("ex_get_name_string", aml_address); 256 ACPI_FUNCTION_TRACE_PTR(ex_get_name_string, aml_address);
257 257
258 if (ACPI_TYPE_LOCAL_REGION_FIELD == data_type || 258 if (ACPI_TYPE_LOCAL_REGION_FIELD == data_type ||
259 ACPI_TYPE_LOCAL_BANK_FIELD == data_type || 259 ACPI_TYPE_LOCAL_BANK_FIELD == data_type ||
@@ -277,7 +277,7 @@ acpi_ex_get_name_string(acpi_object_type data_type,
277 case AML_ROOT_PREFIX: 277 case AML_ROOT_PREFIX:
278 278
279 ACPI_DEBUG_PRINT((ACPI_DB_LOAD, 279 ACPI_DEBUG_PRINT((ACPI_DB_LOAD,
280 "root_prefix(\\) at %p\n", 280 "RootPrefix(\\) at %p\n",
281 aml_address)); 281 aml_address));
282 282
283 /* 283 /*
@@ -295,7 +295,7 @@ acpi_ex_get_name_string(acpi_object_type data_type,
295 295
296 do { 296 do {
297 ACPI_DEBUG_PRINT((ACPI_DB_LOAD, 297 ACPI_DEBUG_PRINT((ACPI_DB_LOAD,
298 "parent_prefix (^) at %p\n", 298 "ParentPrefix (^) at %p\n",
299 aml_address)); 299 aml_address));
300 300
301 aml_address++; 301 aml_address++;
@@ -319,7 +319,7 @@ acpi_ex_get_name_string(acpi_object_type data_type,
319 case AML_DUAL_NAME_PREFIX: 319 case AML_DUAL_NAME_PREFIX:
320 320
321 ACPI_DEBUG_PRINT((ACPI_DB_LOAD, 321 ACPI_DEBUG_PRINT((ACPI_DB_LOAD,
322 "dual_name_prefix at %p\n", 322 "DualNamePrefix at %p\n",
323 aml_address)); 323 aml_address));
324 324
325 aml_address++; 325 aml_address++;
@@ -346,7 +346,7 @@ acpi_ex_get_name_string(acpi_object_type data_type,
346 case AML_MULTI_NAME_PREFIX_OP: 346 case AML_MULTI_NAME_PREFIX_OP:
347 347
348 ACPI_DEBUG_PRINT((ACPI_DB_LOAD, 348 ACPI_DEBUG_PRINT((ACPI_DB_LOAD,
349 "multi_name_prefix at %p\n", 349 "MultiNamePrefix at %p\n",
350 aml_address)); 350 aml_address));
351 351
352 /* Fetch count of segments remaining in name path */ 352 /* Fetch count of segments remaining in name path */
@@ -382,7 +382,7 @@ acpi_ex_get_name_string(acpi_object_type data_type,
382 382
383 if (prefix_count == ACPI_UINT32_MAX) { 383 if (prefix_count == ACPI_UINT32_MAX) {
384 ACPI_DEBUG_PRINT((ACPI_DB_EXEC, 384 ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
385 "name_seg is \"\\\" followed by NULL\n")); 385 "NameSeg is \"\\\" followed by NULL\n"));
386 } 386 }
387 387
388 /* Consume the NULL byte */ 388 /* Consume the NULL byte */
diff --git a/drivers/acpi/executer/exoparg1.c b/drivers/acpi/executer/exoparg1.c
index d00f766246f3..05b89c5878eb 100644
--- a/drivers/acpi/executer/exoparg1.c
+++ b/drivers/acpi/executer/exoparg1.c
@@ -89,7 +89,7 @@ acpi_status acpi_ex_opcode_0A_0T_1R(struct acpi_walk_state *walk_state)
89 acpi_status status = AE_OK; 89 acpi_status status = AE_OK;
90 union acpi_operand_object *return_desc = NULL; 90 union acpi_operand_object *return_desc = NULL;
91 91
92 ACPI_FUNCTION_TRACE_STR("ex_opcode_0A_0T_1R", 92 ACPI_FUNCTION_TRACE_STR(ex_opcode_0A_0T_1R,
93 acpi_ps_get_opcode_name(walk_state->opcode)); 93 acpi_ps_get_opcode_name(walk_state->opcode));
94 94
95 /* Examine the AML opcode */ 95 /* Examine the AML opcode */
@@ -150,7 +150,7 @@ acpi_status acpi_ex_opcode_1A_0T_0R(struct acpi_walk_state *walk_state)
150 union acpi_operand_object **operand = &walk_state->operands[0]; 150 union acpi_operand_object **operand = &walk_state->operands[0];
151 acpi_status status = AE_OK; 151 acpi_status status = AE_OK;
152 152
153 ACPI_FUNCTION_TRACE_STR("ex_opcode_1A_0T_0R", 153 ACPI_FUNCTION_TRACE_STR(ex_opcode_1A_0T_0R,
154 acpi_ps_get_opcode_name(walk_state->opcode)); 154 acpi_ps_get_opcode_name(walk_state->opcode));
155 155
156 /* Examine the AML opcode */ 156 /* Examine the AML opcode */
@@ -216,7 +216,7 @@ acpi_status acpi_ex_opcode_1A_1T_0R(struct acpi_walk_state *walk_state)
216 acpi_status status = AE_OK; 216 acpi_status status = AE_OK;
217 union acpi_operand_object **operand = &walk_state->operands[0]; 217 union acpi_operand_object **operand = &walk_state->operands[0];
218 218
219 ACPI_FUNCTION_TRACE_STR("ex_opcode_1A_1T_0R", 219 ACPI_FUNCTION_TRACE_STR(ex_opcode_1A_1T_0R,
220 acpi_ps_get_opcode_name(walk_state->opcode)); 220 acpi_ps_get_opcode_name(walk_state->opcode));
221 221
222 /* Examine the AML opcode */ 222 /* Examine the AML opcode */
@@ -264,7 +264,7 @@ acpi_status acpi_ex_opcode_1A_1T_1R(struct acpi_walk_state *walk_state)
264 acpi_integer power_of_ten; 264 acpi_integer power_of_ten;
265 acpi_integer digit; 265 acpi_integer digit;
266 266
267 ACPI_FUNCTION_TRACE_STR("ex_opcode_1A_1T_1R", 267 ACPI_FUNCTION_TRACE_STR(ex_opcode_1A_1T_1R,
268 acpi_ps_get_opcode_name(walk_state->opcode)); 268 acpi_ps_get_opcode_name(walk_state->opcode));
269 269
270 /* Examine the AML opcode */ 270 /* Examine the AML opcode */
@@ -590,7 +590,7 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state)
590 u32 type; 590 u32 type;
591 acpi_integer value; 591 acpi_integer value;
592 592
593 ACPI_FUNCTION_TRACE_STR("ex_opcode_1A_0T_1R", 593 ACPI_FUNCTION_TRACE_STR(ex_opcode_1A_0T_1R,
594 acpi_ps_get_opcode_name(walk_state->opcode)); 594 acpi_ps_get_opcode_name(walk_state->opcode));
595 595
596 /* Examine the AML opcode */ 596 /* Examine the AML opcode */
@@ -975,7 +975,7 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state)
975 default: 975 default:
976 976
977 ACPI_ERROR((AE_INFO, 977 ACPI_ERROR((AE_INFO,
978 "Unknown Index target_type %X in obj %p", 978 "Unknown Index TargetType %X in obj %p",
979 operand[0]->reference. 979 operand[0]->reference.
980 target_type, operand[0])); 980 target_type, operand[0]));
981 status = AE_AML_OPERAND_TYPE; 981 status = AE_AML_OPERAND_TYPE;
diff --git a/drivers/acpi/executer/exoparg2.c b/drivers/acpi/executer/exoparg2.c
index 690e43db0abe..7d2cbc113160 100644
--- a/drivers/acpi/executer/exoparg2.c
+++ b/drivers/acpi/executer/exoparg2.c
@@ -92,7 +92,7 @@ acpi_status acpi_ex_opcode_2A_0T_0R(struct acpi_walk_state *walk_state)
92 u32 value; 92 u32 value;
93 acpi_status status = AE_OK; 93 acpi_status status = AE_OK;
94 94
95 ACPI_FUNCTION_TRACE_STR("ex_opcode_2A_0T_0R", 95 ACPI_FUNCTION_TRACE_STR(ex_opcode_2A_0T_0R,
96 acpi_ps_get_opcode_name(walk_state->opcode)); 96 acpi_ps_get_opcode_name(walk_state->opcode));
97 97
98 /* Examine the opcode */ 98 /* Examine the opcode */
@@ -121,7 +121,7 @@ acpi_status acpi_ex_opcode_2A_0T_0R(struct acpi_walk_state *walk_state)
121#ifdef ACPI_GPE_NOTIFY_CHECK 121#ifdef ACPI_GPE_NOTIFY_CHECK
122 /* 122 /*
123 * GPE method wake/notify check. Here, we want to ensure that we 123 * GPE method wake/notify check. Here, we want to ensure that we
124 * don't receive any "device_wake" Notifies from a GPE _Lxx or _Exx 124 * don't receive any "DeviceWake" Notifies from a GPE _Lxx or _Exx
125 * GPE method during system runtime. If we do, the GPE is marked 125 * GPE method during system runtime. If we do, the GPE is marked
126 * as "wake-only" and disabled. 126 * as "wake-only" and disabled.
127 * 127 *
@@ -186,7 +186,7 @@ acpi_status acpi_ex_opcode_2A_2T_1R(struct acpi_walk_state *walk_state)
186 union acpi_operand_object *return_desc2 = NULL; 186 union acpi_operand_object *return_desc2 = NULL;
187 acpi_status status; 187 acpi_status status;
188 188
189 ACPI_FUNCTION_TRACE_STR("ex_opcode_2A_2T_1R", 189 ACPI_FUNCTION_TRACE_STR(ex_opcode_2A_2T_1R,
190 acpi_ps_get_opcode_name(walk_state->opcode)); 190 acpi_ps_get_opcode_name(walk_state->opcode));
191 191
192 /* Execute the opcode */ 192 /* Execute the opcode */
@@ -283,7 +283,7 @@ acpi_status acpi_ex_opcode_2A_1T_1R(struct acpi_walk_state *walk_state)
283 acpi_status status = AE_OK; 283 acpi_status status = AE_OK;
284 acpi_size length; 284 acpi_size length;
285 285
286 ACPI_FUNCTION_TRACE_STR("ex_opcode_2A_1T_1R", 286 ACPI_FUNCTION_TRACE_STR(ex_opcode_2A_1T_1R,
287 acpi_ps_get_opcode_name(walk_state->opcode)); 287 acpi_ps_get_opcode_name(walk_state->opcode));
288 288
289 /* Execute the opcode */ 289 /* Execute the opcode */
@@ -514,7 +514,7 @@ acpi_status acpi_ex_opcode_2A_0T_1R(struct acpi_walk_state *walk_state)
514 acpi_status status = AE_OK; 514 acpi_status status = AE_OK;
515 u8 logical_result = FALSE; 515 u8 logical_result = FALSE;
516 516
517 ACPI_FUNCTION_TRACE_STR("ex_opcode_2A_0T_1R", 517 ACPI_FUNCTION_TRACE_STR(ex_opcode_2A_0T_1R,
518 acpi_ps_get_opcode_name(walk_state->opcode)); 518 acpi_ps_get_opcode_name(walk_state->opcode));
519 519
520 /* Create the internal return object */ 520 /* Create the internal return object */
diff --git a/drivers/acpi/executer/exoparg3.c b/drivers/acpi/executer/exoparg3.c
index 4897e6c3431f..e2d945dfd509 100644
--- a/drivers/acpi/executer/exoparg3.c
+++ b/drivers/acpi/executer/exoparg3.c
@@ -88,14 +88,14 @@ acpi_status acpi_ex_opcode_3A_0T_0R(struct acpi_walk_state *walk_state)
88 struct acpi_signal_fatal_info *fatal; 88 struct acpi_signal_fatal_info *fatal;
89 acpi_status status = AE_OK; 89 acpi_status status = AE_OK;
90 90
91 ACPI_FUNCTION_TRACE_STR("ex_opcode_3A_0T_0R", 91 ACPI_FUNCTION_TRACE_STR(ex_opcode_3A_0T_0R,
92 acpi_ps_get_opcode_name(walk_state->opcode)); 92 acpi_ps_get_opcode_name(walk_state->opcode));
93 93
94 switch (walk_state->opcode) { 94 switch (walk_state->opcode) {
95 case AML_FATAL_OP: /* Fatal (fatal_type fatal_code fatal_arg) */ 95 case AML_FATAL_OP: /* Fatal (fatal_type fatal_code fatal_arg) */
96 96
97 ACPI_DEBUG_PRINT((ACPI_DB_INFO, 97 ACPI_DEBUG_PRINT((ACPI_DB_INFO,
98 "fatal_op: Type %X Code %X Arg %X <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\n", 98 "FatalOp: Type %X Code %X Arg %X <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\n",
99 (u32) operand[0]->integer.value, 99 (u32) operand[0]->integer.value,
100 (u32) operand[1]->integer.value, 100 (u32) operand[1]->integer.value,
101 (u32) operand[2]->integer.value)); 101 (u32) operand[2]->integer.value));
@@ -150,7 +150,7 @@ acpi_status acpi_ex_opcode_3A_1T_1R(struct acpi_walk_state *walk_state)
150 acpi_integer index; 150 acpi_integer index;
151 acpi_size length; 151 acpi_size length;
152 152
153 ACPI_FUNCTION_TRACE_STR("ex_opcode_3A_1T_1R", 153 ACPI_FUNCTION_TRACE_STR(ex_opcode_3A_1T_1R,
154 acpi_ps_get_opcode_name(walk_state->opcode)); 154 acpi_ps_get_opcode_name(walk_state->opcode));
155 155
156 switch (walk_state->opcode) { 156 switch (walk_state->opcode) {
diff --git a/drivers/acpi/executer/exoparg6.c b/drivers/acpi/executer/exoparg6.c
index 33e4fb1addce..f0c0ba6eb408 100644
--- a/drivers/acpi/executer/exoparg6.c
+++ b/drivers/acpi/executer/exoparg6.c
@@ -220,7 +220,7 @@ acpi_status acpi_ex_opcode_6A_0T_1R(struct acpi_walk_state * walk_state)
220 acpi_integer index; 220 acpi_integer index;
221 union acpi_operand_object *this_element; 221 union acpi_operand_object *this_element;
222 222
223 ACPI_FUNCTION_TRACE_STR("ex_opcode_6A_0T_1R", 223 ACPI_FUNCTION_TRACE_STR(ex_opcode_6A_0T_1R,
224 acpi_ps_get_opcode_name(walk_state->opcode)); 224 acpi_ps_get_opcode_name(walk_state->opcode));
225 225
226 switch (walk_state->opcode) { 226 switch (walk_state->opcode) {
diff --git a/drivers/acpi/executer/exprep.c b/drivers/acpi/executer/exprep.c
index 916234bf811c..44d064f427b9 100644
--- a/drivers/acpi/executer/exprep.c
+++ b/drivers/acpi/executer/exprep.c
@@ -97,7 +97,7 @@ acpi_ex_generate_access(u32 field_bit_offset,
97 u32 minimum_accesses = 0xFFFFFFFF; 97 u32 minimum_accesses = 0xFFFFFFFF;
98 u32 accesses; 98 u32 accesses;
99 99
100 ACPI_FUNCTION_TRACE("ex_generate_access"); 100 ACPI_FUNCTION_TRACE(ex_generate_access);
101 101
102 /* Round Field start offset and length to "minimal" byte boundaries */ 102 /* Round Field start offset and length to "minimal" byte boundaries */
103 103
@@ -146,7 +146,7 @@ acpi_ex_generate_access(u32 field_bit_offset,
146 accesses = field_end_offset - field_start_offset; 146 accesses = field_end_offset - field_start_offset;
147 147
148 ACPI_DEBUG_PRINT((ACPI_DB_BFIELD, 148 ACPI_DEBUG_PRINT((ACPI_DB_BFIELD,
149 "access_width %d end is within region\n", 149 "AccessWidth %d end is within region\n",
150 access_byte_width)); 150 access_byte_width));
151 151
152 ACPI_DEBUG_PRINT((ACPI_DB_BFIELD, 152 ACPI_DEBUG_PRINT((ACPI_DB_BFIELD,
@@ -173,7 +173,7 @@ acpi_ex_generate_access(u32 field_bit_offset,
173 } 173 }
174 } else { 174 } else {
175 ACPI_DEBUG_PRINT((ACPI_DB_BFIELD, 175 ACPI_DEBUG_PRINT((ACPI_DB_BFIELD,
176 "access_width %d end is NOT within region\n", 176 "AccessWidth %d end is NOT within region\n",
177 access_byte_width)); 177 access_byte_width));
178 if (access_byte_width == 1) { 178 if (access_byte_width == 1) {
179 ACPI_DEBUG_PRINT((ACPI_DB_BFIELD, 179 ACPI_DEBUG_PRINT((ACPI_DB_BFIELD,
@@ -228,7 +228,7 @@ acpi_ex_decode_field_access(union acpi_operand_object *obj_desc,
228 u32 byte_alignment; 228 u32 byte_alignment;
229 u32 bit_length; 229 u32 bit_length;
230 230
231 ACPI_FUNCTION_TRACE("ex_decode_field_access"); 231 ACPI_FUNCTION_TRACE(ex_decode_field_access);
232 232
233 access = (field_flags & AML_FIELD_ACCESS_TYPE_MASK); 233 access = (field_flags & AML_FIELD_ACCESS_TYPE_MASK);
234 234
@@ -322,7 +322,7 @@ acpi_ex_prep_common_field_object(union acpi_operand_object *obj_desc,
322 u32 byte_alignment; 322 u32 byte_alignment;
323 u32 nearest_byte_address; 323 u32 nearest_byte_address;
324 324
325 ACPI_FUNCTION_TRACE("ex_prep_common_field_object"); 325 ACPI_FUNCTION_TRACE(ex_prep_common_field_object);
326 326
327 /* 327 /*
328 * Note: the structure being initialized is the 328 * Note: the structure being initialized is the
@@ -415,13 +415,13 @@ acpi_status acpi_ex_prep_field_value(struct acpi_create_field_info *info)
415 u32 type; 415 u32 type;
416 acpi_status status; 416 acpi_status status;
417 417
418 ACPI_FUNCTION_TRACE("ex_prep_field_value"); 418 ACPI_FUNCTION_TRACE(ex_prep_field_value);
419 419
420 /* Parameter validation */ 420 /* Parameter validation */
421 421
422 if (info->field_type != ACPI_TYPE_LOCAL_INDEX_FIELD) { 422 if (info->field_type != ACPI_TYPE_LOCAL_INDEX_FIELD) {
423 if (!info->region_node) { 423 if (!info->region_node) {
424 ACPI_ERROR((AE_INFO, "Null region_node")); 424 ACPI_ERROR((AE_INFO, "Null RegionNode"));
425 return_ACPI_STATUS(AE_AML_NO_OPERAND); 425 return_ACPI_STATUS(AE_AML_NO_OPERAND);
426 } 426 }
427 427
@@ -467,7 +467,7 @@ acpi_status acpi_ex_prep_field_value(struct acpi_create_field_info *info)
467 acpi_ut_add_reference(obj_desc->field.region_obj); 467 acpi_ut_add_reference(obj_desc->field.region_obj);
468 468
469 ACPI_DEBUG_PRINT((ACPI_DB_BFIELD, 469 ACPI_DEBUG_PRINT((ACPI_DB_BFIELD,
470 "region_field: bit_off %X, Off %X, Gran %X, Region %p\n", 470 "RegionField: BitOff %X, Off %X, Gran %X, Region %p\n",
471 obj_desc->field.start_field_bit_offset, 471 obj_desc->field.start_field_bit_offset,
472 obj_desc->field.base_byte_offset, 472 obj_desc->field.base_byte_offset,
473 obj_desc->field.access_byte_width, 473 obj_desc->field.access_byte_width,
@@ -488,7 +488,7 @@ acpi_status acpi_ex_prep_field_value(struct acpi_create_field_info *info)
488 acpi_ut_add_reference(obj_desc->bank_field.bank_obj); 488 acpi_ut_add_reference(obj_desc->bank_field.bank_obj);
489 489
490 ACPI_DEBUG_PRINT((ACPI_DB_BFIELD, 490 ACPI_DEBUG_PRINT((ACPI_DB_BFIELD,
491 "Bank Field: bit_off %X, Off %X, Gran %X, Region %p, bank_reg %p\n", 491 "Bank Field: BitOff %X, Off %X, Gran %X, Region %p, BankReg %p\n",
492 obj_desc->bank_field.start_field_bit_offset, 492 obj_desc->bank_field.start_field_bit_offset,
493 obj_desc->bank_field.base_byte_offset, 493 obj_desc->bank_field.base_byte_offset,
494 obj_desc->field.access_byte_width, 494 obj_desc->field.access_byte_width,
@@ -519,23 +519,29 @@ acpi_status acpi_ex_prep_field_value(struct acpi_create_field_info *info)
519 acpi_ut_add_reference(obj_desc->index_field.index_obj); 519 acpi_ut_add_reference(obj_desc->index_field.index_obj);
520 520
521 /* 521 /*
522 * February 2006: Changed to match MS behavior 522 * April 2006: Changed to match MS behavior
523 * 523 *
524 * The value written to the Index register is the byte offset of the 524 * The value written to the Index register is the byte offset of the
525 * target field. 525 * target field in units of the granularity of the index_field
526 * 526 *
527 * Previously, the value was calculated as an index in terms of the 527 * Previously, the value was calculated as an index in terms of the
528 * width of the Data register, as below: 528 * width of the Data register, as below:
529 * 529 *
530 * obj_desc->index_field.Value = (u32) 530 * obj_desc->index_field.Value = (u32)
531 * (Info->field_bit_position / ACPI_MUL_8 ( 531 * (Info->field_bit_position / ACPI_MUL_8 (
532 * obj_desc->Field.access_byte_width)); 532 * obj_desc->Field.access_byte_width));
533 *
534 * February 2006: Tried value as a byte offset:
535 * obj_desc->index_field.Value = (u32)
536 * ACPI_DIV_8 (Info->field_bit_position);
533 */ 537 */
534 obj_desc->index_field.value = 538 obj_desc->index_field.value =
535 (u32) ACPI_DIV_8(info->field_bit_position); 539 (u32) ACPI_ROUND_DOWN(ACPI_DIV_8(info->field_bit_position),
540 obj_desc->index_field.
541 access_byte_width);
536 542
537 ACPI_DEBUG_PRINT((ACPI_DB_BFIELD, 543 ACPI_DEBUG_PRINT((ACPI_DB_BFIELD,
538 "index_field: bit_off %X, Off %X, Value %X, Gran %X, Index %p, Data %p\n", 544 "IndexField: BitOff %X, Off %X, Value %X, Gran %X, Index %p, Data %p\n",
539 obj_desc->index_field.start_field_bit_offset, 545 obj_desc->index_field.start_field_bit_offset,
540 obj_desc->index_field.base_byte_offset, 546 obj_desc->index_field.base_byte_offset,
541 obj_desc->index_field.value, 547 obj_desc->index_field.value,
@@ -557,7 +563,7 @@ acpi_status acpi_ex_prep_field_value(struct acpi_create_field_info *info)
557 acpi_ns_get_type(info->field_node)); 563 acpi_ns_get_type(info->field_node));
558 564
559 ACPI_DEBUG_PRINT((ACPI_DB_BFIELD, 565 ACPI_DEBUG_PRINT((ACPI_DB_BFIELD,
560 "Set named_obj %p [%4.4s], obj_desc %p\n", 566 "Set NamedObj %p [%4.4s], ObjDesc %p\n",
561 info->field_node, 567 info->field_node,
562 acpi_ut_get_node_name(info->field_node), obj_desc)); 568 acpi_ut_get_node_name(info->field_node), obj_desc));
563 569
diff --git a/drivers/acpi/executer/exregion.c b/drivers/acpi/executer/exregion.c
index fdeda7beae43..4fba452a5590 100644
--- a/drivers/acpi/executer/exregion.c
+++ b/drivers/acpi/executer/exregion.c
@@ -81,7 +81,7 @@ acpi_ex_system_memory_space_handler(u32 function,
81 u32 remainder; 81 u32 remainder;
82#endif 82#endif
83 83
84 ACPI_FUNCTION_TRACE("ex_system_memory_space_handler"); 84 ACPI_FUNCTION_TRACE(ex_system_memory_space_handler);
85 85
86 /* Validate and translate the bit width */ 86 /* Validate and translate the bit width */
87 87
@@ -103,7 +103,7 @@ acpi_ex_system_memory_space_handler(u32 function,
103 break; 103 break;
104 104
105 default: 105 default:
106 ACPI_ERROR((AE_INFO, "Invalid system_memory width %d", 106 ACPI_ERROR((AE_INFO, "Invalid SystemMemory width %d",
107 bit_width)); 107 bit_width));
108 return_ACPI_STATUS(AE_AML_OPERAND_VALUE); 108 return_ACPI_STATUS(AE_AML_OPERAND_VALUE);
109 } 109 }
@@ -284,7 +284,7 @@ acpi_ex_system_io_space_handler(u32 function,
284 acpi_status status = AE_OK; 284 acpi_status status = AE_OK;
285 u32 value32; 285 u32 value32;
286 286
287 ACPI_FUNCTION_TRACE("ex_system_io_space_handler"); 287 ACPI_FUNCTION_TRACE(ex_system_io_space_handler);
288 288
289 ACPI_DEBUG_PRINT((ACPI_DB_INFO, 289 ACPI_DEBUG_PRINT((ACPI_DB_INFO,
290 "System-IO (width %d) R/W %d Address=%8.8X%8.8X\n", 290 "System-IO (width %d) R/W %d Address=%8.8X%8.8X\n",
@@ -343,7 +343,7 @@ acpi_ex_pci_config_space_handler(u32 function,
343 struct acpi_pci_id *pci_id; 343 struct acpi_pci_id *pci_id;
344 u16 pci_register; 344 u16 pci_register;
345 345
346 ACPI_FUNCTION_TRACE("ex_pci_config_space_handler"); 346 ACPI_FUNCTION_TRACE(ex_pci_config_space_handler);
347 347
348 /* 348 /*
349 * The arguments to acpi_os(Read|Write)pci_configuration are: 349 * The arguments to acpi_os(Read|Write)pci_configuration are:
@@ -415,7 +415,7 @@ acpi_ex_cmos_space_handler(u32 function,
415{ 415{
416 acpi_status status = AE_OK; 416 acpi_status status = AE_OK;
417 417
418 ACPI_FUNCTION_TRACE("ex_cmos_space_handler"); 418 ACPI_FUNCTION_TRACE(ex_cmos_space_handler);
419 419
420 return_ACPI_STATUS(status); 420 return_ACPI_STATUS(status);
421} 421}
@@ -447,7 +447,7 @@ acpi_ex_pci_bar_space_handler(u32 function,
447{ 447{
448 acpi_status status = AE_OK; 448 acpi_status status = AE_OK;
449 449
450 ACPI_FUNCTION_TRACE("ex_pci_bar_space_handler"); 450 ACPI_FUNCTION_TRACE(ex_pci_bar_space_handler);
451 451
452 return_ACPI_STATUS(status); 452 return_ACPI_STATUS(status);
453} 453}
@@ -482,7 +482,7 @@ acpi_ex_data_table_space_handler(u32 function,
482 u32 i; 482 u32 i;
483 char *logical_addr_ptr; 483 char *logical_addr_ptr;
484 484
485 ACPI_FUNCTION_TRACE("ex_data_table_space_handler"); 485 ACPI_FUNCTION_TRACE(ex_data_table_space_handler);
486 486
487 logical_addr_ptr = ACPI_PHYSADDR_TO_PTR(address); 487 logical_addr_ptr = ACPI_PHYSADDR_TO_PTR(address);
488 488
diff --git a/drivers/acpi/executer/exresnte.c b/drivers/acpi/executer/exresnte.c
index 417d914d9e19..f9b9f5008596 100644
--- a/drivers/acpi/executer/exresnte.c
+++ b/drivers/acpi/executer/exresnte.c
@@ -87,7 +87,7 @@ acpi_ex_resolve_node_to_value(struct acpi_namespace_node **object_ptr,
87 struct acpi_namespace_node *node; 87 struct acpi_namespace_node *node;
88 acpi_object_type entry_type; 88 acpi_object_type entry_type;
89 89
90 ACPI_FUNCTION_TRACE("ex_resolve_node_to_value"); 90 ACPI_FUNCTION_TRACE(ex_resolve_node_to_value);
91 91
92 /* 92 /*
93 * The stack pointer points to a struct acpi_namespace_node (Node). Get the 93 * The stack pointer points to a struct acpi_namespace_node (Node). Get the
@@ -97,7 +97,7 @@ acpi_ex_resolve_node_to_value(struct acpi_namespace_node **object_ptr,
97 source_desc = acpi_ns_get_attached_object(node); 97 source_desc = acpi_ns_get_attached_object(node);
98 entry_type = acpi_ns_get_type((acpi_handle) node); 98 entry_type = acpi_ns_get_type((acpi_handle) node);
99 99
100 ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "Entry=%p source_desc=%p [%s]\n", 100 ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "Entry=%p SourceDesc=%p [%s]\n",
101 node, source_desc, 101 node, source_desc,
102 acpi_ut_get_type_name(entry_type))); 102 acpi_ut_get_type_name(entry_type)));
103 103
@@ -202,7 +202,7 @@ acpi_ex_resolve_node_to_value(struct acpi_namespace_node **object_ptr,
202 case ACPI_TYPE_LOCAL_INDEX_FIELD: 202 case ACPI_TYPE_LOCAL_INDEX_FIELD:
203 203
204 ACPI_DEBUG_PRINT((ACPI_DB_EXEC, 204 ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
205 "field_read Node=%p source_desc=%p Type=%X\n", 205 "FieldRead Node=%p SourceDesc=%p Type=%X\n",
206 node, source_desc, entry_type)); 206 node, source_desc, entry_type));
207 207
208 status = 208 status =
diff --git a/drivers/acpi/executer/exresolv.c b/drivers/acpi/executer/exresolv.c
index 22dabdd10604..006bba035d51 100644
--- a/drivers/acpi/executer/exresolv.c
+++ b/drivers/acpi/executer/exresolv.c
@@ -78,7 +78,7 @@ acpi_ex_resolve_to_value(union acpi_operand_object **stack_ptr,
78{ 78{
79 acpi_status status; 79 acpi_status status;
80 80
81 ACPI_FUNCTION_TRACE_PTR("ex_resolve_to_value", stack_ptr); 81 ACPI_FUNCTION_TRACE_PTR(ex_resolve_to_value, stack_ptr);
82 82
83 if (!stack_ptr || !*stack_ptr) { 83 if (!stack_ptr || !*stack_ptr) {
84 ACPI_ERROR((AE_INFO, "Internal - null pointer")); 84 ACPI_ERROR((AE_INFO, "Internal - null pointer"));
@@ -144,7 +144,7 @@ acpi_ex_resolve_object_to_value(union acpi_operand_object **stack_ptr,
144 union acpi_operand_object *obj_desc; 144 union acpi_operand_object *obj_desc;
145 u16 opcode; 145 u16 opcode;
146 146
147 ACPI_FUNCTION_TRACE("ex_resolve_object_to_value"); 147 ACPI_FUNCTION_TRACE(ex_resolve_object_to_value);
148 148
149 stack_desc = *stack_ptr; 149 stack_desc = *stack_ptr;
150 150
@@ -190,7 +190,7 @@ acpi_ex_resolve_object_to_value(union acpi_operand_object **stack_ptr,
190 } 190 }
191 191
192 ACPI_DEBUG_PRINT((ACPI_DB_EXEC, 192 ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
193 "[Arg/Local %X] value_obj is %p\n", 193 "[Arg/Local %X] ValueObj is %p\n",
194 stack_desc->reference.offset, 194 stack_desc->reference.offset,
195 obj_desc)); 195 obj_desc));
196 196
@@ -239,7 +239,7 @@ acpi_ex_resolve_object_to_value(union acpi_operand_object **stack_ptr,
239 /* Invalid reference object */ 239 /* Invalid reference object */
240 240
241 ACPI_ERROR((AE_INFO, 241 ACPI_ERROR((AE_INFO,
242 "Unknown target_type %X in Index/Reference obj %p", 242 "Unknown TargetType %X in Index/Reference obj %p",
243 stack_desc->reference.target_type, 243 stack_desc->reference.target_type,
244 stack_desc)); 244 stack_desc));
245 status = AE_AML_INTERNAL; 245 status = AE_AML_INTERNAL;
@@ -293,7 +293,7 @@ acpi_ex_resolve_object_to_value(union acpi_operand_object **stack_ptr,
293 case ACPI_TYPE_LOCAL_INDEX_FIELD: 293 case ACPI_TYPE_LOCAL_INDEX_FIELD:
294 294
295 ACPI_DEBUG_PRINT((ACPI_DB_EXEC, 295 ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
296 "field_read source_desc=%p Type=%X\n", 296 "FieldRead SourceDesc=%p Type=%X\n",
297 stack_desc, 297 stack_desc,
298 ACPI_GET_OBJECT_TYPE(stack_desc))); 298 ACPI_GET_OBJECT_TYPE(stack_desc)));
299 299
@@ -337,7 +337,7 @@ acpi_ex_resolve_multiple(struct acpi_walk_state *walk_state,
337 acpi_object_type type; 337 acpi_object_type type;
338 acpi_status status; 338 acpi_status status;
339 339
340 ACPI_FUNCTION_TRACE("acpi_ex_resolve_multiple"); 340 ACPI_FUNCTION_TRACE(acpi_ex_resolve_multiple);
341 341
342 /* Operand can be either a namespace node or an operand descriptor */ 342 /* Operand can be either a namespace node or an operand descriptor */
343 343
@@ -488,7 +488,7 @@ acpi_ex_resolve_multiple(struct acpi_walk_state *walk_state,
488 488
489 case AML_DEBUG_OP: 489 case AML_DEBUG_OP:
490 490
491 /* The Debug Object is of type "debug_object" */ 491 /* The Debug Object is of type "DebugObject" */
492 492
493 type = ACPI_TYPE_DEBUG_OBJECT; 493 type = ACPI_TYPE_DEBUG_OBJECT;
494 goto exit; 494 goto exit;
diff --git a/drivers/acpi/executer/exresop.c b/drivers/acpi/executer/exresop.c
index 42b9089dccc0..4c93d0972333 100644
--- a/drivers/acpi/executer/exresop.c
+++ b/drivers/acpi/executer/exresop.c
@@ -144,7 +144,7 @@ acpi_ex_resolve_operands(u16 opcode,
144 acpi_object_type type_needed; 144 acpi_object_type type_needed;
145 u16 target_op = 0; 145 u16 target_op = 0;
146 146
147 ACPI_FUNCTION_TRACE_U32("ex_resolve_operands", opcode); 147 ACPI_FUNCTION_TRACE_U32(ex_resolve_operands, opcode);
148 148
149 op_info = acpi_ps_get_opcode_info(opcode); 149 op_info = acpi_ps_get_opcode_info(opcode);
150 if (op_info->class == AML_CLASS_UNKNOWN) { 150 if (op_info->class == AML_CLASS_UNKNOWN) {
@@ -159,7 +159,7 @@ acpi_ex_resolve_operands(u16 opcode,
159 } 159 }
160 160
161 ACPI_DEBUG_PRINT((ACPI_DB_EXEC, 161 ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
162 "Opcode %X [%s] required_operand_types=%8.8X\n", 162 "Opcode %X [%s] RequiredOperandTypes=%8.8X\n",
163 opcode, op_info->name, arg_types)); 163 opcode, op_info->name, arg_types));
164 164
165 /* 165 /*
@@ -249,7 +249,7 @@ acpi_ex_resolve_operands(u16 opcode,
249 249
250 ACPI_DEBUG_ONLY_MEMBERS(ACPI_DEBUG_PRINT 250 ACPI_DEBUG_ONLY_MEMBERS(ACPI_DEBUG_PRINT
251 ((ACPI_DB_EXEC, 251 ((ACPI_DB_EXEC,
252 "Operand is a Reference, ref_opcode [%s]\n", 252 "Operand is a Reference, RefOpcode [%s]\n",
253 (acpi_ps_get_opcode_info 253 (acpi_ps_get_opcode_info
254 (obj_desc-> 254 (obj_desc->
255 reference. 255 reference.
@@ -626,7 +626,7 @@ acpi_ex_resolve_operands(u16 opcode,
626 626
627 default: 627 default:
628 ACPI_ERROR((AE_INFO, 628 ACPI_ERROR((AE_INFO,
629 "Needed [Region/region_field], found [%s] %p", 629 "Needed [Region/RegionField], found [%s] %p",
630 acpi_ut_get_object_type_name 630 acpi_ut_get_object_type_name
631 (obj_desc), obj_desc)); 631 (obj_desc), obj_desc));
632 632
diff --git a/drivers/acpi/executer/exstore.c b/drivers/acpi/executer/exstore.c
index 287476f319f4..0456405ba019 100644
--- a/drivers/acpi/executer/exstore.c
+++ b/drivers/acpi/executer/exstore.c
@@ -82,7 +82,7 @@ acpi_ex_do_debug_object(union acpi_operand_object *source_desc,
82{ 82{
83 u32 i; 83 u32 i;
84 84
85 ACPI_FUNCTION_TRACE_PTR("ex_do_debug_object", source_desc); 85 ACPI_FUNCTION_TRACE_PTR(ex_do_debug_object, source_desc);
86 86
87 ACPI_DEBUG_PRINT_RAW((ACPI_DB_DEBUG_OBJECT, "[ACPI Debug] %*s", 87 ACPI_DEBUG_PRINT_RAW((ACPI_DB_DEBUG_OBJECT, "[ACPI Debug] %*s",
88 level, " ")); 88 level, " "));
@@ -245,7 +245,7 @@ acpi_ex_store(union acpi_operand_object *source_desc,
245 acpi_status status = AE_OK; 245 acpi_status status = AE_OK;
246 union acpi_operand_object *ref_desc = dest_desc; 246 union acpi_operand_object *ref_desc = dest_desc;
247 247
248 ACPI_FUNCTION_TRACE_PTR("ex_store", dest_desc); 248 ACPI_FUNCTION_TRACE_PTR(ex_store, dest_desc);
249 249
250 /* Validate parameters */ 250 /* Validate parameters */
251 251
@@ -297,7 +297,7 @@ acpi_ex_store(union acpi_operand_object *source_desc,
297 297
298 ACPI_DUMP_STACK_ENTRY(source_desc); 298 ACPI_DUMP_STACK_ENTRY(source_desc);
299 ACPI_DUMP_STACK_ENTRY(dest_desc); 299 ACPI_DUMP_STACK_ENTRY(dest_desc);
300 ACPI_DUMP_OPERANDS(&dest_desc, ACPI_IMODE_EXECUTE, "ex_store", 300 ACPI_DUMP_OPERANDS(&dest_desc, ACPI_IMODE_EXECUTE, "ExStore",
301 2, 301 2,
302 "Target is not a Reference or Constant object"); 302 "Target is not a Reference or Constant object");
303 303
@@ -396,7 +396,7 @@ acpi_ex_store_object_to_index(union acpi_operand_object *source_desc,
396 u8 value = 0; 396 u8 value = 0;
397 u32 i; 397 u32 i;
398 398
399 ACPI_FUNCTION_TRACE("ex_store_object_to_index"); 399 ACPI_FUNCTION_TRACE(ex_store_object_to_index);
400 400
401 /* 401 /*
402 * Destination must be a reference pointer, and 402 * Destination must be a reference pointer, and
@@ -503,8 +503,7 @@ acpi_ex_store_object_to_index(union acpi_operand_object *source_desc,
503 break; 503 break;
504 504
505 default: 505 default:
506 ACPI_ERROR((AE_INFO, 506 ACPI_ERROR((AE_INFO, "Target is not a Package or BufferField"));
507 "Target is not a Package or buffer_field"));
508 status = AE_AML_OPERAND_TYPE; 507 status = AE_AML_OPERAND_TYPE;
509 break; 508 break;
510 } 509 }
@@ -549,7 +548,7 @@ acpi_ex_store_object_to_node(union acpi_operand_object *source_desc,
549 union acpi_operand_object *new_desc; 548 union acpi_operand_object *new_desc;
550 acpi_object_type target_type; 549 acpi_object_type target_type;
551 550
552 ACPI_FUNCTION_TRACE_PTR("ex_store_object_to_node", source_desc); 551 ACPI_FUNCTION_TRACE_PTR(ex_store_object_to_node, source_desc);
553 552
554 /* Get current type of the node, and object attached to Node */ 553 /* Get current type of the node, and object attached to Node */
555 554
diff --git a/drivers/acpi/executer/exstoren.c b/drivers/acpi/executer/exstoren.c
index 969f9cbbbeeb..591aaf0e18b3 100644
--- a/drivers/acpi/executer/exstoren.c
+++ b/drivers/acpi/executer/exstoren.c
@@ -72,7 +72,7 @@ acpi_ex_resolve_object(union acpi_operand_object **source_desc_ptr,
72 union acpi_operand_object *source_desc = *source_desc_ptr; 72 union acpi_operand_object *source_desc = *source_desc_ptr;
73 acpi_status status = AE_OK; 73 acpi_status status = AE_OK;
74 74
75 ACPI_FUNCTION_TRACE("ex_resolve_object"); 75 ACPI_FUNCTION_TRACE(ex_resolve_object);
76 76
77 /* Ensure we have a Target that can be stored to */ 77 /* Ensure we have a Target that can be stored to */
78 78
@@ -201,7 +201,7 @@ acpi_ex_store_object_to_object(union acpi_operand_object *source_desc,
201 union acpi_operand_object *actual_src_desc; 201 union acpi_operand_object *actual_src_desc;
202 acpi_status status = AE_OK; 202 acpi_status status = AE_OK;
203 203
204 ACPI_FUNCTION_TRACE_PTR("ex_store_object_to_object", source_desc); 204 ACPI_FUNCTION_TRACE_PTR(ex_store_object_to_object, source_desc);
205 205
206 actual_src_desc = source_desc; 206 actual_src_desc = source_desc;
207 if (!dest_desc) { 207 if (!dest_desc) {
diff --git a/drivers/acpi/executer/exstorob.c b/drivers/acpi/executer/exstorob.c
index db42461101e0..18925f5b313c 100644
--- a/drivers/acpi/executer/exstorob.c
+++ b/drivers/acpi/executer/exstorob.c
@@ -67,7 +67,7 @@ acpi_ex_store_buffer_to_buffer(union acpi_operand_object *source_desc,
67 u32 length; 67 u32 length;
68 u8 *buffer; 68 u8 *buffer;
69 69
70 ACPI_FUNCTION_TRACE_PTR("ex_store_buffer_to_buffer", source_desc); 70 ACPI_FUNCTION_TRACE_PTR(ex_store_buffer_to_buffer, source_desc);
71 71
72 /* We know that source_desc is a buffer by now */ 72 /* We know that source_desc is a buffer by now */
73 73
@@ -158,7 +158,7 @@ acpi_ex_store_string_to_string(union acpi_operand_object *source_desc,
158 u32 length; 158 u32 length;
159 u8 *buffer; 159 u8 *buffer;
160 160
161 ACPI_FUNCTION_TRACE_PTR("ex_store_string_to_string", source_desc); 161 ACPI_FUNCTION_TRACE_PTR(ex_store_string_to_string, source_desc);
162 162
163 /* We know that source_desc is a string by now */ 163 /* We know that source_desc is a string by now */
164 164
diff --git a/drivers/acpi/executer/exsystem.c b/drivers/acpi/executer/exsystem.c
index 6a2e47a0e112..52beee3674a0 100644
--- a/drivers/acpi/executer/exsystem.c
+++ b/drivers/acpi/executer/exsystem.c
@@ -68,7 +68,7 @@ acpi_status acpi_ex_system_wait_semaphore(acpi_handle semaphore, u16 timeout)
68 acpi_status status; 68 acpi_status status;
69 acpi_status status2; 69 acpi_status status2;
70 70
71 ACPI_FUNCTION_TRACE("ex_system_wait_semaphore"); 71 ACPI_FUNCTION_TRACE(ex_system_wait_semaphore);
72 72
73 status = acpi_os_wait_semaphore(semaphore, 1, 0); 73 status = acpi_os_wait_semaphore(semaphore, 1, 0);
74 if (ACPI_SUCCESS(status)) { 74 if (ACPI_SUCCESS(status)) {
@@ -193,7 +193,7 @@ acpi_ex_system_acquire_mutex(union acpi_operand_object * time_desc,
193{ 193{
194 acpi_status status = AE_OK; 194 acpi_status status = AE_OK;
195 195
196 ACPI_FUNCTION_TRACE_PTR("ex_system_acquire_mutex", obj_desc); 196 ACPI_FUNCTION_TRACE_PTR(ex_system_acquire_mutex, obj_desc);
197 197
198 if (!obj_desc) { 198 if (!obj_desc) {
199 return_ACPI_STATUS(AE_BAD_PARAMETER); 199 return_ACPI_STATUS(AE_BAD_PARAMETER);
@@ -231,7 +231,7 @@ acpi_status acpi_ex_system_release_mutex(union acpi_operand_object *obj_desc)
231{ 231{
232 acpi_status status = AE_OK; 232 acpi_status status = AE_OK;
233 233
234 ACPI_FUNCTION_TRACE("ex_system_release_mutex"); 234 ACPI_FUNCTION_TRACE(ex_system_release_mutex);
235 235
236 if (!obj_desc) { 236 if (!obj_desc) {
237 return_ACPI_STATUS(AE_BAD_PARAMETER); 237 return_ACPI_STATUS(AE_BAD_PARAMETER);
@@ -265,7 +265,7 @@ acpi_status acpi_ex_system_signal_event(union acpi_operand_object *obj_desc)
265{ 265{
266 acpi_status status = AE_OK; 266 acpi_status status = AE_OK;
267 267
268 ACPI_FUNCTION_TRACE("ex_system_signal_event"); 268 ACPI_FUNCTION_TRACE(ex_system_signal_event);
269 269
270 if (obj_desc) { 270 if (obj_desc) {
271 status = acpi_os_signal_semaphore(obj_desc->event.semaphore, 1); 271 status = acpi_os_signal_semaphore(obj_desc->event.semaphore, 1);
@@ -295,7 +295,7 @@ acpi_ex_system_wait_event(union acpi_operand_object *time_desc,
295{ 295{
296 acpi_status status = AE_OK; 296 acpi_status status = AE_OK;
297 297
298 ACPI_FUNCTION_TRACE("ex_system_wait_event"); 298 ACPI_FUNCTION_TRACE(ex_system_wait_event);
299 299
300 if (obj_desc) { 300 if (obj_desc) {
301 status = 301 status =
diff --git a/drivers/acpi/executer/exutils.c b/drivers/acpi/executer/exutils.c
index 8543d1a0ed31..3ef8cd703e06 100644
--- a/drivers/acpi/executer/exutils.c
+++ b/drivers/acpi/executer/exutils.c
@@ -87,7 +87,7 @@ acpi_status acpi_ex_enter_interpreter(void)
87{ 87{
88 acpi_status status; 88 acpi_status status;
89 89
90 ACPI_FUNCTION_TRACE("ex_enter_interpreter"); 90 ACPI_FUNCTION_TRACE(ex_enter_interpreter);
91 91
92 status = acpi_ut_acquire_mutex(ACPI_MTX_EXECUTE); 92 status = acpi_ut_acquire_mutex(ACPI_MTX_EXECUTE);
93 if (ACPI_FAILURE(status)) { 93 if (ACPI_FAILURE(status)) {
@@ -123,7 +123,7 @@ void acpi_ex_exit_interpreter(void)
123{ 123{
124 acpi_status status; 124 acpi_status status;
125 125
126 ACPI_FUNCTION_TRACE("ex_exit_interpreter"); 126 ACPI_FUNCTION_TRACE(ex_exit_interpreter);
127 127
128 status = acpi_ut_release_mutex(ACPI_MTX_EXECUTE); 128 status = acpi_ut_release_mutex(ACPI_MTX_EXECUTE);
129 if (ACPI_FAILURE(status)) { 129 if (ACPI_FAILURE(status)) {
@@ -189,7 +189,7 @@ u8 acpi_ex_acquire_global_lock(u32 field_flags)
189 u8 locked = FALSE; 189 u8 locked = FALSE;
190 acpi_status status; 190 acpi_status status;
191 191
192 ACPI_FUNCTION_TRACE("ex_acquire_global_lock"); 192 ACPI_FUNCTION_TRACE(ex_acquire_global_lock);
193 193
194 /* Only attempt lock if the always_lock bit is set */ 194 /* Only attempt lock if the always_lock bit is set */
195 195
@@ -226,7 +226,7 @@ void acpi_ex_release_global_lock(u8 locked_by_me)
226{ 226{
227 acpi_status status; 227 acpi_status status;
228 228
229 ACPI_FUNCTION_TRACE("ex_release_global_lock"); 229 ACPI_FUNCTION_TRACE(ex_release_global_lock);
230 230
231 /* Only attempt unlock if the caller locked it */ 231 /* Only attempt unlock if the caller locked it */
232 232
@@ -266,7 +266,7 @@ static u32 acpi_ex_digits_needed(acpi_integer value, u32 base)
266 u32 num_digits; 266 u32 num_digits;
267 acpi_integer current_value; 267 acpi_integer current_value;
268 268
269 ACPI_FUNCTION_TRACE("ex_digits_needed"); 269 ACPI_FUNCTION_TRACE(ex_digits_needed);
270 270
271 /* acpi_integer is unsigned, so we don't worry about a '-' prefix */ 271 /* acpi_integer is unsigned, so we don't worry about a '-' prefix */
272 272
diff --git a/drivers/acpi/hardware/hwacpi.c b/drivers/acpi/hardware/hwacpi.c
index ea2f13271ff1..de50fab2a910 100644
--- a/drivers/acpi/hardware/hwacpi.c
+++ b/drivers/acpi/hardware/hwacpi.c
@@ -63,7 +63,7 @@ acpi_status acpi_hw_initialize(void)
63{ 63{
64 acpi_status status; 64 acpi_status status;
65 65
66 ACPI_FUNCTION_TRACE("hw_initialize"); 66 ACPI_FUNCTION_TRACE(hw_initialize);
67 67
68 /* We must have the ACPI tables by the time we get here */ 68 /* We must have the ACPI tables by the time we get here */
69 69
@@ -100,7 +100,7 @@ acpi_status acpi_hw_set_mode(u32 mode)
100 acpi_status status; 100 acpi_status status;
101 u32 retry; 101 u32 retry;
102 102
103 ACPI_FUNCTION_TRACE("hw_set_mode"); 103 ACPI_FUNCTION_TRACE(hw_set_mode);
104 104
105 /* 105 /*
106 * ACPI 2.0 clarified that if SMI_CMD in FADT is zero, 106 * ACPI 2.0 clarified that if SMI_CMD in FADT is zero,
@@ -198,7 +198,7 @@ u32 acpi_hw_get_mode(void)
198 acpi_status status; 198 acpi_status status;
199 u32 value; 199 u32 value;
200 200
201 ACPI_FUNCTION_TRACE("hw_get_mode"); 201 ACPI_FUNCTION_TRACE(hw_get_mode);
202 202
203 /* 203 /*
204 * ACPI 2.0 clarified that if SMI_CMD in FADT is zero, 204 * ACPI 2.0 clarified that if SMI_CMD in FADT is zero,
diff --git a/drivers/acpi/hardware/hwgpe.c b/drivers/acpi/hardware/hwgpe.c
index 729b68eb3e35..608a3a60ee11 100644
--- a/drivers/acpi/hardware/hwgpe.c
+++ b/drivers/acpi/hardware/hwgpe.c
@@ -370,7 +370,7 @@ acpi_status acpi_hw_disable_all_gpes(void)
370{ 370{
371 acpi_status status; 371 acpi_status status;
372 372
373 ACPI_FUNCTION_TRACE("hw_disable_all_gpes"); 373 ACPI_FUNCTION_TRACE(hw_disable_all_gpes);
374 374
375 status = acpi_ev_walk_gpe_list(acpi_hw_disable_gpe_block); 375 status = acpi_ev_walk_gpe_list(acpi_hw_disable_gpe_block);
376 status = acpi_ev_walk_gpe_list(acpi_hw_clear_gpe_block); 376 status = acpi_ev_walk_gpe_list(acpi_hw_clear_gpe_block);
@@ -393,7 +393,7 @@ acpi_status acpi_hw_enable_all_runtime_gpes(void)
393{ 393{
394 acpi_status status; 394 acpi_status status;
395 395
396 ACPI_FUNCTION_TRACE("hw_enable_all_runtime_gpes"); 396 ACPI_FUNCTION_TRACE(hw_enable_all_runtime_gpes);
397 397
398 status = acpi_ev_walk_gpe_list(acpi_hw_enable_runtime_gpe_block); 398 status = acpi_ev_walk_gpe_list(acpi_hw_enable_runtime_gpe_block);
399 return_ACPI_STATUS(status); 399 return_ACPI_STATUS(status);
@@ -415,7 +415,7 @@ acpi_status acpi_hw_enable_all_wakeup_gpes(void)
415{ 415{
416 acpi_status status; 416 acpi_status status;
417 417
418 ACPI_FUNCTION_TRACE("hw_enable_all_wakeup_gpes"); 418 ACPI_FUNCTION_TRACE(hw_enable_all_wakeup_gpes);
419 419
420 status = acpi_ev_walk_gpe_list(acpi_hw_enable_wakeup_gpe_block); 420 status = acpi_ev_walk_gpe_list(acpi_hw_enable_wakeup_gpe_block);
421 return_ACPI_STATUS(status); 421 return_ACPI_STATUS(status);
diff --git a/drivers/acpi/hardware/hwregs.c b/drivers/acpi/hardware/hwregs.c
index 3d1f41c6bfe9..ec9f5a11a8b3 100644
--- a/drivers/acpi/hardware/hwregs.c
+++ b/drivers/acpi/hardware/hwregs.c
@@ -66,7 +66,7 @@ acpi_status acpi_hw_clear_acpi_status(u32 flags)
66{ 66{
67 acpi_status status; 67 acpi_status status;
68 68
69 ACPI_FUNCTION_TRACE("hw_clear_acpi_status"); 69 ACPI_FUNCTION_TRACE(hw_clear_acpi_status);
70 70
71 ACPI_DEBUG_PRINT((ACPI_DB_IO, "About to write %04X to %04X\n", 71 ACPI_DEBUG_PRINT((ACPI_DB_IO, "About to write %04X to %04X\n",
72 ACPI_BITMASK_ALL_FIXED_STATUS, 72 ACPI_BITMASK_ALL_FIXED_STATUS,
@@ -130,7 +130,7 @@ acpi_get_sleep_type_data(u8 sleep_state, u8 * sleep_type_a, u8 * sleep_type_b)
130 struct acpi_parameter_info info; 130 struct acpi_parameter_info info;
131 char *sleep_state_name; 131 char *sleep_state_name;
132 132
133 ACPI_FUNCTION_TRACE("acpi_get_sleep_type_data"); 133 ACPI_FUNCTION_TRACE(acpi_get_sleep_type_data);
134 134
135 /* Validate parameters */ 135 /* Validate parameters */
136 136
@@ -148,7 +148,7 @@ acpi_get_sleep_type_data(u8 sleep_state, u8 * sleep_type_a, u8 * sleep_type_b)
148 status = acpi_ns_evaluate_by_name(sleep_state_name, &info); 148 status = acpi_ns_evaluate_by_name(sleep_state_name, &info);
149 if (ACPI_FAILURE(status)) { 149 if (ACPI_FAILURE(status)) {
150 ACPI_DEBUG_PRINT((ACPI_DB_EXEC, 150 ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
151 "%s while evaluating sleep_state [%s]\n", 151 "%s while evaluating SleepState [%s]\n",
152 acpi_format_exception(status), 152 acpi_format_exception(status),
153 sleep_state_name)); 153 sleep_state_name));
154 154
@@ -208,7 +208,7 @@ acpi_get_sleep_type_data(u8 sleep_state, u8 * sleep_type_a, u8 * sleep_type_b)
208 208
209 if (ACPI_FAILURE(status)) { 209 if (ACPI_FAILURE(status)) {
210 ACPI_EXCEPTION((AE_INFO, status, 210 ACPI_EXCEPTION((AE_INFO, status,
211 "While evaluating sleep_state [%s], bad Sleep object %p type %s", 211 "While evaluating SleepState [%s], bad Sleep object %p type %s",
212 sleep_state_name, info.return_object, 212 sleep_state_name, info.return_object,
213 acpi_ut_get_object_type_name(info. 213 acpi_ut_get_object_type_name(info.
214 return_object))); 214 return_object)));
@@ -236,7 +236,7 @@ struct acpi_bit_register_info *acpi_hw_get_bit_register_info(u32 register_id)
236 ACPI_FUNCTION_ENTRY(); 236 ACPI_FUNCTION_ENTRY();
237 237
238 if (register_id > ACPI_BITREG_MAX) { 238 if (register_id > ACPI_BITREG_MAX) {
239 ACPI_ERROR((AE_INFO, "Invalid bit_register ID: %X", 239 ACPI_ERROR((AE_INFO, "Invalid BitRegister ID: %X",
240 register_id)); 240 register_id));
241 return (NULL); 241 return (NULL);
242 } 242 }
@@ -265,7 +265,7 @@ acpi_status acpi_get_register(u32 register_id, u32 * return_value, u32 flags)
265 struct acpi_bit_register_info *bit_reg_info; 265 struct acpi_bit_register_info *bit_reg_info;
266 acpi_status status; 266 acpi_status status;
267 267
268 ACPI_FUNCTION_TRACE("acpi_get_register"); 268 ACPI_FUNCTION_TRACE(acpi_get_register);
269 269
270 /* Get the info structure corresponding to the requested ACPI Register */ 270 /* Get the info structure corresponding to the requested ACPI Register */
271 271
@@ -331,13 +331,13 @@ acpi_status acpi_set_register(u32 register_id, u32 value, u32 flags)
331 struct acpi_bit_register_info *bit_reg_info; 331 struct acpi_bit_register_info *bit_reg_info;
332 acpi_status status; 332 acpi_status status;
333 333
334 ACPI_FUNCTION_TRACE_U32("acpi_set_register", register_id); 334 ACPI_FUNCTION_TRACE_U32(acpi_set_register, register_id);
335 335
336 /* Get the info structure corresponding to the requested ACPI Register */ 336 /* Get the info structure corresponding to the requested ACPI Register */
337 337
338 bit_reg_info = acpi_hw_get_bit_register_info(register_id); 338 bit_reg_info = acpi_hw_get_bit_register_info(register_id);
339 if (!bit_reg_info) { 339 if (!bit_reg_info) {
340 ACPI_ERROR((AE_INFO, "Bad ACPI HW register_id: %X", 340 ACPI_ERROR((AE_INFO, "Bad ACPI HW RegisterId: %X",
341 register_id)); 341 register_id));
342 return_ACPI_STATUS(AE_BAD_PARAMETER); 342 return_ACPI_STATUS(AE_BAD_PARAMETER);
343 } 343 }
@@ -494,7 +494,7 @@ acpi_hw_register_read(u8 use_lock, u32 register_id, u32 * return_value)
494 u32 value2 = 0; 494 u32 value2 = 0;
495 acpi_status status; 495 acpi_status status;
496 496
497 ACPI_FUNCTION_TRACE("hw_register_read"); 497 ACPI_FUNCTION_TRACE(hw_register_read);
498 498
499 if (ACPI_MTX_LOCK == use_lock) { 499 if (ACPI_MTX_LOCK == use_lock) {
500 status = acpi_ut_acquire_mutex(ACPI_MTX_HARDWARE); 500 status = acpi_ut_acquire_mutex(ACPI_MTX_HARDWARE);
@@ -607,7 +607,7 @@ acpi_status acpi_hw_register_write(u8 use_lock, u32 register_id, u32 value)
607{ 607{
608 acpi_status status; 608 acpi_status status;
609 609
610 ACPI_FUNCTION_TRACE("hw_register_write"); 610 ACPI_FUNCTION_TRACE(hw_register_write);
611 611
612 if (ACPI_MTX_LOCK == use_lock) { 612 if (ACPI_MTX_LOCK == use_lock) {
613 status = acpi_ut_acquire_mutex(ACPI_MTX_HARDWARE); 613 status = acpi_ut_acquire_mutex(ACPI_MTX_HARDWARE);
@@ -729,7 +729,7 @@ acpi_hw_low_level_read(u32 width, u32 * value, struct acpi_generic_address *reg)
729 u64 address; 729 u64 address;
730 acpi_status status; 730 acpi_status status;
731 731
732 ACPI_FUNCTION_NAME("hw_low_level_read"); 732 ACPI_FUNCTION_NAME(hw_low_level_read);
733 733
734 /* 734 /*
735 * Must have a valid pointer to a GAS structure, and 735 * Must have a valid pointer to a GAS structure, and
@@ -801,7 +801,7 @@ acpi_hw_low_level_write(u32 width, u32 value, struct acpi_generic_address * reg)
801 u64 address; 801 u64 address;
802 acpi_status status; 802 acpi_status status;
803 803
804 ACPI_FUNCTION_NAME("hw_low_level_write"); 804 ACPI_FUNCTION_NAME(hw_low_level_write);
805 805
806 /* 806 /*
807 * Must have a valid pointer to a GAS structure, and 807 * Must have a valid pointer to a GAS structure, and
diff --git a/drivers/acpi/hardware/hwsleep.c b/drivers/acpi/hardware/hwsleep.c
index 685debafbb72..8bb43cae60c2 100644
--- a/drivers/acpi/hardware/hwsleep.c
+++ b/drivers/acpi/hardware/hwsleep.c
@@ -63,7 +63,7 @@ acpi_status
63acpi_set_firmware_waking_vector(acpi_physical_address physical_address) 63acpi_set_firmware_waking_vector(acpi_physical_address physical_address)
64{ 64{
65 65
66 ACPI_FUNCTION_TRACE("acpi_set_firmware_waking_vector"); 66 ACPI_FUNCTION_TRACE(acpi_set_firmware_waking_vector);
67 67
68 /* Set the vector */ 68 /* Set the vector */
69 69
@@ -98,7 +98,7 @@ acpi_status
98acpi_get_firmware_waking_vector(acpi_physical_address * physical_address) 98acpi_get_firmware_waking_vector(acpi_physical_address * physical_address)
99{ 99{
100 100
101 ACPI_FUNCTION_TRACE("acpi_get_firmware_waking_vector"); 101 ACPI_FUNCTION_TRACE(acpi_get_firmware_waking_vector);
102 102
103 if (!physical_address) { 103 if (!physical_address) {
104 return_ACPI_STATUS(AE_BAD_PARAMETER); 104 return_ACPI_STATUS(AE_BAD_PARAMETER);
@@ -142,7 +142,7 @@ acpi_status acpi_enter_sleep_state_prep(u8 sleep_state)
142 struct acpi_object_list arg_list; 142 struct acpi_object_list arg_list;
143 union acpi_object arg; 143 union acpi_object arg;
144 144
145 ACPI_FUNCTION_TRACE("acpi_enter_sleep_state_prep"); 145 ACPI_FUNCTION_TRACE(acpi_enter_sleep_state_prep);
146 146
147 /* 147 /*
148 * _PSW methods could be run here to enable wake-on keyboard, LAN, etc. 148 * _PSW methods could be run here to enable wake-on keyboard, LAN, etc.
@@ -230,7 +230,7 @@ acpi_status asmlinkage acpi_enter_sleep_state(u8 sleep_state)
230 u32 in_value; 230 u32 in_value;
231 acpi_status status; 231 acpi_status status;
232 232
233 ACPI_FUNCTION_TRACE("acpi_enter_sleep_state"); 233 ACPI_FUNCTION_TRACE(acpi_enter_sleep_state);
234 234
235 if ((acpi_gbl_sleep_type_a > ACPI_SLEEP_TYPE_MAX) || 235 if ((acpi_gbl_sleep_type_a > ACPI_SLEEP_TYPE_MAX) ||
236 (acpi_gbl_sleep_type_b > ACPI_SLEEP_TYPE_MAX)) { 236 (acpi_gbl_sleep_type_b > ACPI_SLEEP_TYPE_MAX)) {
@@ -399,7 +399,7 @@ acpi_status asmlinkage acpi_enter_sleep_state_s4bios(void)
399 u32 in_value; 399 u32 in_value;
400 acpi_status status; 400 acpi_status status;
401 401
402 ACPI_FUNCTION_TRACE("acpi_enter_sleep_state_s4bios"); 402 ACPI_FUNCTION_TRACE(acpi_enter_sleep_state_s4bios);
403 403
404 status = 404 status =
405 acpi_set_register(ACPI_BITREG_WAKE_STATUS, 1, ACPI_MTX_DO_NOT_LOCK); 405 acpi_set_register(ACPI_BITREG_WAKE_STATUS, 1, ACPI_MTX_DO_NOT_LOCK);
@@ -468,7 +468,7 @@ acpi_status acpi_leave_sleep_state(u8 sleep_state)
468 u32 PM1Acontrol; 468 u32 PM1Acontrol;
469 u32 PM1Bcontrol; 469 u32 PM1Bcontrol;
470 470
471 ACPI_FUNCTION_TRACE("acpi_leave_sleep_state"); 471 ACPI_FUNCTION_TRACE(acpi_leave_sleep_state);
472 472
473 /* 473 /*
474 * Set SLP_TYPE and SLP_EN to state S0. 474 * Set SLP_TYPE and SLP_EN to state S0.
diff --git a/drivers/acpi/hardware/hwtimer.c b/drivers/acpi/hardware/hwtimer.c
index a559ac17b132..c4ec47c939fd 100644
--- a/drivers/acpi/hardware/hwtimer.c
+++ b/drivers/acpi/hardware/hwtimer.c
@@ -60,7 +60,7 @@ ACPI_MODULE_NAME("hwtimer")
60 ******************************************************************************/ 60 ******************************************************************************/
61acpi_status acpi_get_timer_resolution(u32 * resolution) 61acpi_status acpi_get_timer_resolution(u32 * resolution)
62{ 62{
63 ACPI_FUNCTION_TRACE("acpi_get_timer_resolution"); 63 ACPI_FUNCTION_TRACE(acpi_get_timer_resolution);
64 64
65 if (!resolution) { 65 if (!resolution) {
66 return_ACPI_STATUS(AE_BAD_PARAMETER); 66 return_ACPI_STATUS(AE_BAD_PARAMETER);
@@ -92,7 +92,7 @@ acpi_status acpi_get_timer(u32 * ticks)
92{ 92{
93 acpi_status status; 93 acpi_status status;
94 94
95 ACPI_FUNCTION_TRACE("acpi_get_timer"); 95 ACPI_FUNCTION_TRACE(acpi_get_timer);
96 96
97 if (!ticks) { 97 if (!ticks) {
98 return_ACPI_STATUS(AE_BAD_PARAMETER); 98 return_ACPI_STATUS(AE_BAD_PARAMETER);
@@ -140,7 +140,7 @@ acpi_get_timer_duration(u32 start_ticks, u32 end_ticks, u32 * time_elapsed)
140 u32 delta_ticks; 140 u32 delta_ticks;
141 acpi_integer quotient; 141 acpi_integer quotient;
142 142
143 ACPI_FUNCTION_TRACE("acpi_get_timer_duration"); 143 ACPI_FUNCTION_TRACE(acpi_get_timer_duration);
144 144
145 if (!time_elapsed) { 145 if (!time_elapsed) {
146 return_ACPI_STATUS(AE_BAD_PARAMETER); 146 return_ACPI_STATUS(AE_BAD_PARAMETER);
diff --git a/drivers/acpi/namespace/nsaccess.c b/drivers/acpi/namespace/nsaccess.c
index d4914fda6a37..5e3f63a90fb4 100644
--- a/drivers/acpi/namespace/nsaccess.c
+++ b/drivers/acpi/namespace/nsaccess.c
@@ -70,7 +70,7 @@ acpi_status acpi_ns_root_initialize(void)
70 union acpi_operand_object *obj_desc; 70 union acpi_operand_object *obj_desc;
71 acpi_string val = NULL; 71 acpi_string val = NULL;
72 72
73 ACPI_FUNCTION_TRACE("ns_root_initialize"); 73 ACPI_FUNCTION_TRACE(ns_root_initialize);
74 74
75 status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE); 75 status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
76 if (ACPI_FAILURE(status)) { 76 if (ACPI_FAILURE(status)) {
@@ -314,7 +314,7 @@ acpi_ns_lookup(union acpi_generic_state *scope_info,
314 u32 local_flags = flags & ~(ACPI_NS_ERROR_IF_FOUND | 314 u32 local_flags = flags & ~(ACPI_NS_ERROR_IF_FOUND |
315 ACPI_NS_SEARCH_PARENT); 315 ACPI_NS_SEARCH_PARENT);
316 316
317 ACPI_FUNCTION_TRACE("ns_lookup"); 317 ACPI_FUNCTION_TRACE(ns_lookup);
318 318
319 if (!return_node) { 319 if (!return_node) {
320 return_ACPI_STATUS(AE_BAD_PARAMETER); 320 return_ACPI_STATUS(AE_BAD_PARAMETER);
@@ -615,7 +615,7 @@ acpi_ns_lookup(union acpi_generic_state *scope_info,
615 /* Complain about a type mismatch */ 615 /* Complain about a type mismatch */
616 616
617 ACPI_WARNING((AE_INFO, 617 ACPI_WARNING((AE_INFO,
618 "ns_lookup: Type mismatch on %4.4s (%s), searching for (%s)", 618 "NsLookup: Type mismatch on %4.4s (%s), searching for (%s)",
619 ACPI_CAST_PTR(char, &simple_name), 619 ACPI_CAST_PTR(char, &simple_name),
620 acpi_ut_get_type_name(this_node->type), 620 acpi_ut_get_type_name(this_node->type),
621 acpi_ut_get_type_name 621 acpi_ut_get_type_name
diff --git a/drivers/acpi/namespace/nsalloc.c b/drivers/acpi/namespace/nsalloc.c
index c92c03693a16..dc3f0739a46b 100644
--- a/drivers/acpi/namespace/nsalloc.c
+++ b/drivers/acpi/namespace/nsalloc.c
@@ -62,7 +62,7 @@ struct acpi_namespace_node *acpi_ns_create_node(u32 name)
62{ 62{
63 struct acpi_namespace_node *node; 63 struct acpi_namespace_node *node;
64 64
65 ACPI_FUNCTION_TRACE("ns_create_node"); 65 ACPI_FUNCTION_TRACE(ns_create_node);
66 66
67 node = acpi_os_acquire_object(acpi_gbl_namespace_cache); 67 node = acpi_os_acquire_object(acpi_gbl_namespace_cache);
68 if (!node) { 68 if (!node) {
@@ -94,7 +94,7 @@ void acpi_ns_delete_node(struct acpi_namespace_node *node)
94 struct acpi_namespace_node *prev_node; 94 struct acpi_namespace_node *prev_node;
95 struct acpi_namespace_node *next_node; 95 struct acpi_namespace_node *next_node;
96 96
97 ACPI_FUNCTION_TRACE_PTR("ns_delete_node", node); 97 ACPI_FUNCTION_TRACE_PTR(ns_delete_node, node);
98 98
99 parent_node = acpi_ns_get_parent_node(node); 99 parent_node = acpi_ns_get_parent_node(node);
100 100
@@ -167,7 +167,7 @@ void acpi_ns_install_node(struct acpi_walk_state *walk_state, struct acpi_namesp
167 acpi_owner_id owner_id = 0; 167 acpi_owner_id owner_id = 0;
168 struct acpi_namespace_node *child_node; 168 struct acpi_namespace_node *child_node;
169 169
170 ACPI_FUNCTION_TRACE("ns_install_node"); 170 ACPI_FUNCTION_TRACE(ns_install_node);
171 171
172 /* 172 /*
173 * Get the owner ID from the Walk state 173 * Get the owner ID from the Walk state
@@ -234,7 +234,7 @@ void acpi_ns_delete_children(struct acpi_namespace_node *parent_node)
234 struct acpi_namespace_node *next_node; 234 struct acpi_namespace_node *next_node;
235 u8 flags; 235 u8 flags;
236 236
237 ACPI_FUNCTION_TRACE_PTR("ns_delete_children", parent_node); 237 ACPI_FUNCTION_TRACE_PTR(ns_delete_children, parent_node);
238 238
239 if (!parent_node) { 239 if (!parent_node) {
240 return_VOID; 240 return_VOID;
@@ -313,7 +313,7 @@ void acpi_ns_delete_namespace_subtree(struct acpi_namespace_node *parent_node)
313 struct acpi_namespace_node *child_node = NULL; 313 struct acpi_namespace_node *child_node = NULL;
314 u32 level = 1; 314 u32 level = 1;
315 315
316 ACPI_FUNCTION_TRACE("ns_delete_namespace_subtree"); 316 ACPI_FUNCTION_TRACE(ns_delete_namespace_subtree);
317 317
318 if (!parent_node) { 318 if (!parent_node) {
319 return_VOID; 319 return_VOID;
@@ -395,7 +395,7 @@ void acpi_ns_delete_namespace_by_owner(acpi_owner_id owner_id)
395 u32 level; 395 u32 level;
396 struct acpi_namespace_node *parent_node; 396 struct acpi_namespace_node *parent_node;
397 397
398 ACPI_FUNCTION_TRACE_U32("ns_delete_namespace_by_owner", owner_id); 398 ACPI_FUNCTION_TRACE_U32(ns_delete_namespace_by_owner, owner_id);
399 399
400 if (owner_id == 0) { 400 if (owner_id == 0) {
401 return_VOID; 401 return_VOID;
diff --git a/drivers/acpi/namespace/nsdump.c b/drivers/acpi/namespace/nsdump.c
index 5662d2def62f..d72df66aa965 100644
--- a/drivers/acpi/namespace/nsdump.c
+++ b/drivers/acpi/namespace/nsdump.c
@@ -75,7 +75,7 @@ void acpi_ns_print_pathname(u32 num_segments, char *pathname)
75{ 75{
76 acpi_native_uint i; 76 acpi_native_uint i;
77 77
78 ACPI_FUNCTION_NAME("ns_print_pathname"); 78 ACPI_FUNCTION_NAME(ns_print_pathname);
79 79
80 if (!(acpi_dbg_level & ACPI_LV_NAMES) 80 if (!(acpi_dbg_level & ACPI_LV_NAMES)
81 || !(acpi_dbg_layer & ACPI_NAMESPACE)) { 81 || !(acpi_dbg_layer & ACPI_NAMESPACE)) {
@@ -123,7 +123,7 @@ void
123acpi_ns_dump_pathname(acpi_handle handle, char *msg, u32 level, u32 component) 123acpi_ns_dump_pathname(acpi_handle handle, char *msg, u32 level, u32 component)
124{ 124{
125 125
126 ACPI_FUNCTION_TRACE("ns_dump_pathname"); 126 ACPI_FUNCTION_TRACE(ns_dump_pathname);
127 127
128 /* Do this only if the requested debug level and component are enabled */ 128 /* Do this only if the requested debug level and component are enabled */
129 129
@@ -167,7 +167,7 @@ acpi_ns_dump_one_object(acpi_handle obj_handle,
167 u32 dbg_level; 167 u32 dbg_level;
168 u32 i; 168 u32 i;
169 169
170 ACPI_FUNCTION_NAME("ns_dump_one_object"); 170 ACPI_FUNCTION_NAME(ns_dump_one_object);
171 171
172 /* Is output enabled? */ 172 /* Is output enabled? */
173 173
@@ -675,7 +675,7 @@ void acpi_ns_dump_tables(acpi_handle search_base, u32 max_depth)
675{ 675{
676 acpi_handle search_handle = search_base; 676 acpi_handle search_handle = search_base;
677 677
678 ACPI_FUNCTION_TRACE("ns_dump_tables"); 678 ACPI_FUNCTION_TRACE(ns_dump_tables);
679 679
680 if (!acpi_gbl_root_node) { 680 if (!acpi_gbl_root_node) {
681 /* 681 /*
diff --git a/drivers/acpi/namespace/nsdumpdv.c b/drivers/acpi/namespace/nsdumpdv.c
index 2b311da01ef5..c6bf5d30fca3 100644
--- a/drivers/acpi/namespace/nsdumpdv.c
+++ b/drivers/acpi/namespace/nsdumpdv.c
@@ -74,7 +74,7 @@ acpi_ns_dump_one_device(acpi_handle obj_handle,
74 acpi_status status; 74 acpi_status status;
75 u32 i; 75 u32 i;
76 76
77 ACPI_FUNCTION_NAME("ns_dump_one_device"); 77 ACPI_FUNCTION_NAME(ns_dump_one_device);
78 78
79 status = 79 status =
80 acpi_ns_dump_one_object(obj_handle, level, context, return_value); 80 acpi_ns_dump_one_object(obj_handle, level, context, return_value);
@@ -115,7 +115,7 @@ void acpi_ns_dump_root_devices(void)
115 acpi_handle sys_bus_handle; 115 acpi_handle sys_bus_handle;
116 acpi_status status; 116 acpi_status status;
117 117
118 ACPI_FUNCTION_NAME("ns_dump_root_devices"); 118 ACPI_FUNCTION_NAME(ns_dump_root_devices);
119 119
120 /* Only dump the table if tracing is enabled */ 120 /* Only dump the table if tracing is enabled */
121 121
diff --git a/drivers/acpi/namespace/nseval.c b/drivers/acpi/namespace/nseval.c
index f5d8e71b82cc..4b054062b46a 100644
--- a/drivers/acpi/namespace/nseval.c
+++ b/drivers/acpi/namespace/nseval.c
@@ -85,7 +85,7 @@ acpi_ns_evaluate_relative(char *pathname, struct acpi_parameter_info *info)
85 union acpi_generic_state *scope_info; 85 union acpi_generic_state *scope_info;
86 char *internal_path = NULL; 86 char *internal_path = NULL;
87 87
88 ACPI_FUNCTION_TRACE("ns_evaluate_relative"); 88 ACPI_FUNCTION_TRACE(ns_evaluate_relative);
89 89
90 /* 90 /*
91 * Must have a valid object handle 91 * Must have a valid object handle
@@ -182,7 +182,7 @@ acpi_ns_evaluate_by_name(char *pathname, struct acpi_parameter_info *info)
182 acpi_status status; 182 acpi_status status;
183 char *internal_path = NULL; 183 char *internal_path = NULL;
184 184
185 ACPI_FUNCTION_TRACE("ns_evaluate_by_name"); 185 ACPI_FUNCTION_TRACE(ns_evaluate_by_name);
186 186
187 /* Build an internal name string for the method */ 187 /* Build an internal name string for the method */
188 188
@@ -262,7 +262,7 @@ acpi_status acpi_ns_evaluate_by_handle(struct acpi_parameter_info *info)
262{ 262{
263 acpi_status status; 263 acpi_status status;
264 264
265 ACPI_FUNCTION_TRACE("ns_evaluate_by_handle"); 265 ACPI_FUNCTION_TRACE(ns_evaluate_by_handle);
266 266
267 /* Check if namespace has been initialized */ 267 /* Check if namespace has been initialized */
268 268
@@ -368,7 +368,7 @@ acpi_ns_execute_control_method(struct acpi_parameter_info *info)
368{ 368{
369 acpi_status status; 369 acpi_status status;
370 370
371 ACPI_FUNCTION_TRACE("ns_execute_control_method"); 371 ACPI_FUNCTION_TRACE(ns_execute_control_method);
372 372
373 /* Verify that there is a method associated with this object */ 373 /* Verify that there is a method associated with this object */
374 374
@@ -436,7 +436,7 @@ static acpi_status acpi_ns_get_object_value(struct acpi_parameter_info *info)
436 acpi_status status = AE_OK; 436 acpi_status status = AE_OK;
437 struct acpi_namespace_node *resolved_node = info->node; 437 struct acpi_namespace_node *resolved_node = info->node;
438 438
439 ACPI_FUNCTION_TRACE("ns_get_object_value"); 439 ACPI_FUNCTION_TRACE(ns_get_object_value);
440 440
441 /* 441 /*
442 * Objects require additional resolution steps (e.g., the Node may be a 442 * Objects require additional resolution steps (e.g., the Node may be a
diff --git a/drivers/acpi/namespace/nsinit.c b/drivers/acpi/namespace/nsinit.c
index 57b2537643c7..bf1d8dbc0b86 100644
--- a/drivers/acpi/namespace/nsinit.c
+++ b/drivers/acpi/namespace/nsinit.c
@@ -58,6 +58,10 @@ static acpi_status
58acpi_ns_init_one_device(acpi_handle obj_handle, 58acpi_ns_init_one_device(acpi_handle obj_handle,
59 u32 nesting_level, void *context, void **return_value); 59 u32 nesting_level, void *context, void **return_value);
60 60
61static acpi_status
62acpi_ns_find_ini_methods(acpi_handle obj_handle,
63 u32 nesting_level, void *context, void **return_value);
64
61/******************************************************************************* 65/*******************************************************************************
62 * 66 *
63 * FUNCTION: acpi_ns_initialize_objects 67 * FUNCTION: acpi_ns_initialize_objects
@@ -76,7 +80,7 @@ acpi_status acpi_ns_initialize_objects(void)
76 acpi_status status; 80 acpi_status status;
77 struct acpi_init_walk_info info; 81 struct acpi_init_walk_info info;
78 82
79 ACPI_FUNCTION_TRACE("ns_initialize_objects"); 83 ACPI_FUNCTION_TRACE(ns_initialize_objects);
80 84
81 ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH, 85 ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,
82 "**** Starting initialization of namespace objects ****\n")); 86 "**** Starting initialization of namespace objects ****\n"));
@@ -93,7 +97,7 @@ acpi_status acpi_ns_initialize_objects(void)
93 ACPI_UINT32_MAX, acpi_ns_init_one_object, 97 ACPI_UINT32_MAX, acpi_ns_init_one_object,
94 &info, NULL); 98 &info, NULL);
95 if (ACPI_FAILURE(status)) { 99 if (ACPI_FAILURE(status)) {
96 ACPI_EXCEPTION((AE_INFO, status, "During walk_namespace")); 100 ACPI_EXCEPTION((AE_INFO, status, "During WalkNamespace"));
97 } 101 }
98 102
99 ACPI_DEBUG_PRINT_RAW((ACPI_DB_INIT, 103 ACPI_DEBUG_PRINT_RAW((ACPI_DB_INIT,
@@ -133,7 +137,7 @@ acpi_status acpi_ns_initialize_devices(void)
133 acpi_status status; 137 acpi_status status;
134 struct acpi_device_walk_info info; 138 struct acpi_device_walk_info info;
135 139
136 ACPI_FUNCTION_TRACE("ns_initialize_devices"); 140 ACPI_FUNCTION_TRACE(ns_initialize_devices);
137 141
138 /* Init counters */ 142 /* Init counters */
139 143
@@ -142,28 +146,29 @@ acpi_status acpi_ns_initialize_devices(void)
142 info.num_INI = 0; 146 info.num_INI = 0;
143 147
144 ACPI_DEBUG_PRINT_RAW((ACPI_DB_INIT, 148 ACPI_DEBUG_PRINT_RAW((ACPI_DB_INIT,
145 "Executing all Device _STA and_INI methods:")); 149 "Initializing Device/Processor/Thermal objects by executing _INI methods:"));
150
151 /* Tree analysis: find all subtrees that contain _INI methods */
146 152
147 status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE); 153 status = acpi_ns_walk_namespace(ACPI_TYPE_ANY, ACPI_ROOT_OBJECT,
154 ACPI_UINT32_MAX, FALSE,
155 acpi_ns_find_ini_methods, &info, NULL);
148 if (ACPI_FAILURE(status)) { 156 if (ACPI_FAILURE(status)) {
149 return_ACPI_STATUS(status); 157 ACPI_EXCEPTION((AE_INFO, status, "During WalkNamespace"));
150 } 158 }
151 159
152 /* Walk namespace for all objects */ 160 /* Walk namespace to execute all _INIs on present devices */
153 161
154 status = acpi_ns_walk_namespace(ACPI_TYPE_ANY, ACPI_ROOT_OBJECT, 162 status = acpi_ns_walk_namespace(ACPI_TYPE_ANY, ACPI_ROOT_OBJECT,
155 ACPI_UINT32_MAX, TRUE, 163 ACPI_UINT32_MAX, FALSE,
156 acpi_ns_init_one_device, &info, NULL); 164 acpi_ns_init_one_device, &info, NULL);
157
158 (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
159
160 if (ACPI_FAILURE(status)) { 165 if (ACPI_FAILURE(status)) {
161 ACPI_EXCEPTION((AE_INFO, status, "During walk_namespace")); 166 ACPI_EXCEPTION((AE_INFO, status, "During WalkNamespace"));
162 } 167 }
163 168
164 ACPI_DEBUG_PRINT_RAW((ACPI_DB_INIT, 169 ACPI_DEBUG_PRINT_RAW((ACPI_DB_INIT,
165 "\n%hd Devices found - executed %hd _STA, %hd _INI methods\n", 170 "\nExecuted %hd _INI methods requiring %hd _STA executions (examined %hd objects)\n",
166 info.device_count, info.num_STA, info.num_INI)); 171 info.num_INI, info.num_STA, info.device_count));
167 172
168 return_ACPI_STATUS(status); 173 return_ACPI_STATUS(status);
169} 174}
@@ -200,7 +205,7 @@ acpi_ns_init_one_object(acpi_handle obj_handle,
200 (struct acpi_namespace_node *)obj_handle; 205 (struct acpi_namespace_node *)obj_handle;
201 union acpi_operand_object *obj_desc; 206 union acpi_operand_object *obj_desc;
202 207
203 ACPI_FUNCTION_NAME("ns_init_one_object"); 208 ACPI_FUNCTION_NAME(ns_init_one_object);
204 209
205 info->object_count++; 210 info->object_count++;
206 211
@@ -311,6 +316,72 @@ acpi_ns_init_one_object(acpi_handle obj_handle,
311 316
312/******************************************************************************* 317/*******************************************************************************
313 * 318 *
319 * FUNCTION: acpi_ns_find_ini_methods
320 *
321 * PARAMETERS: acpi_walk_callback
322 *
323 * RETURN: acpi_status
324 *
325 * DESCRIPTION: Called during namespace walk. Finds objects named _INI under
326 * device/processor/thermal objects, and marks the entire subtree
327 * with a SUBTREE_HAS_INI flag. This flag is used during the
328 * subsequent device initialization walk to avoid entire subtrees
329 * that do not contain an _INI.
330 *
331 ******************************************************************************/
332
333static acpi_status
334acpi_ns_find_ini_methods(acpi_handle obj_handle,
335 u32 nesting_level, void *context, void **return_value)
336{
337 struct acpi_device_walk_info *info =
338 ACPI_CAST_PTR(struct acpi_device_walk_info, context);
339 struct acpi_namespace_node *node;
340 struct acpi_namespace_node *parent_node;
341
342 /* Keep count of device/processor/thermal objects */
343
344 node = ACPI_CAST_PTR(struct acpi_namespace_node, obj_handle);
345 if ((node->type == ACPI_TYPE_DEVICE) ||
346 (node->type == ACPI_TYPE_PROCESSOR) ||
347 (node->type == ACPI_TYPE_THERMAL)) {
348 info->device_count++;
349 return (AE_OK);
350 }
351
352 /* We are only looking for methods named _INI */
353
354 if (!ACPI_COMPARE_NAME(node->name.ascii, METHOD_NAME__INI)) {
355 return (AE_OK);
356 }
357
358 /*
359 * The only _INI methods that we care about are those that are
360 * present under Device, Processor, and Thermal objects.
361 */
362 parent_node = acpi_ns_get_parent_node(node);
363 switch (parent_node->type) {
364 case ACPI_TYPE_DEVICE:
365 case ACPI_TYPE_PROCESSOR:
366 case ACPI_TYPE_THERMAL:
367
368 /* Mark parent and bubble up the INI present flag to the root */
369
370 while (parent_node) {
371 parent_node->flags |= ANOBJ_SUBTREE_HAS_INI;
372 parent_node = acpi_ns_get_parent_node(parent_node);
373 }
374 break;
375
376 default:
377 break;
378 }
379
380 return (AE_OK);
381}
382
383/*******************************************************************************
384 *
314 * FUNCTION: acpi_ns_init_one_device 385 * FUNCTION: acpi_ns_init_one_device
315 * 386 *
316 * PARAMETERS: acpi_walk_callback 387 * PARAMETERS: acpi_walk_callback
@@ -328,64 +399,49 @@ acpi_ns_init_one_device(acpi_handle obj_handle,
328 u32 nesting_level, void *context, void **return_value) 399 u32 nesting_level, void *context, void **return_value)
329{ 400{
330 struct acpi_device_walk_info *info = 401 struct acpi_device_walk_info *info =
331 (struct acpi_device_walk_info *)context; 402 ACPI_CAST_PTR(struct acpi_device_walk_info, context);
332 struct acpi_parameter_info pinfo; 403 struct acpi_parameter_info pinfo;
333 u32 flags; 404 u32 flags;
334 acpi_status status; 405 acpi_status status;
335 struct acpi_namespace_node *ini_node;
336 struct acpi_namespace_node *device_node; 406 struct acpi_namespace_node *device_node;
337 407
338 ACPI_FUNCTION_TRACE("ns_init_one_device"); 408 ACPI_FUNCTION_TRACE(ns_init_one_device);
339 409
340 device_node = acpi_ns_map_handle_to_node(obj_handle); 410 /* We are interested in Devices, Processors and thermal_zones only */
341 if (!device_node) {
342 return_ACPI_STATUS(AE_BAD_PARAMETER);
343 }
344 411
345 /* 412 device_node = ACPI_CAST_PTR(struct acpi_namespace_node, obj_handle);
346 * We will run _STA/_INI on Devices, Processors and thermal_zones only
347 */
348 if ((device_node->type != ACPI_TYPE_DEVICE) && 413 if ((device_node->type != ACPI_TYPE_DEVICE) &&
349 (device_node->type != ACPI_TYPE_PROCESSOR) && 414 (device_node->type != ACPI_TYPE_PROCESSOR) &&
350 (device_node->type != ACPI_TYPE_THERMAL)) { 415 (device_node->type != ACPI_TYPE_THERMAL)) {
351 return_ACPI_STATUS(AE_OK); 416 return_ACPI_STATUS(AE_OK);
352 } 417 }
353 418
354 if ((acpi_dbg_level <= ACPI_LV_ALL_EXCEPTIONS) &&
355 (!(acpi_dbg_level & ACPI_LV_INFO))) {
356 ACPI_DEBUG_PRINT_RAW((ACPI_DB_INIT, "."));
357 }
358
359 info->device_count++;
360
361 /* 419 /*
362 * Check if the _INI method exists for this device - 420 * Because of an earlier namespace analysis, all subtrees that contain an
363 * if _INI does not exist, there is no need to run _STA 421 * _INI method are tagged.
364 * No _INI means device requires no initialization 422 *
423 * If this device subtree does not contain any _INI methods, we
424 * can exit now and stop traversing this entire subtree.
365 */ 425 */
366 status = acpi_ns_search_node(*ACPI_CAST_PTR(u32, METHOD_NAME__INI), 426 if (!(device_node->flags & ANOBJ_SUBTREE_HAS_INI)) {
367 device_node, ACPI_TYPE_METHOD, &ini_node); 427 return_ACPI_STATUS(AE_CTRL_DEPTH);
368 if (ACPI_FAILURE(status)) {
369
370 /* No _INI method found - move on to next device */
371
372 return_ACPI_STATUS(AE_OK);
373 } 428 }
374 429
375 /* 430 /*
376 * Run _STA to determine if we can run _INI on the device - 431 * Run _STA to determine if this device is present and functioning. We
377 * the device must be present before _INI can be run. 432 * must know this information for two important reasons (from ACPI spec):
378 * However, _STA is not required - assume device present if no _STA 433 *
434 * 1) We can only run _INI if the device is present.
435 * 2) We must abort the device tree walk on this subtree if the device is
436 * not present and is not functional (we will not examine the children)
437 *
438 * The _STA method is not required to be present under the device, we
439 * assume the device is present if _STA does not exist.
379 */ 440 */
380 ACPI_DEBUG_EXEC(acpi_ut_display_init_pathname(ACPI_TYPE_METHOD, 441 ACPI_DEBUG_EXEC(acpi_ut_display_init_pathname
381 device_node, 442 (ACPI_TYPE_METHOD, device_node, METHOD_NAME__STA));
382 METHOD_NAME__STA));
383 443
384 pinfo.node = device_node; 444 status = acpi_ut_execute_STA(device_node, &flags);
385 pinfo.parameters = NULL;
386 pinfo.parameter_type = ACPI_PARAM_ARGS;
387
388 status = acpi_ut_execute_STA(pinfo.node, &flags);
389 if (ACPI_FAILURE(status)) { 445 if (ACPI_FAILURE(status)) {
390 446
391 /* Ignore error and move on to next device */ 447 /* Ignore error and move on to next device */
@@ -393,55 +449,108 @@ acpi_ns_init_one_device(acpi_handle obj_handle,
393 return_ACPI_STATUS(AE_OK); 449 return_ACPI_STATUS(AE_OK);
394 } 450 }
395 451
452 /*
453 * Flags == -1 means that _STA was not found. In this case, we assume that
454 * the device is both present and functional.
455 *
456 * From the ACPI spec, description of _STA:
457 *
458 * "If a device object (including the processor object) does not have an
459 * _STA object, then OSPM assumes that all of the above bits are set (in
460 * other words, the device is present, ..., and functioning)"
461 */
396 if (flags != ACPI_UINT32_MAX) { 462 if (flags != ACPI_UINT32_MAX) {
397 info->num_STA++; 463 info->num_STA++;
398 } 464 }
399 465
466 /*
467 * Examine the PRESENT and FUNCTIONING status bits
468 *
469 * Note: ACPI spec does not seem to specify behavior for the present but
470 * not functioning case, so we assume functioning if present.
471 */
400 if (!(flags & ACPI_STA_DEVICE_PRESENT)) { 472 if (!(flags & ACPI_STA_DEVICE_PRESENT)) {
401 473
402 /* Don't look at children of a not present device */ 474 /* Device is not present, we must examine the Functioning bit */
403 475
404 return_ACPI_STATUS(AE_CTRL_DEPTH); 476 if (flags & ACPI_STA_DEVICE_FUNCTIONING) {
477 /*
478 * Device is not present but is "functioning". In this case,
479 * we will not run _INI, but we continue to examine the children
480 * of this device.
481 *
482 * From the ACPI spec, description of _STA: (Note - no mention
483 * of whether to run _INI or not on the device in question)
484 *
485 * "_STA may return bit 0 clear (not present) with bit 3 set
486 * (device is functional). This case is used to indicate a valid
487 * device for which no device driver should be loaded (for example,
488 * a bridge device.) Children of this device may be present and
489 * valid. OSPM should continue enumeration below a device whose
490 * _STA returns this bit combination"
491 */
492 return_ACPI_STATUS(AE_OK);
493 } else {
494 /*
495 * Device is not present and is not functioning. We must abort the
496 * walk of this subtree immediately -- don't look at the children
497 * of such a device.
498 *
499 * From the ACPI spec, description of _INI:
500 *
501 * "If the _STA method indicates that the device is not present,
502 * OSPM will not run the _INI and will not examine the children
503 * of the device for _INI methods"
504 */
505 return_ACPI_STATUS(AE_CTRL_DEPTH);
506 }
405 } 507 }
406 508
407 /* 509 /*
408 * The device is present and _INI exists. Run the _INI method. 510 * The device is present or is assumed present if no _STA exists.
409 * (We already have the _INI node from above) 511 * Run the _INI if it exists (not required to exist)
512 *
513 * Note: We know there is an _INI within this subtree, but it may not be
514 * under this particular device, it may be lower in the branch.
410 */ 515 */
411 ACPI_DEBUG_EXEC(acpi_ut_display_init_pathname(ACPI_TYPE_METHOD, 516 ACPI_DEBUG_EXEC(acpi_ut_display_init_pathname
412 pinfo.node, 517 (ACPI_TYPE_METHOD, device_node, METHOD_NAME__INI));
413 METHOD_NAME__INI));
414 518
415 pinfo.node = ini_node; 519 pinfo.node = device_node;
416 status = acpi_ns_evaluate_by_handle(&pinfo); 520 pinfo.parameters = NULL;
417 if (ACPI_FAILURE(status)) { 521 pinfo.parameter_type = ACPI_PARAM_ARGS;
418
419 /* Ignore error and move on to next device */
420
421#ifdef ACPI_DEBUG_OUTPUT
422 char *scope_name = acpi_ns_get_external_pathname(ini_node);
423 522
424 ACPI_WARNING((AE_INFO, "%s._INI failed: %s", 523 status = acpi_ns_evaluate_relative(METHOD_NAME__INI, &pinfo);
425 scope_name, acpi_format_exception(status))); 524 if (ACPI_SUCCESS(status)) {
426 525
427 ACPI_FREE(scope_name);
428#endif
429 } else {
430 /* Delete any return object (especially if implicit_return is enabled) */ 526 /* Delete any return object (especially if implicit_return is enabled) */
431 527
432 if (pinfo.return_object) { 528 if (pinfo.return_object) {
433 acpi_ut_remove_reference(pinfo.return_object); 529 acpi_ut_remove_reference(pinfo.return_object);
434 } 530 }
435 531
436 /* Count of successful INIs */
437
438 info->num_INI++; 532 info->num_INI++;
533 if ((acpi_dbg_level <= ACPI_LV_ALL_EXCEPTIONS) &&
534 (!(acpi_dbg_level & ACPI_LV_INFO))) {
535 ACPI_DEBUG_PRINT_RAW((ACPI_DB_INIT, "."));
536 }
439 } 537 }
538#ifdef ACPI_DEBUG_OUTPUT
539 else if (status != AE_NOT_FOUND) {
440 540
441 if (acpi_gbl_init_handler) { 541 /* Ignore error and move on to next device */
542
543 char *scope_name = acpi_ns_get_external_pathname(pinfo.node);
442 544
443 /* External initialization handler is present, call it */ 545 ACPI_EXCEPTION((AE_INFO, status, "during %s._INI execution",
546 scope_name));
547 ACPI_FREE(scope_name);
548 }
549#endif
444 550
551 /* If an external initialization handler is present, call it */
552
553 if (acpi_gbl_init_handler) {
445 status = 554 status =
446 acpi_gbl_init_handler(pinfo.node, ACPI_INIT_DEVICE_INI); 555 acpi_gbl_init_handler(pinfo.node, ACPI_INIT_DEVICE_INI);
447 } 556 }
diff --git a/drivers/acpi/namespace/nsload.c b/drivers/acpi/namespace/nsload.c
index 80acfd35f3ec..fe75d888e183 100644
--- a/drivers/acpi/namespace/nsload.c
+++ b/drivers/acpi/namespace/nsload.c
@@ -77,7 +77,7 @@ acpi_ns_load_table(struct acpi_table_desc *table_desc,
77{ 77{
78 acpi_status status; 78 acpi_status status;
79 79
80 ACPI_FUNCTION_TRACE("ns_load_table"); 80 ACPI_FUNCTION_TRACE(ns_load_table);
81 81
82 /* Check if table contains valid AML (must be DSDT, PSDT, SSDT, etc.) */ 82 /* Check if table contains valid AML (must be DSDT, PSDT, SSDT, etc.) */
83 83
@@ -169,7 +169,7 @@ static acpi_status acpi_ns_load_table_by_type(acpi_table_type table_type)
169 acpi_status status; 169 acpi_status status;
170 struct acpi_table_desc *table_desc; 170 struct acpi_table_desc *table_desc;
171 171
172 ACPI_FUNCTION_TRACE("ns_load_table_by_type"); 172 ACPI_FUNCTION_TRACE(ns_load_table_by_type);
173 173
174 status = acpi_ut_acquire_mutex(ACPI_MTX_TABLES); 174 status = acpi_ut_acquire_mutex(ACPI_MTX_TABLES);
175 if (ACPI_FAILURE(status)) { 175 if (ACPI_FAILURE(status)) {
@@ -181,11 +181,11 @@ static acpi_status acpi_ns_load_table_by_type(acpi_table_type table_type)
181 * DSDT (one), SSDT/PSDT (multiple) 181 * DSDT (one), SSDT/PSDT (multiple)
182 */ 182 */
183 switch (table_type) { 183 switch (table_type) {
184 case ACPI_TABLE_DSDT: 184 case ACPI_TABLE_ID_DSDT:
185 185
186 ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Namespace load: DSDT\n")); 186 ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Namespace load: DSDT\n"));
187 187
188 table_desc = acpi_gbl_table_lists[ACPI_TABLE_DSDT].next; 188 table_desc = acpi_gbl_table_lists[ACPI_TABLE_ID_DSDT].next;
189 189
190 /* If table already loaded into namespace, just return */ 190 /* If table already loaded into namespace, just return */
191 191
@@ -201,8 +201,8 @@ static acpi_status acpi_ns_load_table_by_type(acpi_table_type table_type)
201 } 201 }
202 break; 202 break;
203 203
204 case ACPI_TABLE_SSDT: 204 case ACPI_TABLE_ID_SSDT:
205 case ACPI_TABLE_PSDT: 205 case ACPI_TABLE_ID_PSDT:
206 206
207 ACPI_DEBUG_PRINT((ACPI_DB_INFO, 207 ACPI_DEBUG_PRINT((ACPI_DB_INFO,
208 "Namespace load: %d SSDT or PSDTs\n", 208 "Namespace load: %d SSDT or PSDTs\n",
@@ -259,7 +259,7 @@ acpi_status acpi_ns_load_namespace(void)
259{ 259{
260 acpi_status status; 260 acpi_status status;
261 261
262 ACPI_FUNCTION_TRACE("acpi_load_name_space"); 262 ACPI_FUNCTION_TRACE(acpi_load_name_space);
263 263
264 /* There must be at least a DSDT installed */ 264 /* There must be at least a DSDT installed */
265 265
@@ -272,15 +272,15 @@ acpi_status acpi_ns_load_namespace(void)
272 * Load the namespace. The DSDT is required, 272 * Load the namespace. The DSDT is required,
273 * but the SSDT and PSDT tables are optional. 273 * but the SSDT and PSDT tables are optional.
274 */ 274 */
275 status = acpi_ns_load_table_by_type(ACPI_TABLE_DSDT); 275 status = acpi_ns_load_table_by_type(ACPI_TABLE_ID_DSDT);
276 if (ACPI_FAILURE(status)) { 276 if (ACPI_FAILURE(status)) {
277 return_ACPI_STATUS(status); 277 return_ACPI_STATUS(status);
278 } 278 }
279 279
280 /* Ignore exceptions from these */ 280 /* Ignore exceptions from these */
281 281
282 (void)acpi_ns_load_table_by_type(ACPI_TABLE_SSDT); 282 (void)acpi_ns_load_table_by_type(ACPI_TABLE_ID_SSDT);
283 (void)acpi_ns_load_table_by_type(ACPI_TABLE_PSDT); 283 (void)acpi_ns_load_table_by_type(ACPI_TABLE_ID_PSDT);
284 284
285 ACPI_DEBUG_PRINT_RAW((ACPI_DB_INIT, 285 ACPI_DEBUG_PRINT_RAW((ACPI_DB_INIT,
286 "ACPI Namespace successfully loaded at root %p\n", 286 "ACPI Namespace successfully loaded at root %p\n",
@@ -315,7 +315,7 @@ static acpi_status acpi_ns_delete_subtree(acpi_handle start_handle)
315 acpi_handle dummy; 315 acpi_handle dummy;
316 u32 level; 316 u32 level;
317 317
318 ACPI_FUNCTION_TRACE("ns_delete_subtree"); 318 ACPI_FUNCTION_TRACE(ns_delete_subtree);
319 319
320 parent_handle = start_handle; 320 parent_handle = start_handle;
321 child_handle = NULL; 321 child_handle = NULL;
@@ -395,7 +395,7 @@ acpi_status acpi_ns_unload_namespace(acpi_handle handle)
395{ 395{
396 acpi_status status; 396 acpi_status status;
397 397
398 ACPI_FUNCTION_TRACE("ns_unload_name_space"); 398 ACPI_FUNCTION_TRACE(ns_unload_name_space);
399 399
400 /* Parameter validation */ 400 /* Parameter validation */
401 401
diff --git a/drivers/acpi/namespace/nsnames.c b/drivers/acpi/namespace/nsnames.c
index ba812f43897f..97b8332c9746 100644
--- a/drivers/acpi/namespace/nsnames.c
+++ b/drivers/acpi/namespace/nsnames.c
@@ -132,7 +132,7 @@ char *acpi_ns_get_external_pathname(struct acpi_namespace_node *node)
132 char *name_buffer; 132 char *name_buffer;
133 acpi_size size; 133 acpi_size size;
134 134
135 ACPI_FUNCTION_TRACE_PTR("ns_get_external_pathname", node); 135 ACPI_FUNCTION_TRACE_PTR(ns_get_external_pathname, node);
136 136
137 /* Calculate required buffer size based on depth below root */ 137 /* Calculate required buffer size based on depth below root */
138 138
@@ -213,7 +213,7 @@ acpi_ns_handle_to_pathname(acpi_handle target_handle,
213 struct acpi_namespace_node *node; 213 struct acpi_namespace_node *node;
214 acpi_size required_size; 214 acpi_size required_size;
215 215
216 ACPI_FUNCTION_TRACE_PTR("ns_handle_to_pathname", target_handle); 216 ACPI_FUNCTION_TRACE_PTR(ns_handle_to_pathname, target_handle);
217 217
218 node = acpi_ns_map_handle_to_node(target_handle); 218 node = acpi_ns_map_handle_to_node(target_handle);
219 if (!node) { 219 if (!node) {
diff --git a/drivers/acpi/namespace/nsobject.c b/drivers/acpi/namespace/nsobject.c
index 39dc87b228fc..aabe8794b908 100644
--- a/drivers/acpi/namespace/nsobject.c
+++ b/drivers/acpi/namespace/nsobject.c
@@ -76,7 +76,7 @@ acpi_ns_attach_object(struct acpi_namespace_node *node,
76 union acpi_operand_object *last_obj_desc; 76 union acpi_operand_object *last_obj_desc;
77 acpi_object_type object_type = ACPI_TYPE_ANY; 77 acpi_object_type object_type = ACPI_TYPE_ANY;
78 78
79 ACPI_FUNCTION_TRACE("ns_attach_object"); 79 ACPI_FUNCTION_TRACE(ns_attach_object);
80 80
81 /* 81 /*
82 * Parameter validation 82 * Parameter validation
@@ -85,7 +85,7 @@ acpi_ns_attach_object(struct acpi_namespace_node *node,
85 85
86 /* Invalid handle */ 86 /* Invalid handle */
87 87
88 ACPI_ERROR((AE_INFO, "Null named_obj handle")); 88 ACPI_ERROR((AE_INFO, "Null NamedObj handle"));
89 return_ACPI_STATUS(AE_BAD_PARAMETER); 89 return_ACPI_STATUS(AE_BAD_PARAMETER);
90 } 90 }
91 91
@@ -111,7 +111,7 @@ acpi_ns_attach_object(struct acpi_namespace_node *node,
111 111
112 if (node->object == object) { 112 if (node->object == object) {
113 ACPI_DEBUG_PRINT((ACPI_DB_EXEC, 113 ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
114 "Obj %p already installed in name_obj %p\n", 114 "Obj %p already installed in NameObj %p\n",
115 object, node)); 115 object, node));
116 116
117 return_ACPI_STATUS(AE_OK); 117 return_ACPI_STATUS(AE_OK);
@@ -204,7 +204,7 @@ void acpi_ns_detach_object(struct acpi_namespace_node *node)
204{ 204{
205 union acpi_operand_object *obj_desc; 205 union acpi_operand_object *obj_desc;
206 206
207 ACPI_FUNCTION_TRACE("ns_detach_object"); 207 ACPI_FUNCTION_TRACE(ns_detach_object);
208 208
209 obj_desc = node->object; 209 obj_desc = node->object;
210 210
@@ -255,7 +255,7 @@ union acpi_operand_object *acpi_ns_get_attached_object(struct
255 acpi_namespace_node 255 acpi_namespace_node
256 *node) 256 *node)
257{ 257{
258 ACPI_FUNCTION_TRACE_PTR("ns_get_attached_object", node); 258 ACPI_FUNCTION_TRACE_PTR(ns_get_attached_object, node);
259 259
260 if (!node) { 260 if (!node) {
261 ACPI_WARNING((AE_INFO, "Null Node ptr")); 261 ACPI_WARNING((AE_INFO, "Null Node ptr"));
@@ -290,7 +290,7 @@ union acpi_operand_object *acpi_ns_get_secondary_object(union
290 acpi_operand_object 290 acpi_operand_object
291 *obj_desc) 291 *obj_desc)
292{ 292{
293 ACPI_FUNCTION_TRACE_PTR("ns_get_secondary_object", obj_desc); 293 ACPI_FUNCTION_TRACE_PTR(ns_get_secondary_object, obj_desc);
294 294
295 if ((!obj_desc) || 295 if ((!obj_desc) ||
296 (ACPI_GET_OBJECT_TYPE(obj_desc) == ACPI_TYPE_LOCAL_DATA) || 296 (ACPI_GET_OBJECT_TYPE(obj_desc) == ACPI_TYPE_LOCAL_DATA) ||
diff --git a/drivers/acpi/namespace/nsparse.c b/drivers/acpi/namespace/nsparse.c
index 64daf3028dea..155505a4ef69 100644
--- a/drivers/acpi/namespace/nsparse.c
+++ b/drivers/acpi/namespace/nsparse.c
@@ -68,7 +68,7 @@ acpi_ns_one_complete_parse(u8 pass_number, struct acpi_table_desc *table_desc)
68 acpi_status status; 68 acpi_status status;
69 struct acpi_walk_state *walk_state; 69 struct acpi_walk_state *walk_state;
70 70
71 ACPI_FUNCTION_TRACE("ns_one_complete_parse"); 71 ACPI_FUNCTION_TRACE(ns_one_complete_parse);
72 72
73 /* Create and init a Root Node */ 73 /* Create and init a Root Node */
74 74
@@ -124,7 +124,7 @@ acpi_ns_parse_table(struct acpi_table_desc *table_desc,
124{ 124{
125 acpi_status status; 125 acpi_status status;
126 126
127 ACPI_FUNCTION_TRACE("ns_parse_table"); 127 ACPI_FUNCTION_TRACE(ns_parse_table);
128 128
129 /* 129 /*
130 * AML Parse, pass 1 130 * AML Parse, pass 1
diff --git a/drivers/acpi/namespace/nssearch.c b/drivers/acpi/namespace/nssearch.c
index 51adec5a23d6..34ac512a2d5e 100644
--- a/drivers/acpi/namespace/nssearch.c
+++ b/drivers/acpi/namespace/nssearch.c
@@ -89,7 +89,7 @@ acpi_ns_search_node(u32 target_name,
89{ 89{
90 struct acpi_namespace_node *next_node; 90 struct acpi_namespace_node *next_node;
91 91
92 ACPI_FUNCTION_TRACE("ns_search_node"); 92 ACPI_FUNCTION_TRACE(ns_search_node);
93 93
94#ifdef ACPI_DEBUG_OUTPUT 94#ifdef ACPI_DEBUG_OUTPUT
95 if (ACPI_LV_NAMES & acpi_dbg_level) { 95 if (ACPI_LV_NAMES & acpi_dbg_level) {
@@ -203,7 +203,7 @@ acpi_ns_search_parent_tree(u32 target_name,
203 acpi_status status; 203 acpi_status status;
204 struct acpi_namespace_node *parent_node; 204 struct acpi_namespace_node *parent_node;
205 205
206 ACPI_FUNCTION_TRACE("ns_search_parent_tree"); 206 ACPI_FUNCTION_TRACE(ns_search_parent_tree);
207 207
208 parent_node = acpi_ns_get_parent_node(node); 208 parent_node = acpi_ns_get_parent_node(node);
209 209
@@ -293,13 +293,13 @@ acpi_ns_search_and_enter(u32 target_name,
293 acpi_status status; 293 acpi_status status;
294 struct acpi_namespace_node *new_node; 294 struct acpi_namespace_node *new_node;
295 295
296 ACPI_FUNCTION_TRACE("ns_search_and_enter"); 296 ACPI_FUNCTION_TRACE(ns_search_and_enter);
297 297
298 /* Parameter validation */ 298 /* Parameter validation */
299 299
300 if (!node || !target_name || !return_node) { 300 if (!node || !target_name || !return_node) {
301 ACPI_ERROR((AE_INFO, 301 ACPI_ERROR((AE_INFO,
302 "Null param: Node %p Name %X return_node %p", 302 "Null param: Node %p Name %X ReturnNode %p",
303 node, target_name, return_node)); 303 node, target_name, return_node));
304 return_ACPI_STATUS(AE_BAD_PARAMETER); 304 return_ACPI_STATUS(AE_BAD_PARAMETER);
305 } 305 }
diff --git a/drivers/acpi/namespace/nsutils.c b/drivers/acpi/namespace/nsutils.c
index 9fa38ffc2e6e..d1d55032b455 100644
--- a/drivers/acpi/namespace/nsutils.c
+++ b/drivers/acpi/namespace/nsutils.c
@@ -241,7 +241,7 @@ static u8 acpi_ns_valid_path_separator(char sep)
241 241
242acpi_object_type acpi_ns_get_type(struct acpi_namespace_node * node) 242acpi_object_type acpi_ns_get_type(struct acpi_namespace_node * node)
243{ 243{
244 ACPI_FUNCTION_TRACE("ns_get_type"); 244 ACPI_FUNCTION_TRACE(ns_get_type);
245 245
246 if (!node) { 246 if (!node) {
247 ACPI_WARNING((AE_INFO, "Null Node parameter")); 247 ACPI_WARNING((AE_INFO, "Null Node parameter"));
@@ -266,7 +266,7 @@ acpi_object_type acpi_ns_get_type(struct acpi_namespace_node * node)
266 266
267u32 acpi_ns_local(acpi_object_type type) 267u32 acpi_ns_local(acpi_object_type type)
268{ 268{
269 ACPI_FUNCTION_TRACE("ns_local"); 269 ACPI_FUNCTION_TRACE(ns_local);
270 270
271 if (!acpi_ut_valid_object_type(type)) { 271 if (!acpi_ut_valid_object_type(type)) {
272 272
@@ -366,7 +366,7 @@ acpi_status acpi_ns_build_internal_name(struct acpi_namestring_info *info)
366 char *result = NULL; 366 char *result = NULL;
367 acpi_native_uint i; 367 acpi_native_uint i;
368 368
369 ACPI_FUNCTION_TRACE("ns_build_internal_name"); 369 ACPI_FUNCTION_TRACE(ns_build_internal_name);
370 370
371 /* Setup the correct prefixes, counts, and pointers */ 371 /* Setup the correct prefixes, counts, and pointers */
372 372
@@ -477,7 +477,7 @@ acpi_status acpi_ns_internalize_name(char *external_name, char **converted_name)
477 struct acpi_namestring_info info; 477 struct acpi_namestring_info info;
478 acpi_status status; 478 acpi_status status;
479 479
480 ACPI_FUNCTION_TRACE("ns_internalize_name"); 480 ACPI_FUNCTION_TRACE(ns_internalize_name);
481 481
482 if ((!external_name) || (*external_name == 0) || (!converted_name)) { 482 if ((!external_name) || (*external_name == 0) || (!converted_name)) {
483 return_ACPI_STATUS(AE_BAD_PARAMETER); 483 return_ACPI_STATUS(AE_BAD_PARAMETER);
@@ -537,7 +537,7 @@ acpi_ns_externalize_name(u32 internal_name_length,
537 acpi_native_uint i = 0; 537 acpi_native_uint i = 0;
538 acpi_native_uint j = 0; 538 acpi_native_uint j = 0;
539 539
540 ACPI_FUNCTION_TRACE("ns_externalize_name"); 540 ACPI_FUNCTION_TRACE(ns_externalize_name);
541 541
542 if (!internal_name_length || !internal_name || !converted_name) { 542 if (!internal_name_length || !internal_name || !converted_name) {
543 return_ACPI_STATUS(AE_BAD_PARAMETER); 543 return_ACPI_STATUS(AE_BAD_PARAMETER);
@@ -756,7 +756,7 @@ void acpi_ns_terminate(void)
756{ 756{
757 union acpi_operand_object *obj_desc; 757 union acpi_operand_object *obj_desc;
758 758
759 ACPI_FUNCTION_TRACE("ns_terminate"); 759 ACPI_FUNCTION_TRACE(ns_terminate);
760 760
761 /* 761 /*
762 * 1) Free the entire namespace -- all nodes and objects 762 * 1) Free the entire namespace -- all nodes and objects
@@ -796,7 +796,7 @@ void acpi_ns_terminate(void)
796 796
797u32 acpi_ns_opens_scope(acpi_object_type type) 797u32 acpi_ns_opens_scope(acpi_object_type type)
798{ 798{
799 ACPI_FUNCTION_TRACE_STR("ns_opens_scope", acpi_ut_get_type_name(type)); 799 ACPI_FUNCTION_TRACE_STR(ns_opens_scope, acpi_ut_get_type_name(type));
800 800
801 if (!acpi_ut_valid_object_type(type)) { 801 if (!acpi_ut_valid_object_type(type)) {
802 802
@@ -840,7 +840,7 @@ acpi_ns_get_node_by_path(char *pathname,
840 acpi_status status; 840 acpi_status status;
841 char *internal_path = NULL; 841 char *internal_path = NULL;
842 842
843 ACPI_FUNCTION_TRACE_PTR("ns_get_node_by_path", pathname); 843 ACPI_FUNCTION_TRACE_PTR(ns_get_node_by_path, pathname);
844 844
845 if (pathname) { 845 if (pathname) {
846 846
@@ -966,7 +966,7 @@ acpi_name acpi_ns_find_parent_name(struct acpi_namespace_node * child_node)
966{ 966{
967 struct acpi_namespace_node *parent_node; 967 struct acpi_namespace_node *parent_node;
968 968
969 ACPI_FUNCTION_TRACE("ns_find_parent_name"); 969 ACPI_FUNCTION_TRACE(ns_find_parent_name);
970 970
971 if (child_node) { 971 if (child_node) {
972 972
diff --git a/drivers/acpi/namespace/nswalk.c b/drivers/acpi/namespace/nswalk.c
index 6bbc734bfee2..c8f6bef16ed0 100644
--- a/drivers/acpi/namespace/nswalk.c
+++ b/drivers/acpi/namespace/nswalk.c
@@ -164,7 +164,7 @@ acpi_ns_walk_namespace(acpi_object_type type,
164 acpi_object_type child_type; 164 acpi_object_type child_type;
165 u32 level; 165 u32 level;
166 166
167 ACPI_FUNCTION_TRACE("ns_walk_namespace"); 167 ACPI_FUNCTION_TRACE(ns_walk_namespace);
168 168
169 /* Special case for the namespace Root Node */ 169 /* Special case for the namespace Root Node */
170 170
diff --git a/drivers/acpi/namespace/nsxfeval.c b/drivers/acpi/namespace/nsxfeval.c
index 7cdedc96a40a..998b29611b19 100644
--- a/drivers/acpi/namespace/nsxfeval.c
+++ b/drivers/acpi/namespace/nsxfeval.c
@@ -80,7 +80,7 @@ acpi_evaluate_object_typed(acpi_handle handle,
80 acpi_status status; 80 acpi_status status;
81 u8 must_free = FALSE; 81 u8 must_free = FALSE;
82 82
83 ACPI_FUNCTION_TRACE("acpi_evaluate_object_typed"); 83 ACPI_FUNCTION_TRACE(acpi_evaluate_object_typed);
84 84
85 /* Return buffer must be valid */ 85 /* Return buffer must be valid */
86 86
@@ -175,7 +175,7 @@ acpi_evaluate_object(acpi_handle handle,
175 acpi_size buffer_space_needed; 175 acpi_size buffer_space_needed;
176 u32 i; 176 u32 i;
177 177
178 ACPI_FUNCTION_TRACE("acpi_evaluate_object"); 178 ACPI_FUNCTION_TRACE(acpi_evaluate_object);
179 179
180 info.node = handle; 180 info.node = handle;
181 info.parameters = NULL; 181 info.parameters = NULL;
@@ -395,7 +395,7 @@ acpi_walk_namespace(acpi_object_type type,
395{ 395{
396 acpi_status status; 396 acpi_status status;
397 397
398 ACPI_FUNCTION_TRACE("acpi_walk_namespace"); 398 ACPI_FUNCTION_TRACE(acpi_walk_namespace);
399 399
400 /* Parameter validation */ 400 /* Parameter validation */
401 401
@@ -553,7 +553,7 @@ acpi_get_devices(char *HID,
553 acpi_status status; 553 acpi_status status;
554 struct acpi_get_devices_info info; 554 struct acpi_get_devices_info info;
555 555
556 ACPI_FUNCTION_TRACE("acpi_get_devices"); 556 ACPI_FUNCTION_TRACE(acpi_get_devices);
557 557
558 /* Parameter validation */ 558 /* Parameter validation */
559 559
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 006b31a56559..109c3f8ae7df 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -1042,12 +1042,12 @@ void acpi_os_release_lock(acpi_handle handle, acpi_cpu_flags flags)
1042 * 1042 *
1043 * FUNCTION: acpi_os_create_cache 1043 * FUNCTION: acpi_os_create_cache
1044 * 1044 *
1045 * PARAMETERS: CacheName - Ascii name for the cache 1045 * PARAMETERS: name - Ascii name for the cache
1046 * ObjectSize - Size of each cached object 1046 * size - Size of each cached object
1047 * MaxDepth - Maximum depth of the cache (in objects) 1047 * depth - Maximum depth of the cache (in objects) <ignored>
1048 * ReturnCache - Where the new cache object is returned 1048 * cache - Where the new cache object is returned
1049 * 1049 *
1050 * RETURN: Status 1050 * RETURN: status
1051 * 1051 *
1052 * DESCRIPTION: Create a cache object 1052 * DESCRIPTION: Create a cache object
1053 * 1053 *
@@ -1057,7 +1057,10 @@ acpi_status
1057acpi_os_create_cache(char *name, u16 size, u16 depth, acpi_cache_t ** cache) 1057acpi_os_create_cache(char *name, u16 size, u16 depth, acpi_cache_t ** cache)
1058{ 1058{
1059 *cache = kmem_cache_create(name, size, 0, 0, NULL, NULL); 1059 *cache = kmem_cache_create(name, size, 0, 0, NULL, NULL);
1060 return AE_OK; 1060 if (cache == NULL)
1061 return AE_ERROR;
1062 else
1063 return AE_OK;
1061} 1064}
1062 1065
1063/******************************************************************************* 1066/*******************************************************************************
@@ -1137,4 +1140,52 @@ void *acpi_os_acquire_object(acpi_cache_t * cache)
1137 return object; 1140 return object;
1138} 1141}
1139 1142
1143/******************************************************************************
1144 *
1145 * FUNCTION: acpi_os_validate_interface
1146 *
1147 * PARAMETERS: interface - Requested interface to be validated
1148 *
1149 * RETURN: AE_OK if interface is supported, AE_SUPPORT otherwise
1150 *
1151 * DESCRIPTION: Match an interface string to the interfaces supported by the
1152 * host. Strings originate from an AML call to the _OSI method.
1153 *
1154 *****************************************************************************/
1155
1156acpi_status
1157acpi_os_validate_interface (char *interface)
1158{
1159
1160 return AE_SUPPORT;
1161}
1162
1163
1164/******************************************************************************
1165 *
1166 * FUNCTION: acpi_os_validate_address
1167 *
1168 * PARAMETERS: space_id - ACPI space ID
1169 * address - Physical address
1170 * length - Address length
1171 *
1172 * RETURN: AE_OK if address/length is valid for the space_id. Otherwise,
1173 * should return AE_AML_ILLEGAL_ADDRESS.
1174 *
1175 * DESCRIPTION: Validate a system address via the host OS. Used to validate
1176 * the addresses accessed by AML operation regions.
1177 *
1178 *****************************************************************************/
1179
1180acpi_status
1181acpi_os_validate_address (
1182 u8 space_id,
1183 acpi_physical_address address,
1184 acpi_size length)
1185{
1186
1187 return AE_OK;
1188}
1189
1190
1140#endif 1191#endif
diff --git a/drivers/acpi/parser/psargs.c b/drivers/acpi/parser/psargs.c
index 1c5934fe1853..bf88e076c3e9 100644
--- a/drivers/acpi/parser/psargs.c
+++ b/drivers/acpi/parser/psargs.c
@@ -79,7 +79,7 @@ acpi_ps_get_next_package_length(struct acpi_parse_state *parser_state)
79 acpi_native_uint byte_count; 79 acpi_native_uint byte_count;
80 u8 byte_zero_mask = 0x3F; /* Default [0:5] */ 80 u8 byte_zero_mask = 0x3F; /* Default [0:5] */
81 81
82 ACPI_FUNCTION_TRACE("ps_get_next_package_length"); 82 ACPI_FUNCTION_TRACE(ps_get_next_package_length);
83 83
84 /* 84 /*
85 * Byte 0 bits [6:7] contain the number of additional bytes 85 * Byte 0 bits [6:7] contain the number of additional bytes
@@ -128,7 +128,7 @@ u8 *acpi_ps_get_next_package_end(struct acpi_parse_state *parser_state)
128 u8 *start = parser_state->aml; 128 u8 *start = parser_state->aml;
129 u32 package_length; 129 u32 package_length;
130 130
131 ACPI_FUNCTION_TRACE("ps_get_next_package_end"); 131 ACPI_FUNCTION_TRACE(ps_get_next_package_end);
132 132
133 /* Function below updates parser_state->Aml */ 133 /* Function below updates parser_state->Aml */
134 134
@@ -157,7 +157,7 @@ char *acpi_ps_get_next_namestring(struct acpi_parse_state *parser_state)
157 u8 *start = parser_state->aml; 157 u8 *start = parser_state->aml;
158 u8 *end = parser_state->aml; 158 u8 *end = parser_state->aml;
159 159
160 ACPI_FUNCTION_TRACE("ps_get_next_namestring"); 160 ACPI_FUNCTION_TRACE(ps_get_next_namestring);
161 161
162 /* Point past any namestring prefix characters (backslash or carat) */ 162 /* Point past any namestring prefix characters (backslash or carat) */
163 163
@@ -237,7 +237,7 @@ acpi_ps_get_next_namepath(struct acpi_walk_state *walk_state,
237 struct acpi_namespace_node *node; 237 struct acpi_namespace_node *node;
238 union acpi_generic_state scope_info; 238 union acpi_generic_state scope_info;
239 239
240 ACPI_FUNCTION_TRACE("ps_get_next_namepath"); 240 ACPI_FUNCTION_TRACE(ps_get_next_namepath);
241 241
242 path = acpi_ps_get_next_namestring(parser_state); 242 path = acpi_ps_get_next_namestring(parser_state);
243 acpi_ps_init_op(arg, AML_INT_NAMEPATH_OP); 243 acpi_ps_init_op(arg, AML_INT_NAMEPATH_OP);
@@ -391,7 +391,7 @@ acpi_ps_get_next_simple_arg(struct acpi_parse_state *parser_state,
391 u16 opcode; 391 u16 opcode;
392 u8 *aml = parser_state->aml; 392 u8 *aml = parser_state->aml;
393 393
394 ACPI_FUNCTION_TRACE_U32("ps_get_next_simple_arg", arg_type); 394 ACPI_FUNCTION_TRACE_U32(ps_get_next_simple_arg, arg_type);
395 395
396 switch (arg_type) { 396 switch (arg_type) {
397 case ARGP_BYTEDATA: 397 case ARGP_BYTEDATA:
@@ -456,7 +456,7 @@ acpi_ps_get_next_simple_arg(struct acpi_parse_state *parser_state,
456 456
457 default: 457 default:
458 458
459 ACPI_ERROR((AE_INFO, "Invalid arg_type %X", arg_type)); 459 ACPI_ERROR((AE_INFO, "Invalid ArgType %X", arg_type));
460 return_VOID; 460 return_VOID;
461 } 461 }
462 462
@@ -487,7 +487,7 @@ static union acpi_parse_object *acpi_ps_get_next_field(struct acpi_parse_state
487 u16 opcode; 487 u16 opcode;
488 u32 name; 488 u32 name;
489 489
490 ACPI_FUNCTION_TRACE("ps_get_next_field"); 490 ACPI_FUNCTION_TRACE(ps_get_next_field);
491 491
492 /* Determine field type */ 492 /* Determine field type */
493 493
@@ -593,7 +593,7 @@ acpi_ps_get_next_arg(struct acpi_walk_state *walk_state,
593 u32 subop; 593 u32 subop;
594 acpi_status status = AE_OK; 594 acpi_status status = AE_OK;
595 595
596 ACPI_FUNCTION_TRACE_PTR("ps_get_next_arg", parser_state); 596 ACPI_FUNCTION_TRACE_PTR(ps_get_next_arg, parser_state);
597 597
598 switch (arg_type) { 598 switch (arg_type) {
599 case ARGP_BYTEDATA: 599 case ARGP_BYTEDATA:
@@ -718,7 +718,7 @@ acpi_ps_get_next_arg(struct acpi_walk_state *walk_state,
718 718
719 default: 719 default:
720 720
721 ACPI_ERROR((AE_INFO, "Invalid arg_type: %X", arg_type)); 721 ACPI_ERROR((AE_INFO, "Invalid ArgType: %X", arg_type));
722 status = AE_AML_OPERAND_TYPE; 722 status = AE_AML_OPERAND_TYPE;
723 break; 723 break;
724 } 724 }
diff --git a/drivers/acpi/parser/psloop.c b/drivers/acpi/parser/psloop.c
index 3a29ce680370..e1541db3753a 100644
--- a/drivers/acpi/parser/psloop.c
+++ b/drivers/acpi/parser/psloop.c
@@ -83,7 +83,7 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state)
83 struct acpi_parse_state *parser_state; 83 struct acpi_parse_state *parser_state;
84 u8 *aml_op_start = NULL; 84 u8 *aml_op_start = NULL;
85 85
86 ACPI_FUNCTION_TRACE_PTR("ps_parse_loop", walk_state); 86 ACPI_FUNCTION_TRACE_PTR(ps_parse_loop, walk_state);
87 87
88 if (walk_state->descending_callback == NULL) { 88 if (walk_state->descending_callback == NULL) {
89 return_ACPI_STATUS(AE_BAD_PARAMETER); 89 return_ACPI_STATUS(AE_BAD_PARAMETER);
@@ -129,7 +129,7 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state)
129 129
130 } 130 }
131 ACPI_EXCEPTION((AE_INFO, status, 131 ACPI_EXCEPTION((AE_INFO, status,
132 "get_predicate Failed")); 132 "GetPredicate Failed"));
133 return_ACPI_STATUS(status); 133 return_ACPI_STATUS(status);
134 } 134 }
135 135
@@ -375,7 +375,7 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state)
375 375
376 if (walk_state->op_info) { 376 if (walk_state->op_info) {
377 ACPI_DEBUG_PRINT((ACPI_DB_PARSE, 377 ACPI_DEBUG_PRINT((ACPI_DB_PARSE,
378 "Opcode %4.4X [%s] Op %p Aml %p aml_offset %5.5X\n", 378 "Opcode %4.4X [%s] Op %p Aml %p AmlOffset %5.5X\n",
379 (u32) op->common.aml_opcode, 379 (u32) op->common.aml_opcode,
380 walk_state->op_info->name, op, 380 walk_state->op_info->name, op,
381 parser_state->aml, 381 parser_state->aml,
diff --git a/drivers/acpi/parser/psopcode.c b/drivers/acpi/parser/psopcode.c
index 9eb8d0663886..4bd25e32769f 100644
--- a/drivers/acpi/parser/psopcode.c
+++ b/drivers/acpi/parser/psopcode.c
@@ -725,7 +725,7 @@ static const u8 acpi_gbl_long_op_index[NUM_EXTENDED_OPCODE] = {
725 725
726const struct acpi_opcode_info *acpi_ps_get_opcode_info(u16 opcode) 726const struct acpi_opcode_info *acpi_ps_get_opcode_info(u16 opcode)
727{ 727{
728 ACPI_FUNCTION_NAME("ps_get_opcode_info"); 728 ACPI_FUNCTION_NAME(ps_get_opcode_info);
729 729
730 /* 730 /*
731 * Detect normal 8-bit opcode or extended 16-bit opcode 731 * Detect normal 8-bit opcode or extended 16-bit opcode
@@ -781,7 +781,7 @@ char *acpi_ps_get_opcode_name(u16 opcode)
781 return (op->name); 781 return (op->name);
782 782
783#else 783#else
784 return ("AE_NOT_CONFIGURED"); 784 return ("OpcodeName unavailable");
785 785
786#endif 786#endif
787} 787}
diff --git a/drivers/acpi/parser/psparse.c b/drivers/acpi/parser/psparse.c
index 83d8916bc1af..796f6b719929 100644
--- a/drivers/acpi/parser/psparse.c
+++ b/drivers/acpi/parser/psparse.c
@@ -138,7 +138,7 @@ acpi_ps_complete_this_op(struct acpi_walk_state * walk_state,
138 const struct acpi_opcode_info *parent_info; 138 const struct acpi_opcode_info *parent_info;
139 union acpi_parse_object *replacement_op = NULL; 139 union acpi_parse_object *replacement_op = NULL;
140 140
141 ACPI_FUNCTION_TRACE_PTR("ps_complete_this_op", op); 141 ACPI_FUNCTION_TRACE_PTR(ps_complete_this_op, op);
142 142
143 /* Check for null Op, can happen if AML code is corrupt */ 143 /* Check for null Op, can happen if AML code is corrupt */
144 144
@@ -333,7 +333,7 @@ acpi_ps_next_parse_state(struct acpi_walk_state *walk_state,
333 struct acpi_parse_state *parser_state = &walk_state->parser_state; 333 struct acpi_parse_state *parser_state = &walk_state->parser_state;
334 acpi_status status = AE_CTRL_PENDING; 334 acpi_status status = AE_CTRL_PENDING;
335 335
336 ACPI_FUNCTION_TRACE_PTR("ps_next_parse_state", op); 336 ACPI_FUNCTION_TRACE_PTR(ps_next_parse_state, op);
337 337
338 switch (callback_status) { 338 switch (callback_status) {
339 case AE_CTRL_TERMINATE: 339 case AE_CTRL_TERMINATE:
@@ -453,10 +453,10 @@ acpi_status acpi_ps_parse_aml(struct acpi_walk_state *walk_state)
453 struct acpi_thread_state *prev_walk_list = acpi_gbl_current_walk_list; 453 struct acpi_thread_state *prev_walk_list = acpi_gbl_current_walk_list;
454 struct acpi_walk_state *previous_walk_state; 454 struct acpi_walk_state *previous_walk_state;
455 455
456 ACPI_FUNCTION_TRACE("ps_parse_aml"); 456 ACPI_FUNCTION_TRACE(ps_parse_aml);
457 457
458 ACPI_DEBUG_PRINT((ACPI_DB_PARSE, 458 ACPI_DEBUG_PRINT((ACPI_DB_PARSE,
459 "Entered with walk_state=%p Aml=%p size=%X\n", 459 "Entered with WalkState=%p Aml=%p size=%X\n",
460 walk_state, walk_state->parser_state.aml, 460 walk_state, walk_state->parser_state.aml,
461 walk_state->parser_state.aml_size)); 461 walk_state->parser_state.aml_size));
462 462
@@ -555,21 +555,9 @@ acpi_status acpi_ps_parse_aml(struct acpi_walk_state *walk_state)
555 */ 555 */
556 if (((walk_state->parse_flags & ACPI_PARSE_MODE_MASK) == 556 if (((walk_state->parse_flags & ACPI_PARSE_MODE_MASK) ==
557 ACPI_PARSE_EXECUTE) || (ACPI_FAILURE(status))) { 557 ACPI_PARSE_EXECUTE) || (ACPI_FAILURE(status))) {
558 if (walk_state->method_desc) { 558 acpi_ds_terminate_control_method(walk_state->
559 559 method_desc,
560 /* Decrement the thread count on the method parse tree */ 560 walk_state);
561
562 if (walk_state->method_desc->method.
563 thread_count) {
564 walk_state->method_desc->method.
565 thread_count--;
566 } else {
567 ACPI_ERROR((AE_INFO,
568 "Invalid zero thread count in method"));
569 }
570 }
571
572 acpi_ds_terminate_control_method(walk_state);
573 } 561 }
574 562
575 /* Delete this walk state and all linked control states */ 563 /* Delete this walk state and all linked control states */
@@ -578,7 +566,7 @@ acpi_status acpi_ps_parse_aml(struct acpi_walk_state *walk_state)
578 previous_walk_state = walk_state; 566 previous_walk_state = walk_state;
579 567
580 ACPI_DEBUG_PRINT((ACPI_DB_PARSE, 568 ACPI_DEBUG_PRINT((ACPI_DB_PARSE,
581 "return_value=%p, implicit_value=%p State=%p\n", 569 "ReturnValue=%p, ImplicitValue=%p State=%p\n",
582 walk_state->return_desc, 570 walk_state->return_desc,
583 walk_state->implicit_return_obj, walk_state)); 571 walk_state->implicit_return_obj, walk_state));
584 572
diff --git a/drivers/acpi/parser/psscope.c b/drivers/acpi/parser/psscope.c
index 424ab1c20da5..a3e0314de24d 100644
--- a/drivers/acpi/parser/psscope.c
+++ b/drivers/acpi/parser/psscope.c
@@ -106,7 +106,7 @@ acpi_ps_init_scope(struct acpi_parse_state * parser_state,
106{ 106{
107 union acpi_generic_state *scope; 107 union acpi_generic_state *scope;
108 108
109 ACPI_FUNCTION_TRACE_PTR("ps_init_scope", root_op); 109 ACPI_FUNCTION_TRACE_PTR(ps_init_scope, root_op);
110 110
111 scope = acpi_ut_create_generic_state(); 111 scope = acpi_ut_create_generic_state();
112 if (!scope) { 112 if (!scope) {
@@ -147,7 +147,7 @@ acpi_ps_push_scope(struct acpi_parse_state *parser_state,
147{ 147{
148 union acpi_generic_state *scope; 148 union acpi_generic_state *scope;
149 149
150 ACPI_FUNCTION_TRACE_PTR("ps_push_scope", op); 150 ACPI_FUNCTION_TRACE_PTR(ps_push_scope, op);
151 151
152 scope = acpi_ut_create_generic_state(); 152 scope = acpi_ut_create_generic_state();
153 if (!scope) { 153 if (!scope) {
@@ -200,7 +200,7 @@ acpi_ps_pop_scope(struct acpi_parse_state *parser_state,
200{ 200{
201 union acpi_generic_state *scope = parser_state->scope; 201 union acpi_generic_state *scope = parser_state->scope;
202 202
203 ACPI_FUNCTION_TRACE("ps_pop_scope"); 203 ACPI_FUNCTION_TRACE(ps_pop_scope);
204 204
205 /* Only pop the scope if there is in fact a next scope */ 205 /* Only pop the scope if there is in fact a next scope */
206 206
@@ -247,7 +247,7 @@ void acpi_ps_cleanup_scope(struct acpi_parse_state *parser_state)
247{ 247{
248 union acpi_generic_state *scope; 248 union acpi_generic_state *scope;
249 249
250 ACPI_FUNCTION_TRACE_PTR("ps_cleanup_scope", parser_state); 250 ACPI_FUNCTION_TRACE_PTR(ps_cleanup_scope, parser_state);
251 251
252 if (!parser_state) { 252 if (!parser_state) {
253 return_VOID; 253 return_VOID;
diff --git a/drivers/acpi/parser/psutils.c b/drivers/acpi/parser/psutils.c
index 43e3190583e3..182474ae8ce9 100644
--- a/drivers/acpi/parser/psutils.c
+++ b/drivers/acpi/parser/psutils.c
@@ -172,7 +172,7 @@ union acpi_parse_object *acpi_ps_alloc_op(u16 opcode)
172 172
173void acpi_ps_free_op(union acpi_parse_object *op) 173void acpi_ps_free_op(union acpi_parse_object *op)
174{ 174{
175 ACPI_FUNCTION_NAME("ps_free_op"); 175 ACPI_FUNCTION_NAME(ps_free_op);
176 176
177 if (op->common.aml_opcode == AML_INT_RETURN_VALUE_OP) { 177 if (op->common.aml_opcode == AML_INT_RETURN_VALUE_OP) {
178 ACPI_DEBUG_PRINT((ACPI_DB_ALLOCATIONS, "Free retval op: %p\n", 178 ACPI_DEBUG_PRINT((ACPI_DB_ALLOCATIONS, "Free retval op: %p\n",
diff --git a/drivers/acpi/parser/pswalk.c b/drivers/acpi/parser/pswalk.c
index 3d08b8c6db41..a84a547a0f1b 100644
--- a/drivers/acpi/parser/pswalk.c
+++ b/drivers/acpi/parser/pswalk.c
@@ -64,7 +64,7 @@ void acpi_ps_delete_parse_tree(union acpi_parse_object *subtree_root)
64 union acpi_parse_object *next = NULL; 64 union acpi_parse_object *next = NULL;
65 union acpi_parse_object *parent = NULL; 65 union acpi_parse_object *parent = NULL;
66 66
67 ACPI_FUNCTION_TRACE_PTR("ps_delete_parse_tree", subtree_root); 67 ACPI_FUNCTION_TRACE_PTR(ps_delete_parse_tree, subtree_root);
68 68
69 /* Visit all nodes in the subtree */ 69 /* Visit all nodes in the subtree */
70 70
diff --git a/drivers/acpi/parser/psxface.c b/drivers/acpi/parser/psxface.c
index e09a820ee294..6b1411f1087d 100644
--- a/drivers/acpi/parser/psxface.c
+++ b/drivers/acpi/parser/psxface.c
@@ -216,7 +216,7 @@ acpi_status acpi_ps_execute_method(struct acpi_parameter_info *info)
216{ 216{
217 acpi_status status; 217 acpi_status status;
218 218
219 ACPI_FUNCTION_TRACE("ps_execute_method"); 219 ACPI_FUNCTION_TRACE(ps_execute_method);
220 220
221 /* Validate the Info and method Node */ 221 /* Validate the Info and method Node */
222 222
@@ -286,8 +286,7 @@ acpi_status acpi_ps_execute_method(struct acpi_parameter_info *info)
286 * a control exception code 286 * a control exception code
287 */ 287 */
288 if (info->return_object) { 288 if (info->return_object) {
289 ACPI_DEBUG_PRINT((ACPI_DB_PARSE, 289 ACPI_DEBUG_PRINT((ACPI_DB_PARSE, "Method returned ObjDesc=%p\n",
290 "Method returned obj_desc=%p\n",
291 info->return_object)); 290 info->return_object));
292 ACPI_DUMP_STACK_ENTRY(info->return_object); 291 ACPI_DUMP_STACK_ENTRY(info->return_object);
293 292
@@ -350,7 +349,7 @@ static acpi_status acpi_ps_execute_pass(struct acpi_parameter_info *info)
350 union acpi_parse_object *op; 349 union acpi_parse_object *op;
351 struct acpi_walk_state *walk_state; 350 struct acpi_walk_state *walk_state;
352 351
353 ACPI_FUNCTION_TRACE("ps_execute_pass"); 352 ACPI_FUNCTION_TRACE(ps_execute_pass);
354 353
355 /* Create and init a Root Node */ 354 /* Create and init a Root Node */
356 355
diff --git a/drivers/acpi/resources/rscalc.c b/drivers/acpi/resources/rscalc.c
index dd5caa2c8fdd..a573ad5d41db 100644
--- a/drivers/acpi/resources/rscalc.c
+++ b/drivers/acpi/resources/rscalc.c
@@ -190,7 +190,7 @@ acpi_rs_get_aml_length(struct acpi_resource * resource, acpi_size * size_needed)
190 acpi_size aml_size_needed = 0; 190 acpi_size aml_size_needed = 0;
191 acpi_rs_length total_size; 191 acpi_rs_length total_size;
192 192
193 ACPI_FUNCTION_TRACE("rs_get_aml_length"); 193 ACPI_FUNCTION_TRACE(rs_get_aml_length);
194 194
195 /* Traverse entire list of internal resource descriptors */ 195 /* Traverse entire list of internal resource descriptors */
196 196
@@ -345,7 +345,7 @@ acpi_rs_get_list_length(u8 * aml_buffer,
345 u8 resource_index; 345 u8 resource_index;
346 u8 minimum_aml_resource_length; 346 u8 minimum_aml_resource_length;
347 347
348 ACPI_FUNCTION_TRACE("rs_get_list_length"); 348 ACPI_FUNCTION_TRACE(rs_get_list_length);
349 349
350 *size_needed = 0; 350 *size_needed = 0;
351 end_aml = aml_buffer + aml_buffer_length; 351 end_aml = aml_buffer + aml_buffer_length;
@@ -456,7 +456,7 @@ acpi_rs_get_list_length(u8 * aml_buffer,
456 *size_needed += buffer_size; 456 *size_needed += buffer_size;
457 457
458 ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, 458 ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES,
459 "Type %.2X, aml_length %.2X internal_length %.2X\n", 459 "Type %.2X, AmlLength %.2X InternalLength %.2X\n",
460 acpi_ut_get_resource_type(aml_buffer), 460 acpi_ut_get_resource_type(aml_buffer),
461 acpi_ut_get_descriptor_length(aml_buffer), 461 acpi_ut_get_descriptor_length(aml_buffer),
462 buffer_size)); 462 buffer_size));
@@ -503,7 +503,7 @@ acpi_rs_get_pci_routing_table_length(union acpi_operand_object *package_object,
503 u8 name_found; 503 u8 name_found;
504 u32 table_index; 504 u32 table_index;
505 505
506 ACPI_FUNCTION_TRACE("rs_get_pci_routing_table_length"); 506 ACPI_FUNCTION_TRACE(rs_get_pci_routing_table_length);
507 507
508 number_of_elements = package_object->package.count; 508 number_of_elements = package_object->package.count;
509 509
diff --git a/drivers/acpi/resources/rscreate.c b/drivers/acpi/resources/rscreate.c
index 01488cfc9bae..4c322daaf885 100644
--- a/drivers/acpi/resources/rscreate.c
+++ b/drivers/acpi/resources/rscreate.c
@@ -77,9 +77,9 @@ acpi_rs_create_resource_list(union acpi_operand_object *aml_buffer,
77 u32 aml_buffer_length; 77 u32 aml_buffer_length;
78 void *resource; 78 void *resource;
79 79
80 ACPI_FUNCTION_TRACE("rs_create_resource_list"); 80 ACPI_FUNCTION_TRACE(rs_create_resource_list);
81 81
82 ACPI_DEBUG_PRINT((ACPI_DB_INFO, "aml_buffer = %p\n", aml_buffer)); 82 ACPI_DEBUG_PRINT((ACPI_DB_INFO, "AmlBuffer = %p\n", aml_buffer));
83 83
84 /* Params already validated, so we don't re-validate here */ 84 /* Params already validated, so we don't re-validate here */
85 85
@@ -93,7 +93,7 @@ acpi_rs_create_resource_list(union acpi_operand_object *aml_buffer,
93 status = acpi_rs_get_list_length(aml_start, aml_buffer_length, 93 status = acpi_rs_get_list_length(aml_start, aml_buffer_length,
94 &list_size_needed); 94 &list_size_needed);
95 95
96 ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Status=%X list_size_needed=%X\n", 96 ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Status=%X ListSizeNeeded=%X\n",
97 status, (u32) list_size_needed)); 97 status, (u32) list_size_needed));
98 if (ACPI_FAILURE(status)) { 98 if (ACPI_FAILURE(status)) {
99 return_ACPI_STATUS(status); 99 return_ACPI_STATUS(status);
@@ -116,7 +116,7 @@ acpi_rs_create_resource_list(union acpi_operand_object *aml_buffer,
116 return_ACPI_STATUS(status); 116 return_ACPI_STATUS(status);
117 } 117 }
118 118
119 ACPI_DEBUG_PRINT((ACPI_DB_INFO, "output_buffer %p Length %X\n", 119 ACPI_DEBUG_PRINT((ACPI_DB_INFO, "OutputBuffer %p Length %X\n",
120 output_buffer->pointer, (u32) output_buffer->length)); 120 output_buffer->pointer, (u32) output_buffer->length));
121 return_ACPI_STATUS(AE_OK); 121 return_ACPI_STATUS(AE_OK);
122} 122}
@@ -158,7 +158,7 @@ acpi_rs_create_pci_routing_table(union acpi_operand_object *package_object,
158 acpi_status status; 158 acpi_status status;
159 struct acpi_buffer path_buffer; 159 struct acpi_buffer path_buffer;
160 160
161 ACPI_FUNCTION_TRACE("rs_create_pci_routing_table"); 161 ACPI_FUNCTION_TRACE(rs_create_pci_routing_table);
162 162
163 /* Params already validated, so we don't re-validate here */ 163 /* Params already validated, so we don't re-validate here */
164 164
@@ -170,7 +170,7 @@ acpi_rs_create_pci_routing_table(union acpi_operand_object *package_object,
170 return_ACPI_STATUS(status); 170 return_ACPI_STATUS(status);
171 } 171 }
172 172
173 ACPI_DEBUG_PRINT((ACPI_DB_INFO, "buffer_size_needed = %X\n", 173 ACPI_DEBUG_PRINT((ACPI_DB_INFO, "BufferSizeNeeded = %X\n",
174 (u32) buffer_size_needed)); 174 (u32) buffer_size_needed));
175 175
176 /* Validate/Allocate/Clear caller buffer */ 176 /* Validate/Allocate/Clear caller buffer */
@@ -344,7 +344,7 @@ acpi_rs_create_pci_routing_table(union acpi_operand_object *package_object,
344 user_prt->source_index = (u32) obj_desc->integer.value; 344 user_prt->source_index = (u32) obj_desc->integer.value;
345 } else { 345 } else {
346 ACPI_ERROR((AE_INFO, 346 ACPI_ERROR((AE_INFO,
347 "(PRT[%X].source_index) Need Integer, found %s", 347 "(PRT[%X].SourceIndex) Need Integer, found %s",
348 index, 348 index,
349 acpi_ut_get_object_type_name(obj_desc))); 349 acpi_ut_get_object_type_name(obj_desc)));
350 return_ACPI_STATUS(AE_BAD_DATA); 350 return_ACPI_STATUS(AE_BAD_DATA);
@@ -355,7 +355,7 @@ acpi_rs_create_pci_routing_table(union acpi_operand_object *package_object,
355 top_object_list++; 355 top_object_list++;
356 } 356 }
357 357
358 ACPI_DEBUG_PRINT((ACPI_DB_INFO, "output_buffer %p Length %X\n", 358 ACPI_DEBUG_PRINT((ACPI_DB_INFO, "OutputBuffer %p Length %X\n",
359 output_buffer->pointer, (u32) output_buffer->length)); 359 output_buffer->pointer, (u32) output_buffer->length));
360 return_ACPI_STATUS(AE_OK); 360 return_ACPI_STATUS(AE_OK);
361} 361}
@@ -385,9 +385,9 @@ acpi_rs_create_aml_resources(struct acpi_resource *linked_list_buffer,
385 acpi_status status; 385 acpi_status status;
386 acpi_size aml_size_needed = 0; 386 acpi_size aml_size_needed = 0;
387 387
388 ACPI_FUNCTION_TRACE("rs_create_aml_resources"); 388 ACPI_FUNCTION_TRACE(rs_create_aml_resources);
389 389
390 ACPI_DEBUG_PRINT((ACPI_DB_INFO, "linked_list_buffer = %p\n", 390 ACPI_DEBUG_PRINT((ACPI_DB_INFO, "LinkedListBuffer = %p\n",
391 linked_list_buffer)); 391 linked_list_buffer));
392 392
393 /* 393 /*
@@ -398,7 +398,7 @@ acpi_rs_create_aml_resources(struct acpi_resource *linked_list_buffer,
398 */ 398 */
399 status = acpi_rs_get_aml_length(linked_list_buffer, &aml_size_needed); 399 status = acpi_rs_get_aml_length(linked_list_buffer, &aml_size_needed);
400 400
401 ACPI_DEBUG_PRINT((ACPI_DB_INFO, "aml_size_needed=%X, %s\n", 401 ACPI_DEBUG_PRINT((ACPI_DB_INFO, "AmlSizeNeeded=%X, %s\n",
402 (u32) aml_size_needed, 402 (u32) aml_size_needed,
403 acpi_format_exception(status))); 403 acpi_format_exception(status)));
404 if (ACPI_FAILURE(status)) { 404 if (ACPI_FAILURE(status)) {
@@ -422,7 +422,7 @@ acpi_rs_create_aml_resources(struct acpi_resource *linked_list_buffer,
422 return_ACPI_STATUS(status); 422 return_ACPI_STATUS(status);
423 } 423 }
424 424
425 ACPI_DEBUG_PRINT((ACPI_DB_INFO, "output_buffer %p Length %X\n", 425 ACPI_DEBUG_PRINT((ACPI_DB_INFO, "OutputBuffer %p Length %X\n",
426 output_buffer->pointer, (u32) output_buffer->length)); 426 output_buffer->pointer, (u32) output_buffer->length));
427 return_ACPI_STATUS(AE_OK); 427 return_ACPI_STATUS(AE_OK);
428} 428}
diff --git a/drivers/acpi/resources/rsdump.c b/drivers/acpi/resources/rsdump.c
index e7de061cf883..9c99a723a860 100644
--- a/drivers/acpi/resources/rsdump.c
+++ b/drivers/acpi/resources/rsdump.c
@@ -91,11 +91,11 @@ acpi_rs_dump_descriptor(void *resource, struct acpi_rsdump_info *table);
91struct acpi_rsdump_info acpi_rs_dump_irq[6] = { 91struct acpi_rsdump_info acpi_rs_dump_irq[6] = {
92 {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_irq), "IRQ", NULL}, 92 {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_irq), "IRQ", NULL},
93 {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(irq.triggering), "Triggering", 93 {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(irq.triggering), "Triggering",
94 acpi_gbl_HEdecode}, 94 acpi_gbl_he_decode},
95 {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(irq.polarity), "Polarity", 95 {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(irq.polarity), "Polarity",
96 acpi_gbl_LLdecode}, 96 acpi_gbl_ll_decode},
97 {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(irq.sharable), "Sharing", 97 {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(irq.sharable), "Sharing",
98 acpi_gbl_SHRdecode}, 98 acpi_gbl_shr_decode},
99 {ACPI_RSD_UINT8, ACPI_RSD_OFFSET(irq.interrupt_count), 99 {ACPI_RSD_UINT8, ACPI_RSD_OFFSET(irq.interrupt_count),
100 "Interrupt Count", NULL}, 100 "Interrupt Count", NULL},
101 {ACPI_RSD_SHORTLIST, ACPI_RSD_OFFSET(irq.interrupts[0]), 101 {ACPI_RSD_SHORTLIST, ACPI_RSD_OFFSET(irq.interrupts[0]),
@@ -105,11 +105,11 @@ struct acpi_rsdump_info acpi_rs_dump_irq[6] = {
105struct acpi_rsdump_info acpi_rs_dump_dma[6] = { 105struct acpi_rsdump_info acpi_rs_dump_dma[6] = {
106 {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_dma), "DMA", NULL}, 106 {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_dma), "DMA", NULL},
107 {ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET(dma.type), "Speed", 107 {ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET(dma.type), "Speed",
108 acpi_gbl_TYPdecode}, 108 acpi_gbl_typ_decode},
109 {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(dma.bus_master), "Mastering", 109 {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(dma.bus_master), "Mastering",
110 acpi_gbl_BMdecode}, 110 acpi_gbl_bm_decode},
111 {ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET(dma.transfer), "Transfer Type", 111 {ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET(dma.transfer), "Transfer Type",
112 acpi_gbl_SIZdecode}, 112 acpi_gbl_siz_decode},
113 {ACPI_RSD_UINT8, ACPI_RSD_OFFSET(dma.channel_count), "Channel Count", 113 {ACPI_RSD_UINT8, ACPI_RSD_OFFSET(dma.channel_count), "Channel Count",
114 NULL}, 114 NULL},
115 {ACPI_RSD_SHORTLIST, ACPI_RSD_OFFSET(dma.channels[0]), "Channel List", 115 {ACPI_RSD_SHORTLIST, ACPI_RSD_OFFSET(dma.channels[0]), "Channel List",
@@ -158,7 +158,7 @@ struct acpi_rsdump_info acpi_rs_dump_vendor[3] = {
158}; 158};
159 159
160struct acpi_rsdump_info acpi_rs_dump_end_tag[1] = { 160struct acpi_rsdump_info acpi_rs_dump_end_tag[1] = {
161 {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_end_tag), "end_tag", 161 {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_end_tag), "EndTag",
162 NULL} 162 NULL}
163}; 163};
164 164
@@ -166,7 +166,7 @@ struct acpi_rsdump_info acpi_rs_dump_memory24[6] = {
166 {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_memory24), 166 {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_memory24),
167 "24-Bit Memory Range", NULL}, 167 "24-Bit Memory Range", NULL},
168 {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(memory24.write_protect), 168 {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(memory24.write_protect),
169 "Write Protect", acpi_gbl_RWdecode}, 169 "Write Protect", acpi_gbl_rw_decode},
170 {ACPI_RSD_UINT16, ACPI_RSD_OFFSET(memory24.minimum), "Address Minimum", 170 {ACPI_RSD_UINT16, ACPI_RSD_OFFSET(memory24.minimum), "Address Minimum",
171 NULL}, 171 NULL},
172 {ACPI_RSD_UINT16, ACPI_RSD_OFFSET(memory24.maximum), "Address Maximum", 172 {ACPI_RSD_UINT16, ACPI_RSD_OFFSET(memory24.maximum), "Address Maximum",
@@ -181,7 +181,7 @@ struct acpi_rsdump_info acpi_rs_dump_memory32[6] = {
181 {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_memory32), 181 {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_memory32),
182 "32-Bit Memory Range", NULL}, 182 "32-Bit Memory Range", NULL},
183 {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(memory32.write_protect), 183 {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(memory32.write_protect),
184 "Write Protect", acpi_gbl_RWdecode}, 184 "Write Protect", acpi_gbl_rw_decode},
185 {ACPI_RSD_UINT32, ACPI_RSD_OFFSET(memory32.minimum), "Address Minimum", 185 {ACPI_RSD_UINT32, ACPI_RSD_OFFSET(memory32.minimum), "Address Minimum",
186 NULL}, 186 NULL},
187 {ACPI_RSD_UINT32, ACPI_RSD_OFFSET(memory32.maximum), "Address Maximum", 187 {ACPI_RSD_UINT32, ACPI_RSD_OFFSET(memory32.maximum), "Address Maximum",
@@ -196,7 +196,7 @@ struct acpi_rsdump_info acpi_rs_dump_fixed_memory32[4] = {
196 {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_fixed_memory32), 196 {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_fixed_memory32),
197 "32-Bit Fixed Memory Range", NULL}, 197 "32-Bit Fixed Memory Range", NULL},
198 {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(fixed_memory32.write_protect), 198 {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(fixed_memory32.write_protect),
199 "Write Protect", acpi_gbl_RWdecode}, 199 "Write Protect", acpi_gbl_rw_decode},
200 {ACPI_RSD_UINT32, ACPI_RSD_OFFSET(fixed_memory32.address), "Address", 200 {ACPI_RSD_UINT32, ACPI_RSD_OFFSET(fixed_memory32.address), "Address",
201 NULL}, 201 NULL},
202 {ACPI_RSD_UINT32, ACPI_RSD_OFFSET(fixed_memory32.address_length), 202 {ACPI_RSD_UINT32, ACPI_RSD_OFFSET(fixed_memory32.address_length),
@@ -278,11 +278,11 @@ struct acpi_rsdump_info acpi_rs_dump_ext_irq[8] = {
278 {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(extended_irq.producer_consumer), 278 {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(extended_irq.producer_consumer),
279 "Type", acpi_gbl_consume_decode}, 279 "Type", acpi_gbl_consume_decode},
280 {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(extended_irq.triggering), 280 {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(extended_irq.triggering),
281 "Triggering", acpi_gbl_HEdecode}, 281 "Triggering", acpi_gbl_he_decode},
282 {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(extended_irq.polarity), "Polarity", 282 {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(extended_irq.polarity), "Polarity",
283 acpi_gbl_LLdecode}, 283 acpi_gbl_ll_decode},
284 {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(extended_irq.sharable), "Sharing", 284 {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(extended_irq.sharable), "Sharing",
285 acpi_gbl_SHRdecode}, 285 acpi_gbl_shr_decode},
286 {ACPI_RSD_SOURCE, ACPI_RSD_OFFSET(extended_irq.resource_source), NULL, 286 {ACPI_RSD_SOURCE, ACPI_RSD_OFFSET(extended_irq.resource_source), NULL,
287 NULL}, 287 NULL},
288 {ACPI_RSD_UINT8, ACPI_RSD_OFFSET(extended_irq.interrupt_count), 288 {ACPI_RSD_UINT8, ACPI_RSD_OFFSET(extended_irq.interrupt_count),
@@ -314,7 +314,7 @@ static struct acpi_rsdump_info acpi_rs_dump_general_flags[5] = {
314 {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(address.producer_consumer), 314 {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(address.producer_consumer),
315 "Consumer/Producer", acpi_gbl_consume_decode}, 315 "Consumer/Producer", acpi_gbl_consume_decode},
316 {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(address.decode), "Address Decode", 316 {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(address.decode), "Address Decode",
317 acpi_gbl_DECdecode}, 317 acpi_gbl_dec_decode},
318 {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(address.min_address_fixed), 318 {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(address.min_address_fixed),
319 "Min Relocatability", acpi_gbl_min_decode}, 319 "Min Relocatability", acpi_gbl_min_decode},
320 {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(address.max_address_fixed), 320 {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(address.max_address_fixed),
@@ -325,24 +325,24 @@ static struct acpi_rsdump_info acpi_rs_dump_memory_flags[5] = {
325 {ACPI_RSD_LITERAL, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_memory_flags), 325 {ACPI_RSD_LITERAL, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_memory_flags),
326 "Resource Type", (void *)"Memory Range"}, 326 "Resource Type", (void *)"Memory Range"},
327 {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(address.info.mem.write_protect), 327 {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(address.info.mem.write_protect),
328 "Write Protect", acpi_gbl_RWdecode}, 328 "Write Protect", acpi_gbl_rw_decode},
329 {ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET(address.info.mem.caching), 329 {ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET(address.info.mem.caching),
330 "Caching", acpi_gbl_MEMdecode}, 330 "Caching", acpi_gbl_mem_decode},
331 {ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET(address.info.mem.range_type), 331 {ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET(address.info.mem.range_type),
332 "Range Type", acpi_gbl_MTPdecode}, 332 "Range Type", acpi_gbl_mtp_decode},
333 {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(address.info.mem.translation), 333 {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(address.info.mem.translation),
334 "Translation", acpi_gbl_TTPdecode} 334 "Translation", acpi_gbl_ttp_decode}
335}; 335};
336 336
337static struct acpi_rsdump_info acpi_rs_dump_io_flags[4] = { 337static struct acpi_rsdump_info acpi_rs_dump_io_flags[4] = {
338 {ACPI_RSD_LITERAL, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_io_flags), 338 {ACPI_RSD_LITERAL, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_io_flags),
339 "Resource Type", (void *)"I/O Range"}, 339 "Resource Type", (void *)"I/O Range"},
340 {ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET(address.info.io.range_type), 340 {ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET(address.info.io.range_type),
341 "Range Type", acpi_gbl_RNGdecode}, 341 "Range Type", acpi_gbl_rng_decode},
342 {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(address.info.io.translation), 342 {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(address.info.io.translation),
343 "Translation", acpi_gbl_TTPdecode}, 343 "Translation", acpi_gbl_ttp_decode},
344 {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(address.info.io.translation_type), 344 {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(address.info.io.translation_type),
345 "Translation Type", acpi_gbl_TRSdecode} 345 "Translation Type", acpi_gbl_trs_decode}
346}; 346};
347 347
348/* 348/*
diff --git a/drivers/acpi/resources/rslist.c b/drivers/acpi/resources/rslist.c
index 1b2d1e717e74..29423ce030ca 100644
--- a/drivers/acpi/resources/rslist.c
+++ b/drivers/acpi/resources/rslist.c
@@ -71,7 +71,7 @@ acpi_rs_convert_aml_to_resources(u8 * aml,
71 struct acpi_resource *resource; 71 struct acpi_resource *resource;
72 acpi_status status; 72 acpi_status status;
73 73
74 ACPI_FUNCTION_TRACE("rs_convert_aml_to_resources"); 74 ACPI_FUNCTION_TRACE(rs_convert_aml_to_resources);
75 75
76 /* 76 /*
77 * Check that the input buffer and all subsequent pointers into it 77 * Check that the input buffer and all subsequent pointers into it
@@ -99,7 +99,7 @@ acpi_rs_convert_aml_to_resources(u8 * aml,
99 } 99 }
100 100
101 ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, 101 ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES,
102 "Type %.2X, aml_length %.2X internal_length %.2X\n", 102 "Type %.2X, AmlLength %.2X InternalLength %.2X\n",
103 acpi_ut_get_resource_type(aml), length, 103 acpi_ut_get_resource_type(aml), length,
104 resource->length)); 104 resource->length));
105 105
@@ -136,7 +136,7 @@ acpi_rs_convert_resources_to_aml(struct acpi_resource *resource,
136 u8 *end_aml = output_buffer + aml_size_needed; 136 u8 *end_aml = output_buffer + aml_size_needed;
137 acpi_status status; 137 acpi_status status;
138 138
139 ACPI_FUNCTION_TRACE("rs_convert_resources_to_aml"); 139 ACPI_FUNCTION_TRACE(rs_convert_resources_to_aml);
140 140
141 /* Walk the resource descriptor list, convert each descriptor */ 141 /* Walk the resource descriptor list, convert each descriptor */
142 142
diff --git a/drivers/acpi/resources/rsmisc.c b/drivers/acpi/resources/rsmisc.c
index 6a731f4028d4..faf6e106b785 100644
--- a/drivers/acpi/resources/rsmisc.c
+++ b/drivers/acpi/resources/rsmisc.c
@@ -81,7 +81,7 @@ acpi_rs_convert_aml_to_resource(struct acpi_resource *resource,
81 u16 item_count = 0; 81 u16 item_count = 0;
82 u16 temp16 = 0; 82 u16 temp16 = 0;
83 83
84 ACPI_FUNCTION_TRACE("rs_convert_aml_to_resource"); 84 ACPI_FUNCTION_TRACE(rs_convert_aml_to_resource);
85 85
86 if (((acpi_native_uint) resource) & 0x3) { 86 if (((acpi_native_uint) resource) & 0x3) {
87 87
@@ -332,7 +332,7 @@ acpi_rs_convert_resource_to_aml(struct acpi_resource *resource,
332 u16 temp16 = 0; 332 u16 temp16 = 0;
333 u16 item_count = 0; 333 u16 item_count = 0;
334 334
335 ACPI_FUNCTION_TRACE("rs_convert_resource_to_aml"); 335 ACPI_FUNCTION_TRACE(rs_convert_resource_to_aml);
336 336
337 /* 337 /*
338 * First table entry must be ACPI_RSC_INITxxx and must contain the 338 * First table entry must be ACPI_RSC_INITxxx and must contain the
diff --git a/drivers/acpi/resources/rsutils.c b/drivers/acpi/resources/rsutils.c
index 9bcf0b637d22..aa98eebc9b78 100644
--- a/drivers/acpi/resources/rsutils.c
+++ b/drivers/acpi/resources/rsutils.c
@@ -461,7 +461,7 @@ acpi_rs_get_prt_method_data(acpi_handle handle, struct acpi_buffer * ret_buffer)
461 union acpi_operand_object *obj_desc; 461 union acpi_operand_object *obj_desc;
462 acpi_status status; 462 acpi_status status;
463 463
464 ACPI_FUNCTION_TRACE("rs_get_prt_method_data"); 464 ACPI_FUNCTION_TRACE(rs_get_prt_method_data);
465 465
466 /* Parameters guaranteed valid by caller */ 466 /* Parameters guaranteed valid by caller */
467 467
@@ -509,7 +509,7 @@ acpi_rs_get_crs_method_data(acpi_handle handle, struct acpi_buffer *ret_buffer)
509 union acpi_operand_object *obj_desc; 509 union acpi_operand_object *obj_desc;
510 acpi_status status; 510 acpi_status status;
511 511
512 ACPI_FUNCTION_TRACE("rs_get_crs_method_data"); 512 ACPI_FUNCTION_TRACE(rs_get_crs_method_data);
513 513
514 /* Parameters guaranteed valid by caller */ 514 /* Parameters guaranteed valid by caller */
515 515
@@ -559,7 +559,7 @@ acpi_rs_get_prs_method_data(acpi_handle handle, struct acpi_buffer *ret_buffer)
559 union acpi_operand_object *obj_desc; 559 union acpi_operand_object *obj_desc;
560 acpi_status status; 560 acpi_status status;
561 561
562 ACPI_FUNCTION_TRACE("rs_get_prs_method_data"); 562 ACPI_FUNCTION_TRACE(rs_get_prs_method_data);
563 563
564 /* Parameters guaranteed valid by caller */ 564 /* Parameters guaranteed valid by caller */
565 565
@@ -611,7 +611,7 @@ acpi_rs_get_method_data(acpi_handle handle,
611 union acpi_operand_object *obj_desc; 611 union acpi_operand_object *obj_desc;
612 acpi_status status; 612 acpi_status status;
613 613
614 ACPI_FUNCTION_TRACE("rs_get_method_data"); 614 ACPI_FUNCTION_TRACE(rs_get_method_data);
615 615
616 /* Parameters guaranteed valid by caller */ 616 /* Parameters guaranteed valid by caller */
617 617
@@ -662,7 +662,7 @@ acpi_rs_set_srs_method_data(acpi_handle handle, struct acpi_buffer *in_buffer)
662 acpi_status status; 662 acpi_status status;
663 struct acpi_buffer buffer; 663 struct acpi_buffer buffer;
664 664
665 ACPI_FUNCTION_TRACE("rs_set_srs_method_data"); 665 ACPI_FUNCTION_TRACE(rs_set_srs_method_data);
666 666
667 /* Parameters guaranteed valid by caller */ 667 /* Parameters guaranteed valid by caller */
668 668
diff --git a/drivers/acpi/resources/rsxface.c b/drivers/acpi/resources/rsxface.c
index 1d00d285a5a3..8c1628c12cc8 100644
--- a/drivers/acpi/resources/rsxface.c
+++ b/drivers/acpi/resources/rsxface.c
@@ -95,7 +95,7 @@ acpi_get_irq_routing_table(acpi_handle device_handle,
95{ 95{
96 acpi_status status; 96 acpi_status status;
97 97
98 ACPI_FUNCTION_TRACE("acpi_get_irq_routing_table "); 98 ACPI_FUNCTION_TRACE(acpi_get_irq_routing_table);
99 99
100 /* 100 /*
101 * Must have a valid handle and buffer, So we have to have a handle 101 * Must have a valid handle and buffer, So we have to have a handle
@@ -147,7 +147,7 @@ acpi_get_current_resources(acpi_handle device_handle,
147{ 147{
148 acpi_status status; 148 acpi_status status;
149 149
150 ACPI_FUNCTION_TRACE("acpi_get_current_resources"); 150 ACPI_FUNCTION_TRACE(acpi_get_current_resources);
151 151
152 /* 152 /*
153 * Must have a valid handle and buffer, So we have to have a handle 153 * Must have a valid handle and buffer, So we have to have a handle
@@ -197,7 +197,7 @@ acpi_get_possible_resources(acpi_handle device_handle,
197{ 197{
198 acpi_status status; 198 acpi_status status;
199 199
200 ACPI_FUNCTION_TRACE("acpi_get_possible_resources"); 200 ACPI_FUNCTION_TRACE(acpi_get_possible_resources);
201 201
202 /* 202 /*
203 * Must have a valid handle and buffer, So we have to have a handle 203 * Must have a valid handle and buffer, So we have to have a handle
@@ -249,13 +249,13 @@ acpi_walk_resources(acpi_handle device_handle,
249 struct acpi_resource *resource; 249 struct acpi_resource *resource;
250 struct acpi_resource *resource_end; 250 struct acpi_resource *resource_end;
251 251
252 ACPI_FUNCTION_TRACE("acpi_walk_resources"); 252 ACPI_FUNCTION_TRACE(acpi_walk_resources);
253 253
254 /* Parameter validation */ 254 /* Parameter validation */
255 255
256 if (!device_handle || !user_function || !name || 256 if (!device_handle || !user_function || !name ||
257 (ACPI_STRNCMP(name, METHOD_NAME__CRS, sizeof(METHOD_NAME__CRS)) && 257 (!ACPI_COMPARE_NAME(name, METHOD_NAME__CRS) &&
258 ACPI_STRNCMP(name, METHOD_NAME__PRS, sizeof(METHOD_NAME__PRS)))) { 258 !ACPI_COMPARE_NAME(name, METHOD_NAME__PRS))) {
259 return_ACPI_STATUS(AE_BAD_PARAMETER); 259 return_ACPI_STATUS(AE_BAD_PARAMETER);
260 } 260 }
261 261
@@ -339,7 +339,7 @@ acpi_set_current_resources(acpi_handle device_handle,
339{ 339{
340 acpi_status status; 340 acpi_status status;
341 341
342 ACPI_FUNCTION_TRACE("acpi_set_current_resources"); 342 ACPI_FUNCTION_TRACE(acpi_set_current_resources);
343 343
344 /* Must have a valid handle and buffer */ 344 /* Must have a valid handle and buffer */
345 345
diff --git a/drivers/acpi/system.c b/drivers/acpi/system.c
index 1943bec18848..a934ac42178d 100644
--- a/drivers/acpi/system.c
+++ b/drivers/acpi/system.c
@@ -82,7 +82,7 @@ acpi_system_read_dsdt(struct file *file,
82 82
83 ACPI_FUNCTION_TRACE("acpi_system_read_dsdt"); 83 ACPI_FUNCTION_TRACE("acpi_system_read_dsdt");
84 84
85 status = acpi_get_table(ACPI_TABLE_DSDT, 1, &dsdt); 85 status = acpi_get_table(ACPI_TABLE_ID_DSDT, 1, &dsdt);
86 if (ACPI_FAILURE(status)) 86 if (ACPI_FAILURE(status))
87 return_VALUE(-ENODEV); 87 return_VALUE(-ENODEV);
88 88
@@ -110,7 +110,7 @@ acpi_system_read_fadt(struct file *file,
110 110
111 ACPI_FUNCTION_TRACE("acpi_system_read_fadt"); 111 ACPI_FUNCTION_TRACE("acpi_system_read_fadt");
112 112
113 status = acpi_get_table(ACPI_TABLE_FADT, 1, &fadt); 113 status = acpi_get_table(ACPI_TABLE_ID_FADT, 1, &fadt);
114 if (ACPI_FAILURE(status)) 114 if (ACPI_FAILURE(status))
115 return_VALUE(-ENODEV); 115 return_VALUE(-ENODEV);
116 116
diff --git a/drivers/acpi/tables/tbconvrt.c b/drivers/acpi/tables/tbconvrt.c
index a913a927d321..d697fcb35d52 100644
--- a/drivers/acpi/tables/tbconvrt.c
+++ b/drivers/acpi/tables/tbconvrt.c
@@ -492,7 +492,7 @@ acpi_status acpi_tb_convert_table_fadt(void)
492 struct fadt_descriptor *local_fadt; 492 struct fadt_descriptor *local_fadt;
493 struct acpi_table_desc *table_desc; 493 struct acpi_table_desc *table_desc;
494 494
495 ACPI_FUNCTION_TRACE("tb_convert_table_fadt"); 495 ACPI_FUNCTION_TRACE(tb_convert_table_fadt);
496 496
497 /* 497 /*
498 * acpi_gbl_FADT is valid. Validate the FADT length. The table must be 498 * acpi_gbl_FADT is valid. Validate the FADT length. The table must be
@@ -541,7 +541,7 @@ acpi_status acpi_tb_convert_table_fadt(void)
541 541
542 /* Free the original table */ 542 /* Free the original table */
543 543
544 table_desc = acpi_gbl_table_lists[ACPI_TABLE_FADT].next; 544 table_desc = acpi_gbl_table_lists[ACPI_TABLE_ID_FADT].next;
545 acpi_tb_delete_single_table(table_desc); 545 acpi_tb_delete_single_table(table_desc);
546 546
547 /* Install the new table */ 547 /* Install the new table */
@@ -579,7 +579,7 @@ acpi_status acpi_tb_convert_table_fadt(void)
579acpi_status acpi_tb_build_common_facs(struct acpi_table_desc *table_info) 579acpi_status acpi_tb_build_common_facs(struct acpi_table_desc *table_info)
580{ 580{
581 581
582 ACPI_FUNCTION_TRACE("tb_build_common_facs"); 582 ACPI_FUNCTION_TRACE(tb_build_common_facs);
583 583
584 /* Absolute minimum length is 24, but the ACPI spec says 64 */ 584 /* Absolute minimum length is 24, but the ACPI spec says 64 */
585 585
diff --git a/drivers/acpi/tables/tbget.c b/drivers/acpi/tables/tbget.c
index b7bd20b9a75e..3a4f46ca3884 100644
--- a/drivers/acpi/tables/tbget.c
+++ b/drivers/acpi/tables/tbget.c
@@ -78,7 +78,7 @@ acpi_tb_get_table(struct acpi_pointer *address,
78 acpi_status status; 78 acpi_status status;
79 struct acpi_table_header header; 79 struct acpi_table_header header;
80 80
81 ACPI_FUNCTION_TRACE("tb_get_table"); 81 ACPI_FUNCTION_TRACE(tb_get_table);
82 82
83 /* Get the header in order to get signature and table size */ 83 /* Get the header in order to get signature and table size */
84 84
@@ -124,7 +124,7 @@ acpi_tb_get_table_header(struct acpi_pointer *address,
124 acpi_status status = AE_OK; 124 acpi_status status = AE_OK;
125 struct acpi_table_header *header = NULL; 125 struct acpi_table_header *header = NULL;
126 126
127 ACPI_FUNCTION_TRACE("tb_get_table_header"); 127 ACPI_FUNCTION_TRACE(tb_get_table_header);
128 128
129 /* 129 /*
130 * Flags contains the current processor mode (Virtual or Physical 130 * Flags contains the current processor mode (Virtual or Physical
@@ -202,7 +202,7 @@ acpi_tb_get_table_body(struct acpi_pointer *address,
202{ 202{
203 acpi_status status; 203 acpi_status status;
204 204
205 ACPI_FUNCTION_TRACE("tb_get_table_body"); 205 ACPI_FUNCTION_TRACE(tb_get_table_body);
206 206
207 if (!table_info || !address) { 207 if (!table_info || !address) {
208 return_ACPI_STATUS(AE_BAD_PARAMETER); 208 return_ACPI_STATUS(AE_BAD_PARAMETER);
@@ -246,7 +246,7 @@ acpi_tb_table_override(struct acpi_table_header *header,
246 acpi_status status; 246 acpi_status status;
247 struct acpi_pointer address; 247 struct acpi_pointer address;
248 248
249 ACPI_FUNCTION_TRACE("tb_table_override"); 249 ACPI_FUNCTION_TRACE(tb_table_override);
250 250
251 /* 251 /*
252 * The OSL will examine the header and decide whether to override this 252 * The OSL will examine the header and decide whether to override this
@@ -318,7 +318,7 @@ acpi_tb_get_this_table(struct acpi_pointer *address,
318 u8 allocation; 318 u8 allocation;
319 acpi_status status = AE_OK; 319 acpi_status status = AE_OK;
320 320
321 ACPI_FUNCTION_TRACE("tb_get_this_table"); 321 ACPI_FUNCTION_TRACE(tb_get_this_table);
322 322
323 /* 323 /*
324 * Flags contains the current processor mode (Virtual or Physical 324 * Flags contains the current processor mode (Virtual or Physical
@@ -383,7 +383,7 @@ acpi_tb_get_this_table(struct acpi_pointer *address,
383 * Validate checksum for _most_ tables, 383 * Validate checksum for _most_ tables,
384 * even the ones whose signature we don't recognize 384 * even the ones whose signature we don't recognize
385 */ 385 */
386 if (table_info->type != ACPI_TABLE_FACS) { 386 if (table_info->type != ACPI_TABLE_ID_FACS) {
387 status = acpi_tb_verify_table_checksum(full_table); 387 status = acpi_tb_verify_table_checksum(full_table);
388 388
389#if (!ACPI_CHECKSUM_ABORT) 389#if (!ACPI_CHECKSUM_ABORT)
@@ -433,13 +433,13 @@ acpi_tb_get_table_ptr(acpi_table_type table_type,
433 struct acpi_table_desc *table_desc; 433 struct acpi_table_desc *table_desc;
434 u32 i; 434 u32 i;
435 435
436 ACPI_FUNCTION_TRACE("tb_get_table_ptr"); 436 ACPI_FUNCTION_TRACE(tb_get_table_ptr);
437 437
438 if (!acpi_gbl_DSDT) { 438 if (!acpi_gbl_DSDT) {
439 return_ACPI_STATUS(AE_NO_ACPI_TABLES); 439 return_ACPI_STATUS(AE_NO_ACPI_TABLES);
440 } 440 }
441 441
442 if (table_type > ACPI_TABLE_MAX) { 442 if (table_type > ACPI_TABLE_ID_MAX) {
443 return_ACPI_STATUS(AE_BAD_PARAMETER); 443 return_ACPI_STATUS(AE_BAD_PARAMETER);
444 } 444 }
445 445
diff --git a/drivers/acpi/tables/tbgetall.c b/drivers/acpi/tables/tbgetall.c
index b4ec61d7cf06..ad982112e4c6 100644
--- a/drivers/acpi/tables/tbgetall.c
+++ b/drivers/acpi/tables/tbgetall.c
@@ -77,7 +77,7 @@ acpi_tb_get_primary_table(struct acpi_pointer *address,
77 acpi_status status; 77 acpi_status status;
78 struct acpi_table_header header; 78 struct acpi_table_header header;
79 79
80 ACPI_FUNCTION_TRACE("tb_get_primary_table"); 80 ACPI_FUNCTION_TRACE(tb_get_primary_table);
81 81
82 /* Ignore a NULL address in the RSDT */ 82 /* Ignore a NULL address in the RSDT */
83 83
@@ -140,7 +140,7 @@ acpi_tb_get_secondary_table(struct acpi_pointer *address,
140 acpi_status status; 140 acpi_status status;
141 struct acpi_table_header header; 141 struct acpi_table_header header;
142 142
143 ACPI_FUNCTION_TRACE_STR("tb_get_secondary_table", signature); 143 ACPI_FUNCTION_TRACE_STR(tb_get_secondary_table, signature);
144 144
145 /* Get the header in order to match the signature */ 145 /* Get the header in order to match the signature */
146 146
@@ -151,7 +151,7 @@ acpi_tb_get_secondary_table(struct acpi_pointer *address,
151 151
152 /* Signature must match request */ 152 /* Signature must match request */
153 153
154 if (ACPI_STRNCMP(header.signature, signature, ACPI_NAME_SIZE)) { 154 if (!ACPI_COMPARE_NAME(header.signature, signature)) {
155 ACPI_ERROR((AE_INFO, 155 ACPI_ERROR((AE_INFO,
156 "Incorrect table signature - wanted [%s] found [%4.4s]", 156 "Incorrect table signature - wanted [%s] found [%4.4s]",
157 signature, header.signature)); 157 signature, header.signature));
@@ -207,7 +207,7 @@ acpi_status acpi_tb_get_required_tables(void)
207 struct acpi_table_desc table_info; 207 struct acpi_table_desc table_info;
208 struct acpi_pointer address; 208 struct acpi_pointer address;
209 209
210 ACPI_FUNCTION_TRACE("tb_get_required_tables"); 210 ACPI_FUNCTION_TRACE(tb_get_required_tables);
211 211
212 ACPI_DEBUG_PRINT((ACPI_DB_INFO, "%d ACPI tables in RSDT\n", 212 ACPI_DEBUG_PRINT((ACPI_DB_INFO, "%d ACPI tables in RSDT\n",
213 acpi_gbl_rsdt_table_count)); 213 acpi_gbl_rsdt_table_count));
@@ -306,6 +306,6 @@ acpi_status acpi_tb_get_required_tables(void)
306 306
307 /* Always delete the RSDP mapping, we are done with it */ 307 /* Always delete the RSDP mapping, we are done with it */
308 308
309 acpi_tb_delete_tables_by_type(ACPI_TABLE_RSDP); 309 acpi_tb_delete_tables_by_type(ACPI_TABLE_ID_RSDP);
310 return_ACPI_STATUS(status); 310 return_ACPI_STATUS(status);
311} 311}
diff --git a/drivers/acpi/tables/tbinstal.c b/drivers/acpi/tables/tbinstal.c
index ce57a195577a..7ca2df75bb11 100644
--- a/drivers/acpi/tables/tbinstal.c
+++ b/drivers/acpi/tables/tbinstal.c
@@ -73,11 +73,11 @@ acpi_tb_match_signature(char *signature,
73{ 73{
74 acpi_native_uint i; 74 acpi_native_uint i;
75 75
76 ACPI_FUNCTION_TRACE("tb_match_signature"); 76 ACPI_FUNCTION_TRACE(tb_match_signature);
77 77
78 /* Search for a signature match among the known table types */ 78 /* Search for a signature match among the known table types */
79 79
80 for (i = 0; i < NUM_ACPI_TABLE_TYPES; i++) { 80 for (i = 0; i < (ACPI_TABLE_ID_MAX + 1); i++) {
81 if (!(acpi_gbl_table_data[i].flags & search_type)) { 81 if (!(acpi_gbl_table_data[i].flags & search_type)) {
82 continue; 82 continue;
83 } 83 }
@@ -123,7 +123,7 @@ acpi_status acpi_tb_install_table(struct acpi_table_desc *table_info)
123{ 123{
124 acpi_status status; 124 acpi_status status;
125 125
126 ACPI_FUNCTION_TRACE("tb_install_table"); 126 ACPI_FUNCTION_TRACE(tb_install_table);
127 127
128 /* Lock tables while installing */ 128 /* Lock tables while installing */
129 129
@@ -188,7 +188,7 @@ acpi_tb_recognize_table(struct acpi_table_desc *table_info, u8 search_type)
188 struct acpi_table_header *table_header; 188 struct acpi_table_header *table_header;
189 acpi_status status; 189 acpi_status status;
190 190
191 ACPI_FUNCTION_TRACE("tb_recognize_table"); 191 ACPI_FUNCTION_TRACE(tb_recognize_table);
192 192
193 /* Ensure that we have a valid table pointer */ 193 /* Ensure that we have a valid table pointer */
194 194
@@ -219,7 +219,6 @@ acpi_tb_recognize_table(struct acpi_table_desc *table_info, u8 search_type)
219 /* Return the table type and length via the info struct */ 219 /* Return the table type and length via the info struct */
220 220
221 table_info->length = (acpi_size) table_header->length; 221 table_info->length = (acpi_size) table_header->length;
222
223 return_ACPI_STATUS(status); 222 return_ACPI_STATUS(status);
224} 223}
225 224
@@ -244,7 +243,7 @@ acpi_tb_init_table_descriptor(acpi_table_type table_type,
244 struct acpi_table_desc *table_desc; 243 struct acpi_table_desc *table_desc;
245 acpi_status status; 244 acpi_status status;
246 245
247 ACPI_FUNCTION_TRACE_U32("tb_init_table_descriptor", table_type); 246 ACPI_FUNCTION_TRACE_U32(tb_init_table_descriptor, table_type);
248 247
249 /* Allocate a descriptor for this table */ 248 /* Allocate a descriptor for this table */
250 249
@@ -313,15 +312,14 @@ acpi_tb_init_table_descriptor(acpi_table_type table_type,
313 312
314 /* Finish initialization of the table descriptor */ 313 /* Finish initialization of the table descriptor */
315 314
315 table_desc->loaded_into_namespace = FALSE;
316 table_desc->type = (u8) table_type; 316 table_desc->type = (u8) table_type;
317 table_desc->pointer = table_info->pointer; 317 table_desc->pointer = table_info->pointer;
318 table_desc->length = table_info->length; 318 table_desc->length = table_info->length;
319 table_desc->allocation = table_info->allocation; 319 table_desc->allocation = table_info->allocation;
320 table_desc->aml_start = (u8 *) (table_desc->pointer + 1), 320 table_desc->aml_start = (u8 *) (table_desc->pointer + 1),
321 table_desc->aml_length = (u32) (table_desc->length - 321 table_desc->aml_length = (u32)
322 (u32) sizeof(struct 322 (table_desc->length - (u32) sizeof(struct acpi_table_header));
323 acpi_table_header));
324 table_desc->loaded_into_namespace = FALSE;
325 323
326 /* 324 /*
327 * Set the appropriate global pointer (if there is one) to point to the 325 * Set the appropriate global pointer (if there is one) to point to the
@@ -336,7 +334,6 @@ acpi_tb_init_table_descriptor(acpi_table_type table_type,
336 334
337 table_info->owner_id = table_desc->owner_id; 335 table_info->owner_id = table_desc->owner_id;
338 table_info->installed_desc = table_desc; 336 table_info->installed_desc = table_desc;
339
340 return_ACPI_STATUS(AE_OK); 337 return_ACPI_STATUS(AE_OK);
341} 338}
342 339
@@ -360,7 +357,7 @@ void acpi_tb_delete_all_tables(void)
360 * Free memory allocated for ACPI tables 357 * Free memory allocated for ACPI tables
361 * Memory can either be mapped or allocated 358 * Memory can either be mapped or allocated
362 */ 359 */
363 for (type = 0; type < NUM_ACPI_TABLE_TYPES; type++) { 360 for (type = 0; type < (ACPI_TABLE_ID_MAX + 1); type++) {
364 acpi_tb_delete_tables_by_type(type); 361 acpi_tb_delete_tables_by_type(type);
365 } 362 }
366} 363}
@@ -384,9 +381,9 @@ void acpi_tb_delete_tables_by_type(acpi_table_type type)
384 u32 count; 381 u32 count;
385 u32 i; 382 u32 i;
386 383
387 ACPI_FUNCTION_TRACE_U32("tb_delete_tables_by_type", type); 384 ACPI_FUNCTION_TRACE_U32(tb_delete_tables_by_type, type);
388 385
389 if (type > ACPI_TABLE_MAX) { 386 if (type > ACPI_TABLE_ID_MAX) {
390 return_VOID; 387 return_VOID;
391 } 388 }
392 389
@@ -397,28 +394,28 @@ void acpi_tb_delete_tables_by_type(acpi_table_type type)
397 /* Clear the appropriate "typed" global table pointer */ 394 /* Clear the appropriate "typed" global table pointer */
398 395
399 switch (type) { 396 switch (type) {
400 case ACPI_TABLE_RSDP: 397 case ACPI_TABLE_ID_RSDP:
401 acpi_gbl_RSDP = NULL; 398 acpi_gbl_RSDP = NULL;
402 break; 399 break;
403 400
404 case ACPI_TABLE_DSDT: 401 case ACPI_TABLE_ID_DSDT:
405 acpi_gbl_DSDT = NULL; 402 acpi_gbl_DSDT = NULL;
406 break; 403 break;
407 404
408 case ACPI_TABLE_FADT: 405 case ACPI_TABLE_ID_FADT:
409 acpi_gbl_FADT = NULL; 406 acpi_gbl_FADT = NULL;
410 break; 407 break;
411 408
412 case ACPI_TABLE_FACS: 409 case ACPI_TABLE_ID_FACS:
413 acpi_gbl_FACS = NULL; 410 acpi_gbl_FACS = NULL;
414 break; 411 break;
415 412
416 case ACPI_TABLE_XSDT: 413 case ACPI_TABLE_ID_XSDT:
417 acpi_gbl_XSDT = NULL; 414 acpi_gbl_XSDT = NULL;
418 break; 415 break;
419 416
420 case ACPI_TABLE_SSDT: 417 case ACPI_TABLE_ID_SSDT:
421 case ACPI_TABLE_PSDT: 418 case ACPI_TABLE_ID_PSDT:
422 default: 419 default:
423 break; 420 break;
424 } 421 }
@@ -504,7 +501,7 @@ struct acpi_table_desc *acpi_tb_uninstall_table(struct acpi_table_desc
504{ 501{
505 struct acpi_table_desc *next_desc; 502 struct acpi_table_desc *next_desc;
506 503
507 ACPI_FUNCTION_TRACE_PTR("tb_uninstall_table", table_desc); 504 ACPI_FUNCTION_TRACE_PTR(tb_uninstall_table, table_desc);
508 505
509 if (!table_desc) { 506 if (!table_desc) {
510 return_PTR(NULL); 507 return_PTR(NULL);
diff --git a/drivers/acpi/tables/tbrsdt.c b/drivers/acpi/tables/tbrsdt.c
index 9e0ebe625ed9..9e226438a3f6 100644
--- a/drivers/acpi/tables/tbrsdt.c
+++ b/drivers/acpi/tables/tbrsdt.c
@@ -64,7 +64,7 @@ acpi_status acpi_tb_verify_rsdp(struct acpi_pointer *address)
64 acpi_status status; 64 acpi_status status;
65 struct rsdp_descriptor *rsdp; 65 struct rsdp_descriptor *rsdp;
66 66
67 ACPI_FUNCTION_TRACE("tb_verify_rsdp"); 67 ACPI_FUNCTION_TRACE(tb_verify_rsdp);
68 68
69 switch (address->pointer_type) { 69 switch (address->pointer_type) {
70 case ACPI_LOGICAL_POINTER: 70 case ACPI_LOGICAL_POINTER:
@@ -103,7 +103,7 @@ acpi_status acpi_tb_verify_rsdp(struct acpi_pointer *address)
103 103
104 /* Save the table pointers and allocation info */ 104 /* Save the table pointers and allocation info */
105 105
106 status = acpi_tb_init_table_descriptor(ACPI_TABLE_RSDP, &table_info); 106 status = acpi_tb_init_table_descriptor(ACPI_TABLE_ID_RSDP, &table_info);
107 if (ACPI_FAILURE(status)) { 107 if (ACPI_FAILURE(status)) {
108 goto cleanup; 108 goto cleanup;
109 } 109 }
@@ -174,22 +174,19 @@ void acpi_tb_get_rsdt_address(struct acpi_pointer *out_address)
174 174
175acpi_status acpi_tb_validate_rsdt(struct acpi_table_header *table_ptr) 175acpi_status acpi_tb_validate_rsdt(struct acpi_table_header *table_ptr)
176{ 176{
177 int no_match; 177 char *signature;
178 178
179 ACPI_FUNCTION_ENTRY(); 179 ACPI_FUNCTION_ENTRY();
180 180
181 /* 181 /* Search for appropriate signature, RSDT or XSDT */
182 * Search for appropriate signature, RSDT or XSDT 182
183 */
184 if (acpi_gbl_root_table_type == ACPI_TABLE_TYPE_RSDT) { 183 if (acpi_gbl_root_table_type == ACPI_TABLE_TYPE_RSDT) {
185 no_match = ACPI_STRNCMP((char *)table_ptr, RSDT_SIG, 184 signature = RSDT_SIG;
186 sizeof(RSDT_SIG) - 1);
187 } else { 185 } else {
188 no_match = ACPI_STRNCMP((char *)table_ptr, XSDT_SIG, 186 signature = XSDT_SIG;
189 sizeof(XSDT_SIG) - 1);
190 } 187 }
191 188
192 if (no_match) { 189 if (!ACPI_COMPARE_NAME(table_ptr->signature, signature)) {
193 190
194 /* Invalid RSDT or XSDT signature */ 191 /* Invalid RSDT or XSDT signature */
195 192
@@ -235,13 +232,13 @@ acpi_status acpi_tb_get_table_rsdt(void)
235 acpi_status status; 232 acpi_status status;
236 struct acpi_pointer address; 233 struct acpi_pointer address;
237 234
238 ACPI_FUNCTION_TRACE("tb_get_table_rsdt"); 235 ACPI_FUNCTION_TRACE(tb_get_table_rsdt);
239 236
240 /* Get the RSDT/XSDT via the RSDP */ 237 /* Get the RSDT/XSDT via the RSDP */
241 238
242 acpi_tb_get_rsdt_address(&address); 239 acpi_tb_get_rsdt_address(&address);
243 240
244 table_info.type = ACPI_TABLE_XSDT; 241 table_info.type = ACPI_TABLE_ID_XSDT;
245 status = acpi_tb_get_table(&address, &table_info); 242 status = acpi_tb_get_table(&address, &table_info);
246 if (ACPI_FAILURE(status)) { 243 if (ACPI_FAILURE(status)) {
247 ACPI_EXCEPTION((AE_INFO, status, 244 ACPI_EXCEPTION((AE_INFO, status,
@@ -275,7 +272,7 @@ acpi_status acpi_tb_get_table_rsdt(void)
275 272
276 /* Save the table pointers and allocation info */ 273 /* Save the table pointers and allocation info */
277 274
278 status = acpi_tb_init_table_descriptor(ACPI_TABLE_XSDT, &table_info); 275 status = acpi_tb_init_table_descriptor(ACPI_TABLE_ID_XSDT, &table_info);
279 if (ACPI_FAILURE(status)) { 276 if (ACPI_FAILURE(status)) {
280 return_ACPI_STATUS(status); 277 return_ACPI_STATUS(status);
281 } 278 }
diff --git a/drivers/acpi/tables/tbutils.c b/drivers/acpi/tables/tbutils.c
index f8d28ae8811d..5f1440376514 100644
--- a/drivers/acpi/tables/tbutils.c
+++ b/drivers/acpi/tables/tbutils.c
@@ -71,7 +71,7 @@ acpi_status acpi_tb_is_table_installed(struct acpi_table_desc *new_table_desc)
71{ 71{
72 struct acpi_table_desc *table_desc; 72 struct acpi_table_desc *table_desc;
73 73
74 ACPI_FUNCTION_TRACE("tb_is_table_installed"); 74 ACPI_FUNCTION_TRACE(tb_is_table_installed);
75 75
76 /* Get the list descriptor and first table descriptor */ 76 /* Get the list descriptor and first table descriptor */
77 77
@@ -100,7 +100,7 @@ acpi_status acpi_tb_is_table_installed(struct acpi_table_desc *new_table_desc)
100 /* Match: this table is already installed */ 100 /* Match: this table is already installed */
101 101
102 ACPI_DEBUG_PRINT((ACPI_DB_TABLES, 102 ACPI_DEBUG_PRINT((ACPI_DB_TABLES,
103 "Table [%4.4s] already installed: Rev %X oem_table_id [%8.8s]\n", 103 "Table [%4.4s] already installed: Rev %X OemTableId [%8.8s]\n",
104 new_table_desc->pointer->signature, 104 new_table_desc->pointer->signature,
105 new_table_desc->pointer->revision, 105 new_table_desc->pointer->revision,
106 new_table_desc->pointer-> 106 new_table_desc->pointer->
@@ -288,7 +288,7 @@ acpi_tb_verify_table_checksum(struct acpi_table_header *table_header)
288{ 288{
289 u8 checksum; 289 u8 checksum;
290 290
291 ACPI_FUNCTION_TRACE("tb_verify_table_checksum"); 291 ACPI_FUNCTION_TRACE(tb_verify_table_checksum);
292 292
293 /* Compute the checksum on the table */ 293 /* Compute the checksum on the table */
294 294
@@ -329,7 +329,7 @@ acpi_tb_handle_to_object(u16 table_id,
329 u32 i; 329 u32 i;
330 struct acpi_table_desc *table_desc; 330 struct acpi_table_desc *table_desc;
331 331
332 ACPI_FUNCTION_NAME("tb_handle_to_object"); 332 ACPI_FUNCTION_NAME(tb_handle_to_object);
333 333
334 for (i = 0; i < ACPI_TABLE_MAX; i++) { 334 for (i = 0; i < ACPI_TABLE_MAX; i++) {
335 table_desc = acpi_gbl_table_lists[i].next; 335 table_desc = acpi_gbl_table_lists[i].next;
@@ -343,7 +343,7 @@ acpi_tb_handle_to_object(u16 table_id,
343 } 343 }
344 } 344 }
345 345
346 ACPI_ERROR((AE_INFO, "table_id=%X does not exist", table_id)); 346 ACPI_ERROR((AE_INFO, "TableId=%X does not exist", table_id));
347 return (AE_BAD_PARAMETER); 347 return (AE_BAD_PARAMETER);
348} 348}
349#endif 349#endif
diff --git a/drivers/acpi/tables/tbxface.c b/drivers/acpi/tables/tbxface.c
index 53c627e401bf..4e91f2984815 100644
--- a/drivers/acpi/tables/tbxface.c
+++ b/drivers/acpi/tables/tbxface.c
@@ -66,7 +66,7 @@ acpi_status acpi_load_tables(void)
66 struct acpi_pointer rsdp_address; 66 struct acpi_pointer rsdp_address;
67 acpi_status status; 67 acpi_status status;
68 68
69 ACPI_FUNCTION_TRACE("acpi_load_tables"); 69 ACPI_FUNCTION_TRACE(acpi_load_tables);
70 70
71 /* Get the RSDP */ 71 /* Get the RSDP */
72 72
@@ -145,7 +145,7 @@ acpi_status acpi_load_table(struct acpi_table_header *table_ptr)
145 struct acpi_table_desc table_info; 145 struct acpi_table_desc table_info;
146 struct acpi_pointer address; 146 struct acpi_pointer address;
147 147
148 ACPI_FUNCTION_TRACE("acpi_load_table"); 148 ACPI_FUNCTION_TRACE(acpi_load_table);
149 149
150 if (!table_ptr) { 150 if (!table_ptr) {
151 return_ACPI_STATUS(AE_BAD_PARAMETER); 151 return_ACPI_STATUS(AE_BAD_PARAMETER);
@@ -188,12 +188,12 @@ acpi_status acpi_load_table(struct acpi_table_header *table_ptr)
188 /* Convert the table to common format if necessary */ 188 /* Convert the table to common format if necessary */
189 189
190 switch (table_info.type) { 190 switch (table_info.type) {
191 case ACPI_TABLE_FADT: 191 case ACPI_TABLE_ID_FADT:
192 192
193 status = acpi_tb_convert_table_fadt(); 193 status = acpi_tb_convert_table_fadt();
194 break; 194 break;
195 195
196 case ACPI_TABLE_FACS: 196 case ACPI_TABLE_ID_FACS:
197 197
198 status = acpi_tb_build_common_facs(&table_info); 198 status = acpi_tb_build_common_facs(&table_info);
199 break; 199 break;
@@ -234,11 +234,11 @@ acpi_status acpi_unload_table(acpi_table_type table_type)
234{ 234{
235 struct acpi_table_desc *table_desc; 235 struct acpi_table_desc *table_desc;
236 236
237 ACPI_FUNCTION_TRACE("acpi_unload_table"); 237 ACPI_FUNCTION_TRACE(acpi_unload_table);
238 238
239 /* Parameter validation */ 239 /* Parameter validation */
240 240
241 if (table_type > ACPI_TABLE_MAX) { 241 if (table_type > ACPI_TABLE_ID_MAX) {
242 return_ACPI_STATUS(AE_BAD_PARAMETER); 242 return_ACPI_STATUS(AE_BAD_PARAMETER);
243 } 243 }
244 244
@@ -292,16 +292,16 @@ acpi_get_table_header(acpi_table_type table_type,
292 struct acpi_table_header *tbl_ptr; 292 struct acpi_table_header *tbl_ptr;
293 acpi_status status; 293 acpi_status status;
294 294
295 ACPI_FUNCTION_TRACE("acpi_get_table_header"); 295 ACPI_FUNCTION_TRACE(acpi_get_table_header);
296 296
297 if ((instance == 0) || 297 if ((instance == 0) ||
298 (table_type == ACPI_TABLE_RSDP) || (!out_table_header)) { 298 (table_type == ACPI_TABLE_ID_RSDP) || (!out_table_header)) {
299 return_ACPI_STATUS(AE_BAD_PARAMETER); 299 return_ACPI_STATUS(AE_BAD_PARAMETER);
300 } 300 }
301 301
302 /* Check the table type and instance */ 302 /* Check the table type and instance */
303 303
304 if ((table_type > ACPI_TABLE_MAX) || 304 if ((table_type > ACPI_TABLE_ID_MAX) ||
305 (ACPI_IS_SINGLE_TABLE(acpi_gbl_table_data[table_type].flags) && 305 (ACPI_IS_SINGLE_TABLE(acpi_gbl_table_data[table_type].flags) &&
306 instance > 1)) { 306 instance > 1)) {
307 return_ACPI_STATUS(AE_BAD_PARAMETER); 307 return_ACPI_STATUS(AE_BAD_PARAMETER);
@@ -361,7 +361,7 @@ acpi_get_table(acpi_table_type table_type,
361 acpi_status status; 361 acpi_status status;
362 acpi_size table_length; 362 acpi_size table_length;
363 363
364 ACPI_FUNCTION_TRACE("acpi_get_table"); 364 ACPI_FUNCTION_TRACE(acpi_get_table);
365 365
366 /* Parameter validation */ 366 /* Parameter validation */
367 367
@@ -376,7 +376,7 @@ acpi_get_table(acpi_table_type table_type,
376 376
377 /* Check the table type and instance */ 377 /* Check the table type and instance */
378 378
379 if ((table_type > ACPI_TABLE_MAX) || 379 if ((table_type > ACPI_TABLE_ID_MAX) ||
380 (ACPI_IS_SINGLE_TABLE(acpi_gbl_table_data[table_type].flags) && 380 (ACPI_IS_SINGLE_TABLE(acpi_gbl_table_data[table_type].flags) &&
381 instance > 1)) { 381 instance > 1)) {
382 return_ACPI_STATUS(AE_BAD_PARAMETER); 382 return_ACPI_STATUS(AE_BAD_PARAMETER);
@@ -399,7 +399,7 @@ acpi_get_table(acpi_table_type table_type,
399 399
400 /* Get the table length */ 400 /* Get the table length */
401 401
402 if (table_type == ACPI_TABLE_RSDP) { 402 if (table_type == ACPI_TABLE_ID_RSDP) {
403 403
404 /* RSD PTR is the only "table" without a header */ 404 /* RSD PTR is the only "table" without a header */
405 405
diff --git a/drivers/acpi/tables/tbxfroot.c b/drivers/acpi/tables/tbxfroot.c
index 550284f5d1ed..3107e741d510 100644
--- a/drivers/acpi/tables/tbxfroot.c
+++ b/drivers/acpi/tables/tbxfroot.c
@@ -119,7 +119,7 @@ acpi_tb_find_table(char *signature,
119 acpi_status status; 119 acpi_status status;
120 struct acpi_table_header *table; 120 struct acpi_table_header *table;
121 121
122 ACPI_FUNCTION_TRACE("tb_find_table"); 122 ACPI_FUNCTION_TRACE(tb_find_table);
123 123
124 /* Validate string lengths */ 124 /* Validate string lengths */
125 125
@@ -129,7 +129,7 @@ acpi_tb_find_table(char *signature,
129 return_ACPI_STATUS(AE_AML_STRING_LIMIT); 129 return_ACPI_STATUS(AE_AML_STRING_LIMIT);
130 } 130 }
131 131
132 if (!ACPI_STRNCMP(signature, DSDT_SIG, ACPI_NAME_SIZE)) { 132 if (ACPI_COMPARE_NAME(signature, DSDT_SIG)) {
133 /* 133 /*
134 * The DSDT pointer is contained in the FADT, not the RSDT. 134 * The DSDT pointer is contained in the FADT, not the RSDT.
135 * This code should suffice, because the only code that would perform 135 * This code should suffice, because the only code that would perform
@@ -154,10 +154,12 @@ acpi_tb_find_table(char *signature,
154 154
155 /* Check oem_id and oem_table_id */ 155 /* Check oem_id and oem_table_id */
156 156
157 if ((oem_id[0] && ACPI_STRNCMP(oem_id, table->oem_id, 157 if ((oem_id[0] &&
158 sizeof(table->oem_id))) || 158 ACPI_STRNCMP(oem_id, table->oem_id,
159 (oem_table_id[0] && ACPI_STRNCMP(oem_table_id, table->oem_table_id, 159 sizeof(table->oem_id))) ||
160 sizeof(table->oem_table_id)))) { 160 (oem_table_id[0] &&
161 ACPI_STRNCMP(oem_table_id, table->oem_table_id,
162 sizeof(table->oem_table_id)))) {
161 return_ACPI_STATUS(AE_AML_NAME_NOT_FOUND); 163 return_ACPI_STATUS(AE_AML_NAME_NOT_FOUND);
162 } 164 }
163 165
@@ -201,7 +203,7 @@ acpi_get_firmware_table(acpi_string signature,
201 u32 i; 203 u32 i;
202 u32 j; 204 u32 j;
203 205
204 ACPI_FUNCTION_TRACE("acpi_get_firmware_table"); 206 ACPI_FUNCTION_TRACE(acpi_get_firmware_table);
205 207
206 /* 208 /*
207 * Ensure that at least the table manager is initialized. We don't 209 * Ensure that at least the table manager is initialized. We don't
@@ -325,7 +327,7 @@ acpi_get_firmware_table(acpi_string signature,
325 327
326 /* Compare table signatures and table instance */ 328 /* Compare table signatures and table instance */
327 329
328 if (!ACPI_STRNCMP(header->signature, signature, ACPI_NAME_SIZE)) { 330 if (ACPI_COMPARE_NAME(header->signature, signature)) {
329 331
330 /* An instance of the table was found */ 332 /* An instance of the table was found */
331 333
@@ -388,7 +390,7 @@ acpi_status acpi_find_root_pointer(u32 flags, struct acpi_pointer *rsdp_address)
388 struct acpi_table_desc table_info; 390 struct acpi_table_desc table_info;
389 acpi_status status; 391 acpi_status status;
390 392
391 ACPI_FUNCTION_TRACE("acpi_find_root_pointer"); 393 ACPI_FUNCTION_TRACE(acpi_find_root_pointer);
392 394
393 /* Get the RSDP */ 395 /* Get the RSDP */
394 396
@@ -425,7 +427,7 @@ static u8 *acpi_tb_scan_memory_for_rsdp(u8 * start_address, u32 length)
425 u8 *mem_rover; 427 u8 *mem_rover;
426 u8 *end_address; 428 u8 *end_address;
427 429
428 ACPI_FUNCTION_TRACE("tb_scan_memory_for_rsdp"); 430 ACPI_FUNCTION_TRACE(tb_scan_memory_for_rsdp);
429 431
430 end_address = start_address + length; 432 end_address = start_address + length;
431 433
@@ -490,7 +492,7 @@ acpi_tb_find_rsdp(struct acpi_table_desc *table_info, u32 flags)
490 u32 physical_address; 492 u32 physical_address;
491 acpi_status status; 493 acpi_status status;
492 494
493 ACPI_FUNCTION_TRACE("tb_find_rsdp"); 495 ACPI_FUNCTION_TRACE(tb_find_rsdp);
494 496
495 /* 497 /*
496 * Scan supports either logical addressing or physical addressing 498 * Scan supports either logical addressing or physical addressing
diff --git a/drivers/acpi/utilities/utalloc.c b/drivers/acpi/utilities/utalloc.c
index 3b29aecaaca5..65a7c2ed9aa1 100644
--- a/drivers/acpi/utilities/utalloc.c
+++ b/drivers/acpi/utilities/utalloc.c
@@ -108,7 +108,7 @@ acpi_status acpi_ut_create_caches(void)
108 } 108 }
109 109
110 status = 110 status =
111 acpi_os_create_cache("Acpi-parse_ext", 111 acpi_os_create_cache("Acpi-ParseExt",
112 sizeof(struct acpi_parse_obj_named), 112 sizeof(struct acpi_parse_obj_named),
113 ACPI_MAX_EXTPARSE_CACHE_DEPTH, 113 ACPI_MAX_EXTPARSE_CACHE_DEPTH,
114 &acpi_gbl_ps_node_ext_cache); 114 &acpi_gbl_ps_node_ext_cache);
@@ -289,7 +289,7 @@ void *acpi_ut_allocate(acpi_size size, u32 component, char *module, u32 line)
289{ 289{
290 void *allocation; 290 void *allocation;
291 291
292 ACPI_FUNCTION_TRACE_U32("ut_allocate", size); 292 ACPI_FUNCTION_TRACE_U32(ut_allocate, size);
293 293
294 /* Check for an inadvertent size of zero bytes */ 294 /* Check for an inadvertent size of zero bytes */
295 295
diff --git a/drivers/acpi/utilities/utcache.c b/drivers/acpi/utilities/utcache.c
index 593b08ccd6bf..56270a30718a 100644
--- a/drivers/acpi/utilities/utcache.c
+++ b/drivers/acpi/utilities/utcache.c
@@ -244,7 +244,7 @@ void *acpi_os_acquire_object(struct acpi_memory_list *cache)
244 acpi_status status; 244 acpi_status status;
245 void *object; 245 void *object;
246 246
247 ACPI_FUNCTION_NAME("os_acquire_object"); 247 ACPI_FUNCTION_NAME(os_acquire_object);
248 248
249 if (!cache) { 249 if (!cache) {
250 return (NULL); 250 return (NULL);
diff --git a/drivers/acpi/utilities/utcopy.c b/drivers/acpi/utilities/utcopy.c
index 371cddc0d574..5e1a80d1bc36 100644
--- a/drivers/acpi/utilities/utcopy.c
+++ b/drivers/acpi/utilities/utcopy.c
@@ -109,7 +109,7 @@ acpi_ut_copy_isimple_to_esimple(union acpi_operand_object *internal_object,
109{ 109{
110 acpi_status status = AE_OK; 110 acpi_status status = AE_OK;
111 111
112 ACPI_FUNCTION_TRACE("ut_copy_isimple_to_esimple"); 112 ACPI_FUNCTION_TRACE(ut_copy_isimple_to_esimple);
113 113
114 *buffer_space_used = 0; 114 *buffer_space_used = 0;
115 115
@@ -325,7 +325,7 @@ acpi_ut_copy_ipackage_to_epackage(union acpi_operand_object *internal_object,
325 acpi_status status; 325 acpi_status status;
326 struct acpi_pkg_info info; 326 struct acpi_pkg_info info;
327 327
328 ACPI_FUNCTION_TRACE("ut_copy_ipackage_to_epackage"); 328 ACPI_FUNCTION_TRACE(ut_copy_ipackage_to_epackage);
329 329
330 /* 330 /*
331 * First package at head of the buffer 331 * First package at head of the buffer
@@ -383,7 +383,7 @@ acpi_ut_copy_iobject_to_eobject(union acpi_operand_object *internal_object,
383{ 383{
384 acpi_status status; 384 acpi_status status;
385 385
386 ACPI_FUNCTION_TRACE("ut_copy_iobject_to_eobject"); 386 ACPI_FUNCTION_TRACE(ut_copy_iobject_to_eobject);
387 387
388 if (ACPI_GET_OBJECT_TYPE(internal_object) == ACPI_TYPE_PACKAGE) { 388 if (ACPI_GET_OBJECT_TYPE(internal_object) == ACPI_TYPE_PACKAGE) {
389 /* 389 /*
@@ -442,7 +442,7 @@ acpi_ut_copy_esimple_to_isimple(union acpi_object *external_object,
442{ 442{
443 union acpi_operand_object *internal_object; 443 union acpi_operand_object *internal_object;
444 444
445 ACPI_FUNCTION_TRACE("ut_copy_esimple_to_isimple"); 445 ACPI_FUNCTION_TRACE(ut_copy_esimple_to_isimple);
446 446
447 /* 447 /*
448 * Simple types supported are: String, Buffer, Integer 448 * Simple types supported are: String, Buffer, Integer
@@ -552,7 +552,7 @@ acpi_ut_copy_epackage_to_ipackage(union acpi_operand_object *internal_object,
552 union acpi_operand_object *this_internal_obj; 552 union acpi_operand_object *this_internal_obj;
553 union acpi_object *this_external_obj; 553 union acpi_object *this_external_obj;
554 554
555 ACPI_FUNCTION_TRACE("ut_copy_epackage_to_ipackage"); 555 ACPI_FUNCTION_TRACE(ut_copy_epackage_to_ipackage);
556 556
557 /* 557 /*
558 * First package at head of the buffer 558 * First package at head of the buffer
@@ -600,7 +600,7 @@ acpi_ut_copy_eobject_to_iobject(union acpi_object *external_object,
600{ 600{
601 acpi_status status; 601 acpi_status status;
602 602
603 ACPI_FUNCTION_TRACE("ut_copy_eobject_to_iobject"); 603 ACPI_FUNCTION_TRACE(ut_copy_eobject_to_iobject);
604 604
605 if (external_object->type == ACPI_TYPE_PACKAGE) { 605 if (external_object->type == ACPI_TYPE_PACKAGE) {
606 /* 606 /*
@@ -854,7 +854,7 @@ acpi_ut_copy_ipackage_to_ipackage(union acpi_operand_object *source_obj,
854{ 854{
855 acpi_status status = AE_OK; 855 acpi_status status = AE_OK;
856 856
857 ACPI_FUNCTION_TRACE("ut_copy_ipackage_to_ipackage"); 857 ACPI_FUNCTION_TRACE(ut_copy_ipackage_to_ipackage);
858 858
859 dest_obj->common.type = ACPI_GET_OBJECT_TYPE(source_obj); 859 dest_obj->common.type = ACPI_GET_OBJECT_TYPE(source_obj);
860 dest_obj->common.flags = source_obj->common.flags; 860 dest_obj->common.flags = source_obj->common.flags;
@@ -910,7 +910,7 @@ acpi_ut_copy_iobject_to_iobject(union acpi_operand_object *source_desc,
910{ 910{
911 acpi_status status = AE_OK; 911 acpi_status status = AE_OK;
912 912
913 ACPI_FUNCTION_TRACE("ut_copy_iobject_to_iobject"); 913 ACPI_FUNCTION_TRACE(ut_copy_iobject_to_iobject);
914 914
915 /* Create the top level object */ 915 /* Create the top level object */
916 916
diff --git a/drivers/acpi/utilities/utdelete.c b/drivers/acpi/utilities/utdelete.c
index b4e34a2f81f7..0bb4b59b2804 100644
--- a/drivers/acpi/utilities/utdelete.c
+++ b/drivers/acpi/utilities/utdelete.c
@@ -76,7 +76,7 @@ static void acpi_ut_delete_internal_obj(union acpi_operand_object *object)
76 union acpi_operand_object *second_desc; 76 union acpi_operand_object *second_desc;
77 union acpi_operand_object *next_desc; 77 union acpi_operand_object *next_desc;
78 78
79 ACPI_FUNCTION_TRACE_PTR("ut_delete_internal_obj", object); 79 ACPI_FUNCTION_TRACE_PTR(ut_delete_internal_obj, object);
80 80
81 if (!object) { 81 if (!object) {
82 return_VOID; 82 return_VOID;
@@ -276,7 +276,7 @@ void acpi_ut_delete_internal_object_list(union acpi_operand_object **obj_list)
276{ 276{
277 union acpi_operand_object **internal_obj; 277 union acpi_operand_object **internal_obj;
278 278
279 ACPI_FUNCTION_TRACE("ut_delete_internal_object_list"); 279 ACPI_FUNCTION_TRACE(ut_delete_internal_object_list);
280 280
281 /* Walk the null-terminated internal list */ 281 /* Walk the null-terminated internal list */
282 282
@@ -309,7 +309,7 @@ acpi_ut_update_ref_count(union acpi_operand_object *object, u32 action)
309 u16 count; 309 u16 count;
310 u16 new_count; 310 u16 new_count;
311 311
312 ACPI_FUNCTION_NAME("ut_update_ref_count"); 312 ACPI_FUNCTION_NAME(ut_update_ref_count);
313 313
314 if (!object) { 314 if (!object) {
315 return; 315 return;
@@ -425,7 +425,7 @@ acpi_ut_update_object_reference(union acpi_operand_object * object, u16 action)
425 union acpi_generic_state *state; 425 union acpi_generic_state *state;
426 acpi_native_uint i; 426 acpi_native_uint i;
427 427
428 ACPI_FUNCTION_TRACE_PTR("ut_update_object_reference", object); 428 ACPI_FUNCTION_TRACE_PTR(ut_update_object_reference, object);
429 429
430 while (object) { 430 while (object) {
431 431
@@ -570,7 +570,7 @@ acpi_ut_update_object_reference(union acpi_operand_object * object, u16 action)
570void acpi_ut_add_reference(union acpi_operand_object *object) 570void acpi_ut_add_reference(union acpi_operand_object *object)
571{ 571{
572 572
573 ACPI_FUNCTION_TRACE_PTR("ut_add_reference", object); 573 ACPI_FUNCTION_TRACE_PTR(ut_add_reference, object);
574 574
575 /* Ensure that we have a valid object */ 575 /* Ensure that we have a valid object */
576 576
@@ -603,7 +603,7 @@ void acpi_ut_add_reference(union acpi_operand_object *object)
603void acpi_ut_remove_reference(union acpi_operand_object *object) 603void acpi_ut_remove_reference(union acpi_operand_object *object)
604{ 604{
605 605
606 ACPI_FUNCTION_TRACE_PTR("ut_remove_reference", object); 606 ACPI_FUNCTION_TRACE_PTR(ut_remove_reference, object);
607 607
608 /* 608 /*
609 * Allow a NULL pointer to be passed in, just ignore it. This saves 609 * Allow a NULL pointer to be passed in, just ignore it. This saves
diff --git a/drivers/acpi/utilities/uteval.c b/drivers/acpi/utilities/uteval.c
index 68b9eff4b326..444d3a502c46 100644
--- a/drivers/acpi/utilities/uteval.c
+++ b/drivers/acpi/utilities/uteval.c
@@ -56,6 +56,34 @@ static acpi_status
56acpi_ut_translate_one_cid(union acpi_operand_object *obj_desc, 56acpi_ut_translate_one_cid(union acpi_operand_object *obj_desc,
57 struct acpi_compatible_id *one_cid); 57 struct acpi_compatible_id *one_cid);
58 58
59/*
60 * Strings supported by the _OSI predefined (internal) method.
61 */
62static const char *acpi_interfaces_supported[] = {
63 /* Operating System Vendor Strings */
64
65 "Linux",
66 "Windows 2000",
67 "Windows 2001",
68 "Windows 2001 SP0",
69 "Windows 2001 SP1",
70 "Windows 2001 SP2",
71 "Windows 2001 SP3",
72 "Windows 2001 SP4",
73 "Windows 2001.1",
74 "Windows 2001.1 SP1", /* Added 03/2006 */
75 "Windows 2006", /* Added 03/2006 */
76
77 /* Feature Group Strings */
78
79 "Extended Address Space Descriptor"
80 /*
81 * All "optional" feature group strings (features that are implemented
82 * by the host) should be implemented in the host version of
83 * acpi_os_validate_interface and should not be added here.
84 */
85};
86
59/******************************************************************************* 87/*******************************************************************************
60 * 88 *
61 * FUNCTION: acpi_ut_osi_implementation 89 * FUNCTION: acpi_ut_osi_implementation
@@ -64,18 +92,18 @@ acpi_ut_translate_one_cid(union acpi_operand_object *obj_desc,
64 * 92 *
65 * RETURN: Status 93 * RETURN: Status
66 * 94 *
67 * DESCRIPTION: Implementation of _OSI predefined control method 95 * DESCRIPTION: Implementation of the _OSI predefined control method
68 * Supported = _OSI (String)
69 * 96 *
70 ******************************************************************************/ 97 ******************************************************************************/
71 98
72acpi_status acpi_ut_osi_implementation(struct acpi_walk_state *walk_state) 99acpi_status acpi_ut_osi_implementation(struct acpi_walk_state *walk_state)
73{ 100{
101 acpi_status status;
74 union acpi_operand_object *string_desc; 102 union acpi_operand_object *string_desc;
75 union acpi_operand_object *return_desc; 103 union acpi_operand_object *return_desc;
76 acpi_native_uint i; 104 acpi_native_uint i;
77 105
78 ACPI_FUNCTION_TRACE("ut_osi_implementation"); 106 ACPI_FUNCTION_TRACE(ut_osi_implementation);
79 107
80 /* Validate the string input argument */ 108 /* Validate the string input argument */
81 109
@@ -84,29 +112,47 @@ acpi_status acpi_ut_osi_implementation(struct acpi_walk_state *walk_state)
84 return_ACPI_STATUS(AE_TYPE); 112 return_ACPI_STATUS(AE_TYPE);
85 } 113 }
86 114
87 /* Create a return object (Default value = 0) */ 115 /* Create a return object */
88 116
89 return_desc = acpi_ut_create_internal_object(ACPI_TYPE_INTEGER); 117 return_desc = acpi_ut_create_internal_object(ACPI_TYPE_INTEGER);
90 if (!return_desc) { 118 if (!return_desc) {
91 return_ACPI_STATUS(AE_NO_MEMORY); 119 return_ACPI_STATUS(AE_NO_MEMORY);
92 } 120 }
93 121
94 /* Compare input string to table of supported strings */ 122 /* Default return value is SUPPORTED */
95 123
96 for (i = 0; i < ACPI_NUM_OSI_STRINGS; i++) { 124 return_desc->integer.value = ACPI_UINT32_MAX;
97 if (!ACPI_STRCMP(string_desc->string.pointer, 125 walk_state->return_desc = return_desc;
98 ACPI_CAST_PTR(char, 126
99 acpi_gbl_valid_osi_strings[i]))) 127 /* Compare input string to static table of supported interfaces */
100 {
101 128
102 /* This string is supported */ 129 for (i = 0; i < ACPI_ARRAY_LENGTH(acpi_interfaces_supported); i++) {
130 if (!ACPI_STRCMP
131 (string_desc->string.pointer,
132 acpi_interfaces_supported[i])) {
103 133
104 return_desc->integer.value = 0xFFFFFFFF; 134 /* The interface is supported */
105 break; 135
136 return_ACPI_STATUS(AE_CTRL_TERMINATE);
106 } 137 }
107 } 138 }
108 139
109 walk_state->return_desc = return_desc; 140 /*
141 * Did not match the string in the static table, call the host OSL to
142 * check for a match with one of the optional strings (such as
143 * "Module Device", "3.0 Thermal Model", etc.)
144 */
145 status = acpi_os_validate_interface(string_desc->string.pointer);
146 if (ACPI_SUCCESS(status)) {
147
148 /* The interface is supported */
149
150 return_ACPI_STATUS(AE_CTRL_TERMINATE);
151 }
152
153 /* The interface is not supported */
154
155 return_desc->integer.value = 0;
110 return_ACPI_STATUS(AE_CTRL_TERMINATE); 156 return_ACPI_STATUS(AE_CTRL_TERMINATE);
111} 157}
112 158
@@ -139,7 +185,7 @@ acpi_ut_evaluate_object(struct acpi_namespace_node *prefix_node,
139 acpi_status status; 185 acpi_status status;
140 u32 return_btype; 186 u32 return_btype;
141 187
142 ACPI_FUNCTION_TRACE("ut_evaluate_object"); 188 ACPI_FUNCTION_TRACE(ut_evaluate_object);
143 189
144 info.node = prefix_node; 190 info.node = prefix_node;
145 info.parameters = NULL; 191 info.parameters = NULL;
@@ -258,7 +304,7 @@ acpi_ut_evaluate_numeric_object(char *object_name,
258 union acpi_operand_object *obj_desc; 304 union acpi_operand_object *obj_desc;
259 acpi_status status; 305 acpi_status status;
260 306
261 ACPI_FUNCTION_TRACE("ut_evaluate_numeric_object"); 307 ACPI_FUNCTION_TRACE(ut_evaluate_numeric_object);
262 308
263 status = acpi_ut_evaluate_object(device_node, object_name, 309 status = acpi_ut_evaluate_object(device_node, object_name,
264 ACPI_BTYPE_INTEGER, &obj_desc); 310 ACPI_BTYPE_INTEGER, &obj_desc);
@@ -334,7 +380,7 @@ acpi_ut_execute_HID(struct acpi_namespace_node *device_node,
334 union acpi_operand_object *obj_desc; 380 union acpi_operand_object *obj_desc;
335 acpi_status status; 381 acpi_status status;
336 382
337 ACPI_FUNCTION_TRACE("ut_execute_HID"); 383 ACPI_FUNCTION_TRACE(ut_execute_HID);
338 384
339 status = acpi_ut_evaluate_object(device_node, METHOD_NAME__HID, 385 status = acpi_ut_evaluate_object(device_node, METHOD_NAME__HID,
340 ACPI_BTYPE_INTEGER | ACPI_BTYPE_STRING, 386 ACPI_BTYPE_INTEGER | ACPI_BTYPE_STRING,
@@ -438,7 +484,7 @@ acpi_ut_execute_CID(struct acpi_namespace_node * device_node,
438 struct acpi_compatible_id_list *cid_list; 484 struct acpi_compatible_id_list *cid_list;
439 acpi_native_uint i; 485 acpi_native_uint i;
440 486
441 ACPI_FUNCTION_TRACE("ut_execute_CID"); 487 ACPI_FUNCTION_TRACE(ut_execute_CID);
442 488
443 /* Evaluate the _CID method for this device */ 489 /* Evaluate the _CID method for this device */
444 490
@@ -536,7 +582,7 @@ acpi_ut_execute_UID(struct acpi_namespace_node *device_node,
536 union acpi_operand_object *obj_desc; 582 union acpi_operand_object *obj_desc;
537 acpi_status status; 583 acpi_status status;
538 584
539 ACPI_FUNCTION_TRACE("ut_execute_UID"); 585 ACPI_FUNCTION_TRACE(ut_execute_UID);
540 586
541 status = acpi_ut_evaluate_object(device_node, METHOD_NAME__UID, 587 status = acpi_ut_evaluate_object(device_node, METHOD_NAME__UID,
542 ACPI_BTYPE_INTEGER | ACPI_BTYPE_STRING, 588 ACPI_BTYPE_INTEGER | ACPI_BTYPE_STRING,
@@ -586,7 +632,7 @@ acpi_ut_execute_STA(struct acpi_namespace_node *device_node, u32 * flags)
586 union acpi_operand_object *obj_desc; 632 union acpi_operand_object *obj_desc;
587 acpi_status status; 633 acpi_status status;
588 634
589 ACPI_FUNCTION_TRACE("ut_execute_STA"); 635 ACPI_FUNCTION_TRACE(ut_execute_STA);
590 636
591 status = acpi_ut_evaluate_object(device_node, METHOD_NAME__STA, 637 status = acpi_ut_evaluate_object(device_node, METHOD_NAME__STA,
592 ACPI_BTYPE_INTEGER, &obj_desc); 638 ACPI_BTYPE_INTEGER, &obj_desc);
@@ -636,7 +682,7 @@ acpi_ut_execute_sxds(struct acpi_namespace_node *device_node, u8 * highest)
636 acpi_status status; 682 acpi_status status;
637 u32 i; 683 u32 i;
638 684
639 ACPI_FUNCTION_TRACE("ut_execute_Sxds"); 685 ACPI_FUNCTION_TRACE(ut_execute_sxds);
640 686
641 for (i = 0; i < 4; i++) { 687 for (i = 0; i < 4; i++) {
642 highest[i] = 0xFF; 688 highest[i] = 0xFF;
diff --git a/drivers/acpi/utilities/utglobal.c b/drivers/acpi/utilities/utglobal.c
index e8ae417c9848..e666c71be0bf 100644
--- a/drivers/acpi/utilities/utglobal.c
+++ b/drivers/acpi/utilities/utglobal.c
@@ -181,30 +181,6 @@ const char *acpi_gbl_highest_dstate_names[4] = {
181 "_S4D" 181 "_S4D"
182}; 182};
183 183
184/*
185 * Strings supported by the _OSI predefined (internal) method.
186 * When adding strings, be sure to update ACPI_NUM_OSI_STRINGS.
187 */
188const char *acpi_gbl_valid_osi_strings[ACPI_NUM_OSI_STRINGS] = {
189 /* Operating System Vendor Strings */
190
191 "Linux",
192 "Windows 2000",
193 "Windows 2001",
194 "Windows 2001 SP0",
195 "Windows 2001 SP1",
196 "Windows 2001 SP2",
197 "Windows 2001 SP3",
198 "Windows 2001 SP4",
199 "Windows 2001.1",
200 "Windows 2001.1 SP1", /* Added 03/2006 */
201 "Windows 2006", /* Added 03/2006 */
202
203 /* Feature Group Strings */
204
205 "Extended Address Space Descriptor"
206};
207
208/******************************************************************************* 184/*******************************************************************************
209 * 185 *
210 * Namespace globals 186 * Namespace globals
@@ -317,9 +293,9 @@ char acpi_ut_hex_to_ascii_char(acpi_integer integer, u32 position)
317 * 293 *
318 ******************************************************************************/ 294 ******************************************************************************/
319 295
320struct acpi_table_list acpi_gbl_table_lists[NUM_ACPI_TABLE_TYPES]; 296struct acpi_table_list acpi_gbl_table_lists[ACPI_TABLE_ID_MAX + 1];
321 297
322struct acpi_table_support acpi_gbl_table_data[NUM_ACPI_TABLE_TYPES] = { 298struct acpi_table_support acpi_gbl_table_data[ACPI_TABLE_ID_MAX + 1] = {
323 /*********** Name, Signature, Global typed pointer Signature size, Type How many allowed?, Contains valid AML? */ 299 /*********** Name, Signature, Global typed pointer Signature size, Type How many allowed?, Contains valid AML? */
324 300
325 /* RSDP 0 */ {RSDP_NAME, RSDP_SIG, NULL, sizeof(RSDP_SIG) - 1, 301 /* RSDP 0 */ {RSDP_NAME, RSDP_SIG, NULL, sizeof(RSDP_SIG) - 1,
@@ -483,9 +459,9 @@ char *acpi_ut_get_region_name(u8 space_id)
483{ 459{
484 460
485 if (space_id >= ACPI_USER_REGION_BEGIN) { 461 if (space_id >= ACPI_USER_REGION_BEGIN) {
486 return ("user_defined_region"); 462 return ("UserDefinedRegion");
487 } else if (space_id >= ACPI_NUM_PREDEFINED_REGIONS) { 463 } else if (space_id >= ACPI_NUM_PREDEFINED_REGIONS) {
488 return ("invalid_space_id"); 464 return ("InvalidSpaceId");
489 } 465 }
490 466
491 return (ACPI_CAST_PTR(char, acpi_gbl_region_types[space_id])); 467 return (ACPI_CAST_PTR(char, acpi_gbl_region_types[space_id]));
@@ -519,7 +495,7 @@ char *acpi_ut_get_event_name(u32 event_id)
519{ 495{
520 496
521 if (event_id > ACPI_EVENT_MAX) { 497 if (event_id > ACPI_EVENT_MAX) {
522 return ("invalid_event_iD"); 498 return ("InvalidEventID");
523 } 499 }
524 500
525 return (ACPI_CAST_PTR(char, acpi_gbl_event_types[event_id])); 501 return (ACPI_CAST_PTR(char, acpi_gbl_event_types[event_id]));
@@ -774,7 +750,7 @@ void acpi_ut_init_globals(void)
774 acpi_status status; 750 acpi_status status;
775 u32 i; 751 u32 i;
776 752
777 ACPI_FUNCTION_TRACE("ut_init_globals"); 753 ACPI_FUNCTION_TRACE(ut_init_globals);
778 754
779 /* Create all memory caches */ 755 /* Create all memory caches */
780 756
@@ -785,7 +761,7 @@ void acpi_ut_init_globals(void)
785 761
786 /* ACPI table structure */ 762 /* ACPI table structure */
787 763
788 for (i = 0; i < NUM_ACPI_TABLE_TYPES; i++) { 764 for (i = 0; i < (ACPI_TABLE_ID_MAX + 1); i++) {
789 acpi_gbl_table_lists[i].next = NULL; 765 acpi_gbl_table_lists[i].next = NULL;
790 acpi_gbl_table_lists[i].count = 0; 766 acpi_gbl_table_lists[i].count = 0;
791 } 767 }
diff --git a/drivers/acpi/utilities/utinit.c b/drivers/acpi/utilities/utinit.c
index 7538b165b6e5..c65747d3c880 100644
--- a/drivers/acpi/utilities/utinit.c
+++ b/drivers/acpi/utilities/utinit.c
@@ -176,7 +176,7 @@ static void acpi_ut_terminate(void)
176 struct acpi_gpe_xrupt_info *gpe_xrupt_info; 176 struct acpi_gpe_xrupt_info *gpe_xrupt_info;
177 struct acpi_gpe_xrupt_info *next_gpe_xrupt_info; 177 struct acpi_gpe_xrupt_info *next_gpe_xrupt_info;
178 178
179 ACPI_FUNCTION_TRACE("ut_terminate"); 179 ACPI_FUNCTION_TRACE(ut_terminate);
180 180
181 /* Free global tables, etc. */ 181 /* Free global tables, etc. */
182 /* Free global GPE blocks and related info structures */ 182 /* Free global GPE blocks and related info structures */
@@ -216,7 +216,7 @@ static void acpi_ut_terminate(void)
216void acpi_ut_subsystem_shutdown(void) 216void acpi_ut_subsystem_shutdown(void)
217{ 217{
218 218
219 ACPI_FUNCTION_TRACE("ut_subsystem_shutdown"); 219 ACPI_FUNCTION_TRACE(ut_subsystem_shutdown);
220 220
221 /* Just exit if subsystem is already shutdown */ 221 /* Just exit if subsystem is already shutdown */
222 222
diff --git a/drivers/acpi/utilities/utmath.c b/drivers/acpi/utilities/utmath.c
index 4a3360484e72..19d74bedce27 100644
--- a/drivers/acpi/utilities/utmath.c
+++ b/drivers/acpi/utilities/utmath.c
@@ -77,7 +77,7 @@ acpi_ut_short_divide(acpi_integer dividend,
77 union uint64_overlay quotient; 77 union uint64_overlay quotient;
78 u32 remainder32; 78 u32 remainder32;
79 79
80 ACPI_FUNCTION_TRACE("ut_short_divide"); 80 ACPI_FUNCTION_TRACE(ut_short_divide);
81 81
82 /* Always check for a zero divisor */ 82 /* Always check for a zero divisor */
83 83
@@ -139,7 +139,7 @@ acpi_ut_divide(acpi_integer in_dividend,
139 union uint64_overlay partial2; 139 union uint64_overlay partial2;
140 union uint64_overlay partial3; 140 union uint64_overlay partial3;
141 141
142 ACPI_FUNCTION_TRACE("ut_divide"); 142 ACPI_FUNCTION_TRACE(ut_divide);
143 143
144 /* Always check for a zero divisor */ 144 /* Always check for a zero divisor */
145 145
@@ -261,7 +261,7 @@ acpi_ut_short_divide(acpi_integer in_dividend,
261 acpi_integer * out_quotient, u32 * out_remainder) 261 acpi_integer * out_quotient, u32 * out_remainder)
262{ 262{
263 263
264 ACPI_FUNCTION_TRACE("ut_short_divide"); 264 ACPI_FUNCTION_TRACE(ut_short_divide);
265 265
266 /* Always check for a zero divisor */ 266 /* Always check for a zero divisor */
267 267
@@ -287,7 +287,7 @@ acpi_ut_divide(acpi_integer in_dividend,
287 acpi_integer in_divisor, 287 acpi_integer in_divisor,
288 acpi_integer * out_quotient, acpi_integer * out_remainder) 288 acpi_integer * out_quotient, acpi_integer * out_remainder)
289{ 289{
290 ACPI_FUNCTION_TRACE("ut_divide"); 290 ACPI_FUNCTION_TRACE(ut_divide);
291 291
292 /* Always check for a zero divisor */ 292 /* Always check for a zero divisor */
293 293
diff --git a/drivers/acpi/utilities/utmisc.c b/drivers/acpi/utilities/utmisc.c
index 4623d7e215d3..874467117cec 100644
--- a/drivers/acpi/utilities/utmisc.c
+++ b/drivers/acpi/utilities/utmisc.c
@@ -95,7 +95,7 @@ acpi_status acpi_ut_allocate_owner_id(acpi_owner_id * owner_id)
95 acpi_native_uint k; 95 acpi_native_uint k;
96 acpi_status status; 96 acpi_status status;
97 97
98 ACPI_FUNCTION_TRACE("ut_allocate_owner_id"); 98 ACPI_FUNCTION_TRACE(ut_allocate_owner_id);
99 99
100 /* Guard against multiple allocations of ID to the same location */ 100 /* Guard against multiple allocations of ID to the same location */
101 101
@@ -152,7 +152,7 @@ acpi_status acpi_ut_allocate_owner_id(acpi_owner_id * owner_id)
152 (acpi_owner_id) ((k + 1) + ACPI_MUL_32(j)); 152 (acpi_owner_id) ((k + 1) + ACPI_MUL_32(j));
153 153
154 ACPI_DEBUG_PRINT((ACPI_DB_VALUES, 154 ACPI_DEBUG_PRINT((ACPI_DB_VALUES,
155 "Allocated owner_id: %2.2X\n", 155 "Allocated OwnerId: %2.2X\n",
156 (unsigned int)*owner_id)); 156 (unsigned int)*owner_id));
157 goto exit; 157 goto exit;
158 } 158 }
@@ -173,7 +173,7 @@ acpi_status acpi_ut_allocate_owner_id(acpi_owner_id * owner_id)
173 */ 173 */
174 status = AE_OWNER_ID_LIMIT; 174 status = AE_OWNER_ID_LIMIT;
175 ACPI_ERROR((AE_INFO, 175 ACPI_ERROR((AE_INFO,
176 "Could not allocate new owner_id (255 max), AE_OWNER_ID_LIMIT")); 176 "Could not allocate new OwnerId (255 max), AE_OWNER_ID_LIMIT"));
177 177
178 exit: 178 exit:
179 (void)acpi_ut_release_mutex(ACPI_MTX_CACHES); 179 (void)acpi_ut_release_mutex(ACPI_MTX_CACHES);
@@ -201,7 +201,7 @@ void acpi_ut_release_owner_id(acpi_owner_id * owner_id_ptr)
201 acpi_native_uint index; 201 acpi_native_uint index;
202 u32 bit; 202 u32 bit;
203 203
204 ACPI_FUNCTION_TRACE_U32("ut_release_owner_id", owner_id); 204 ACPI_FUNCTION_TRACE_U32(ut_release_owner_id, owner_id);
205 205
206 /* Always clear the input owner_id (zero is an invalid ID) */ 206 /* Always clear the input owner_id (zero is an invalid ID) */
207 207
@@ -210,7 +210,7 @@ void acpi_ut_release_owner_id(acpi_owner_id * owner_id_ptr)
210 /* Zero is not a valid owner_iD */ 210 /* Zero is not a valid owner_iD */
211 211
212 if (owner_id == 0) { 212 if (owner_id == 0) {
213 ACPI_ERROR((AE_INFO, "Invalid owner_id: %2.2X", owner_id)); 213 ACPI_ERROR((AE_INFO, "Invalid OwnerId: %2.2X", owner_id));
214 return_VOID; 214 return_VOID;
215 } 215 }
216 216
@@ -236,7 +236,7 @@ void acpi_ut_release_owner_id(acpi_owner_id * owner_id_ptr)
236 acpi_gbl_owner_id_mask[index] ^= bit; 236 acpi_gbl_owner_id_mask[index] ^= bit;
237 } else { 237 } else {
238 ACPI_ERROR((AE_INFO, 238 ACPI_ERROR((AE_INFO,
239 "Release of non-allocated owner_id: %2.2X", 239 "Release of non-allocated OwnerId: %2.2X",
240 owner_id + 1)); 240 owner_id + 1));
241 } 241 }
242 242
@@ -618,7 +618,7 @@ acpi_ut_strtoul64(char *string, u32 base, acpi_integer * ret_integer)
618 acpi_integer return_value = 0; 618 acpi_integer return_value = 0;
619 acpi_integer quotient; 619 acpi_integer quotient;
620 620
621 ACPI_FUNCTION_TRACE("ut_stroul64"); 621 ACPI_FUNCTION_TRACE(ut_stroul64);
622 622
623 if ((!string) || !(*string)) { 623 if ((!string) || !(*string)) {
624 goto error_exit; 624 goto error_exit;
@@ -794,7 +794,7 @@ acpi_ut_walk_package_tree(union acpi_operand_object * source_object,
794 u32 this_index; 794 u32 this_index;
795 union acpi_operand_object *this_source_obj; 795 union acpi_operand_object *this_source_obj;
796 796
797 ACPI_FUNCTION_TRACE("ut_walk_package_tree"); 797 ACPI_FUNCTION_TRACE(ut_walk_package_tree);
798 798
799 state = acpi_ut_create_pkg_state(source_object, target_object, 0); 799 state = acpi_ut_create_pkg_state(source_object, target_object, 0);
800 if (!state) { 800 if (!state) {
diff --git a/drivers/acpi/utilities/utmutex.c b/drivers/acpi/utilities/utmutex.c
index 0ac6700a45f8..b851f7be5d58 100644
--- a/drivers/acpi/utilities/utmutex.c
+++ b/drivers/acpi/utilities/utmutex.c
@@ -68,7 +68,7 @@ acpi_status acpi_ut_mutex_initialize(void)
68 u32 i; 68 u32 i;
69 acpi_status status; 69 acpi_status status;
70 70
71 ACPI_FUNCTION_TRACE("ut_mutex_initialize"); 71 ACPI_FUNCTION_TRACE(ut_mutex_initialize);
72 72
73 /* 73 /*
74 * Create each of the predefined mutex objects 74 * Create each of the predefined mutex objects
@@ -100,7 +100,7 @@ void acpi_ut_mutex_terminate(void)
100{ 100{
101 u32 i; 101 u32 i;
102 102
103 ACPI_FUNCTION_TRACE("ut_mutex_terminate"); 103 ACPI_FUNCTION_TRACE(ut_mutex_terminate);
104 104
105 /* 105 /*
106 * Delete each predefined mutex object 106 * Delete each predefined mutex object
@@ -129,7 +129,7 @@ static acpi_status acpi_ut_create_mutex(acpi_mutex_handle mutex_id)
129{ 129{
130 acpi_status status = AE_OK; 130 acpi_status status = AE_OK;
131 131
132 ACPI_FUNCTION_TRACE_U32("ut_create_mutex", mutex_id); 132 ACPI_FUNCTION_TRACE_U32(ut_create_mutex, mutex_id);
133 133
134 if (mutex_id > MAX_MUTEX) { 134 if (mutex_id > MAX_MUTEX) {
135 return_ACPI_STATUS(AE_BAD_PARAMETER); 135 return_ACPI_STATUS(AE_BAD_PARAMETER);
@@ -163,7 +163,7 @@ static acpi_status acpi_ut_delete_mutex(acpi_mutex_handle mutex_id)
163{ 163{
164 acpi_status status; 164 acpi_status status;
165 165
166 ACPI_FUNCTION_TRACE_U32("ut_delete_mutex", mutex_id); 166 ACPI_FUNCTION_TRACE_U32(ut_delete_mutex, mutex_id);
167 167
168 if (mutex_id > MAX_MUTEX) { 168 if (mutex_id > MAX_MUTEX) {
169 return_ACPI_STATUS(AE_BAD_PARAMETER); 169 return_ACPI_STATUS(AE_BAD_PARAMETER);
@@ -194,7 +194,7 @@ acpi_status acpi_ut_acquire_mutex(acpi_mutex_handle mutex_id)
194 acpi_status status; 194 acpi_status status;
195 acpi_thread_id this_thread_id; 195 acpi_thread_id this_thread_id;
196 196
197 ACPI_FUNCTION_NAME("ut_acquire_mutex"); 197 ACPI_FUNCTION_NAME(ut_acquire_mutex);
198 198
199 if (mutex_id > MAX_MUTEX) { 199 if (mutex_id > MAX_MUTEX) {
200 return (AE_BAD_PARAMETER); 200 return (AE_BAD_PARAMETER);
@@ -277,7 +277,7 @@ acpi_status acpi_ut_release_mutex(acpi_mutex_handle mutex_id)
277 acpi_status status; 277 acpi_status status;
278 acpi_thread_id this_thread_id; 278 acpi_thread_id this_thread_id;
279 279
280 ACPI_FUNCTION_NAME("ut_release_mutex"); 280 ACPI_FUNCTION_NAME(ut_release_mutex);
281 281
282 this_thread_id = acpi_os_get_thread_id(); 282 this_thread_id = acpi_os_get_thread_id();
283 ACPI_DEBUG_PRINT((ACPI_DB_MUTEX, 283 ACPI_DEBUG_PRINT((ACPI_DB_MUTEX,
diff --git a/drivers/acpi/utilities/utobject.c b/drivers/acpi/utilities/utobject.c
index 8e3dcbd23f5d..ba7d8ac702df 100644
--- a/drivers/acpi/utilities/utobject.c
+++ b/drivers/acpi/utilities/utobject.c
@@ -92,7 +92,7 @@ union acpi_operand_object *acpi_ut_create_internal_object_dbg(char *module_name,
92 union acpi_operand_object *object; 92 union acpi_operand_object *object;
93 union acpi_operand_object *second_object; 93 union acpi_operand_object *second_object;
94 94
95 ACPI_FUNCTION_TRACE_STR("ut_create_internal_object_dbg", 95 ACPI_FUNCTION_TRACE_STR(ut_create_internal_object_dbg,
96 acpi_ut_get_type_name(type)); 96 acpi_ut_get_type_name(type));
97 97
98 /* Allocate the raw object descriptor */ 98 /* Allocate the raw object descriptor */
@@ -161,7 +161,7 @@ union acpi_operand_object *acpi_ut_create_buffer_object(acpi_size buffer_size)
161 union acpi_operand_object *buffer_desc; 161 union acpi_operand_object *buffer_desc;
162 u8 *buffer = NULL; 162 u8 *buffer = NULL;
163 163
164 ACPI_FUNCTION_TRACE_U32("ut_create_buffer_object", buffer_size); 164 ACPI_FUNCTION_TRACE_U32(ut_create_buffer_object, buffer_size);
165 165
166 /* Create a new Buffer object */ 166 /* Create a new Buffer object */
167 167
@@ -215,7 +215,7 @@ union acpi_operand_object *acpi_ut_create_string_object(acpi_size string_size)
215 union acpi_operand_object *string_desc; 215 union acpi_operand_object *string_desc;
216 char *string; 216 char *string;
217 217
218 ACPI_FUNCTION_TRACE_U32("ut_create_string_object", string_size); 218 ACPI_FUNCTION_TRACE_U32(ut_create_string_object, string_size);
219 219
220 /* Create a new String object */ 220 /* Create a new String object */
221 221
@@ -261,7 +261,7 @@ union acpi_operand_object *acpi_ut_create_string_object(acpi_size string_size)
261u8 acpi_ut_valid_internal_object(void *object) 261u8 acpi_ut_valid_internal_object(void *object)
262{ 262{
263 263
264 ACPI_FUNCTION_NAME("ut_valid_internal_object"); 264 ACPI_FUNCTION_NAME(ut_valid_internal_object);
265 265
266 /* Check for a null pointer */ 266 /* Check for a null pointer */
267 267
@@ -309,7 +309,7 @@ void *acpi_ut_allocate_object_desc_dbg(char *module_name,
309{ 309{
310 union acpi_operand_object *object; 310 union acpi_operand_object *object;
311 311
312 ACPI_FUNCTION_TRACE("ut_allocate_object_desc_dbg"); 312 ACPI_FUNCTION_TRACE(ut_allocate_object_desc_dbg);
313 313
314 object = acpi_os_acquire_object(acpi_gbl_operand_cache); 314 object = acpi_os_acquire_object(acpi_gbl_operand_cache);
315 if (!object) { 315 if (!object) {
@@ -344,7 +344,7 @@ void *acpi_ut_allocate_object_desc_dbg(char *module_name,
344 344
345void acpi_ut_delete_object_desc(union acpi_operand_object *object) 345void acpi_ut_delete_object_desc(union acpi_operand_object *object)
346{ 346{
347 ACPI_FUNCTION_TRACE_PTR("ut_delete_object_desc", object); 347 ACPI_FUNCTION_TRACE_PTR(ut_delete_object_desc, object);
348 348
349 /* Object must be an union acpi_operand_object */ 349 /* Object must be an union acpi_operand_object */
350 350
@@ -383,7 +383,7 @@ acpi_ut_get_simple_object_size(union acpi_operand_object *internal_object,
383 acpi_size length; 383 acpi_size length;
384 acpi_status status = AE_OK; 384 acpi_status status = AE_OK;
385 385
386 ACPI_FUNCTION_TRACE_PTR("ut_get_simple_object_size", internal_object); 386 ACPI_FUNCTION_TRACE_PTR(ut_get_simple_object_size, internal_object);
387 387
388 /* 388 /*
389 * Handle a null object (Could be a uninitialized package 389 * Handle a null object (Could be a uninitialized package
@@ -562,7 +562,7 @@ acpi_ut_get_package_object_size(union acpi_operand_object *internal_object,
562 acpi_status status; 562 acpi_status status;
563 struct acpi_pkg_info info; 563 struct acpi_pkg_info info;
564 564
565 ACPI_FUNCTION_TRACE_PTR("ut_get_package_object_size", internal_object); 565 ACPI_FUNCTION_TRACE_PTR(ut_get_package_object_size, internal_object);
566 566
567 info.length = 0; 567 info.length = 0;
568 info.object_space = 0; 568 info.object_space = 0;
diff --git a/drivers/acpi/utilities/utresrc.c b/drivers/acpi/utilities/utresrc.c
index 1e680794c6df..5a2de92831d3 100644
--- a/drivers/acpi/utilities/utresrc.c
+++ b/drivers/acpi/utilities/utresrc.c
@@ -45,113 +45,113 @@
45#include <acpi/amlresrc.h> 45#include <acpi/amlresrc.h>
46 46
47#define _COMPONENT ACPI_UTILITIES 47#define _COMPONENT ACPI_UTILITIES
48ACPI_MODULE_NAME("utmisc") 48ACPI_MODULE_NAME("utresrc")
49 49
50#if defined(ACPI_DISASSEMBLER) || defined (ACPI_DEBUGGER) 50#if defined(ACPI_DISASSEMBLER) || defined (ACPI_DEBUGGER)
51/* 51/*
52 * Strings used to decode resource descriptors. 52 * Strings used to decode resource descriptors.
53 * Used by both the disasssembler and the debugger resource dump routines 53 * Used by both the disasssembler and the debugger resource dump routines
54 */ 54 */
55const char *acpi_gbl_BMdecode[2] = { 55const char *acpi_gbl_bm_decode[] = {
56 "not_bus_master", 56 "NotBusMaster",
57 "bus_master" 57 "BusMaster"
58}; 58};
59 59
60const char *acpi_gbl_config_decode[4] = { 60const char *acpi_gbl_config_decode[] = {
61 "0 - Good Configuration", 61 "0 - Good Configuration",
62 "1 - Acceptable Configuration", 62 "1 - Acceptable Configuration",
63 "2 - Suboptimal Configuration", 63 "2 - Suboptimal Configuration",
64 "3 - ***Invalid Configuration***", 64 "3 - ***Invalid Configuration***",
65}; 65};
66 66
67const char *acpi_gbl_consume_decode[2] = { 67const char *acpi_gbl_consume_decode[] = {
68 "resource_producer", 68 "ResourceProducer",
69 "resource_consumer" 69 "ResourceConsumer"
70}; 70};
71 71
72const char *acpi_gbl_DECdecode[2] = { 72const char *acpi_gbl_dec_decode[] = {
73 "pos_decode", 73 "PosDecode",
74 "sub_decode" 74 "SubDecode"
75}; 75};
76 76
77const char *acpi_gbl_HEdecode[2] = { 77const char *acpi_gbl_he_decode[] = {
78 "Level", 78 "Level",
79 "Edge" 79 "Edge"
80}; 80};
81 81
82const char *acpi_gbl_io_decode[2] = { 82const char *acpi_gbl_io_decode[] = {
83 "Decode10", 83 "Decode10",
84 "Decode16" 84 "Decode16"
85}; 85};
86 86
87const char *acpi_gbl_LLdecode[2] = { 87const char *acpi_gbl_ll_decode[] = {
88 "active_high", 88 "ActiveHigh",
89 "active_low" 89 "ActiveLow"
90}; 90};
91 91
92const char *acpi_gbl_max_decode[2] = { 92const char *acpi_gbl_max_decode[] = {
93 "max_not_fixed", 93 "MaxNotFixed",
94 "max_fixed" 94 "MaxFixed"
95}; 95};
96 96
97const char *acpi_gbl_MEMdecode[4] = { 97const char *acpi_gbl_mem_decode[] = {
98 "non_cacheable", 98 "NonCacheable",
99 "Cacheable", 99 "Cacheable",
100 "write_combining", 100 "WriteCombining",
101 "Prefetchable" 101 "Prefetchable"
102}; 102};
103 103
104const char *acpi_gbl_min_decode[2] = { 104const char *acpi_gbl_min_decode[] = {
105 "min_not_fixed", 105 "MinNotFixed",
106 "min_fixed" 106 "MinFixed"
107}; 107};
108 108
109const char *acpi_gbl_MTPdecode[4] = { 109const char *acpi_gbl_mtp_decode[] = {
110 "address_range_memory", 110 "AddressRangeMemory",
111 "address_range_reserved", 111 "AddressRangeReserved",
112 "address_range_aCPI", 112 "AddressRangeACPI",
113 "address_range_nVS" 113 "AddressRangeNVS"
114}; 114};
115 115
116const char *acpi_gbl_RNGdecode[4] = { 116const char *acpi_gbl_rng_decode[] = {
117 "invalid_ranges", 117 "InvalidRanges",
118 "non_iSAonly_ranges", 118 "NonISAOnlyRanges",
119 "ISAonly_ranges", 119 "ISAOnlyRanges",
120 "entire_range" 120 "EntireRange"
121}; 121};
122 122
123const char *acpi_gbl_RWdecode[2] = { 123const char *acpi_gbl_rw_decode[] = {
124 "read_only", 124 "ReadOnly",
125 "read_write" 125 "ReadWrite"
126}; 126};
127 127
128const char *acpi_gbl_SHRdecode[2] = { 128const char *acpi_gbl_shr_decode[] = {
129 "Exclusive", 129 "Exclusive",
130 "Shared" 130 "Shared"
131}; 131};
132 132
133const char *acpi_gbl_SIZdecode[4] = { 133const char *acpi_gbl_siz_decode[] = {
134 "Transfer8", 134 "Transfer8",
135 "Transfer8_16", 135 "Transfer8_16",
136 "Transfer16", 136 "Transfer16",
137 "invalid_size" 137 "InvalidSize"
138}; 138};
139 139
140const char *acpi_gbl_TRSdecode[2] = { 140const char *acpi_gbl_trs_decode[] = {
141 "dense_translation", 141 "DenseTranslation",
142 "sparse_translation" 142 "SparseTranslation"
143}; 143};
144 144
145const char *acpi_gbl_TTPdecode[2] = { 145const char *acpi_gbl_ttp_decode[] = {
146 "type_static", 146 "TypeStatic",
147 "type_translation" 147 "TypeTranslation"
148}; 148};
149 149
150const char *acpi_gbl_TYPdecode[4] = { 150const char *acpi_gbl_typ_decode[] = {
151 "Compatibility", 151 "Compatibility",
152 "type_a", 152 "TypeA",
153 "type_b", 153 "TypeB",
154 "type_f" 154 "TypeF"
155}; 155};
156 156
157#endif 157#endif
@@ -266,7 +266,7 @@ acpi_ut_walk_aml_resources(u8 * aml,
266 u32 length; 266 u32 length;
267 u32 offset = 0; 267 u32 offset = 0;
268 268
269 ACPI_FUNCTION_TRACE("ut_walk_aml_resources"); 269 ACPI_FUNCTION_TRACE(ut_walk_aml_resources);
270 270
271 /* The absolute minimum resource template is one end_tag descriptor */ 271 /* The absolute minimum resource template is one end_tag descriptor */
272 272
@@ -597,7 +597,7 @@ acpi_ut_get_resource_end_tag(union acpi_operand_object * obj_desc,
597{ 597{
598 acpi_status status; 598 acpi_status status;
599 599
600 ACPI_FUNCTION_TRACE("ut_get_resource_end_tag"); 600 ACPI_FUNCTION_TRACE(ut_get_resource_end_tag);
601 601
602 /* Allow a buffer length of zero */ 602 /* Allow a buffer length of zero */
603 603
diff --git a/drivers/acpi/utilities/utstate.c b/drivers/acpi/utilities/utstate.c
index aec5034cd978..0f5c5bb5deff 100644
--- a/drivers/acpi/utilities/utstate.c
+++ b/drivers/acpi/utilities/utstate.c
@@ -96,7 +96,7 @@ void
96acpi_ut_push_generic_state(union acpi_generic_state **list_head, 96acpi_ut_push_generic_state(union acpi_generic_state **list_head,
97 union acpi_generic_state *state) 97 union acpi_generic_state *state)
98{ 98{
99 ACPI_FUNCTION_TRACE("ut_push_generic_state"); 99 ACPI_FUNCTION_TRACE(ut_push_generic_state);
100 100
101 /* Push the state object onto the front of the list (stack) */ 101 /* Push the state object onto the front of the list (stack) */
102 102
@@ -123,7 +123,7 @@ union acpi_generic_state *acpi_ut_pop_generic_state(union acpi_generic_state
123{ 123{
124 union acpi_generic_state *state; 124 union acpi_generic_state *state;
125 125
126 ACPI_FUNCTION_TRACE("ut_pop_generic_state"); 126 ACPI_FUNCTION_TRACE(ut_pop_generic_state);
127 127
128 /* Remove the state object at the head of the list (stack) */ 128 /* Remove the state object at the head of the list (stack) */
129 129
@@ -185,7 +185,7 @@ struct acpi_thread_state *acpi_ut_create_thread_state(void)
185{ 185{
186 union acpi_generic_state *state; 186 union acpi_generic_state *state;
187 187
188 ACPI_FUNCTION_TRACE("ut_create_thread_state"); 188 ACPI_FUNCTION_TRACE(ut_create_thread_state);
189 189
190 /* Create the generic state object */ 190 /* Create the generic state object */
191 191
@@ -222,7 +222,7 @@ union acpi_generic_state *acpi_ut_create_update_state(union acpi_operand_object
222{ 222{
223 union acpi_generic_state *state; 223 union acpi_generic_state *state;
224 224
225 ACPI_FUNCTION_TRACE_PTR("ut_create_update_state", object); 225 ACPI_FUNCTION_TRACE_PTR(ut_create_update_state, object);
226 226
227 /* Create the generic state object */ 227 /* Create the generic state object */
228 228
@@ -259,7 +259,7 @@ union acpi_generic_state *acpi_ut_create_pkg_state(void *internal_object,
259{ 259{
260 union acpi_generic_state *state; 260 union acpi_generic_state *state;
261 261
262 ACPI_FUNCTION_TRACE_PTR("ut_create_pkg_state", internal_object); 262 ACPI_FUNCTION_TRACE_PTR(ut_create_pkg_state, internal_object);
263 263
264 /* Create the generic state object */ 264 /* Create the generic state object */
265 265
@@ -296,7 +296,7 @@ union acpi_generic_state *acpi_ut_create_control_state(void)
296{ 296{
297 union acpi_generic_state *state; 297 union acpi_generic_state *state;
298 298
299 ACPI_FUNCTION_TRACE("ut_create_control_state"); 299 ACPI_FUNCTION_TRACE(ut_create_control_state);
300 300
301 /* Create the generic state object */ 301 /* Create the generic state object */
302 302
@@ -328,7 +328,7 @@ union acpi_generic_state *acpi_ut_create_control_state(void)
328 328
329void acpi_ut_delete_generic_state(union acpi_generic_state *state) 329void acpi_ut_delete_generic_state(union acpi_generic_state *state)
330{ 330{
331 ACPI_FUNCTION_TRACE("ut_delete_generic_state"); 331 ACPI_FUNCTION_TRACE(ut_delete_generic_state);
332 332
333 /* Ignore null state */ 333 /* Ignore null state */
334 334
diff --git a/drivers/acpi/utilities/utxface.c b/drivers/acpi/utilities/utxface.c
index ac90048a8a5b..3538f69c82a1 100644
--- a/drivers/acpi/utilities/utxface.c
+++ b/drivers/acpi/utilities/utxface.c
@@ -65,7 +65,7 @@ acpi_status acpi_initialize_subsystem(void)
65{ 65{
66 acpi_status status; 66 acpi_status status;
67 67
68 ACPI_FUNCTION_TRACE("acpi_initialize_subsystem"); 68 ACPI_FUNCTION_TRACE(acpi_initialize_subsystem);
69 69
70 ACPI_DEBUG_EXEC(acpi_ut_init_stack_ptr_trace()); 70 ACPI_DEBUG_EXEC(acpi_ut_init_stack_ptr_trace());
71 71
@@ -125,7 +125,7 @@ acpi_status acpi_enable_subsystem(u32 flags)
125{ 125{
126 acpi_status status = AE_OK; 126 acpi_status status = AE_OK;
127 127
128 ACPI_FUNCTION_TRACE("acpi_enable_subsystem"); 128 ACPI_FUNCTION_TRACE(acpi_enable_subsystem);
129 129
130 /* 130 /*
131 * We must initialize the hardware before we can enable ACPI. 131 * We must initialize the hardware before we can enable ACPI.
@@ -151,7 +151,7 @@ acpi_status acpi_enable_subsystem(u32 flags)
151 151
152 status = acpi_enable(); 152 status = acpi_enable();
153 if (ACPI_FAILURE(status)) { 153 if (ACPI_FAILURE(status)) {
154 ACPI_WARNING((AE_INFO, "acpi_enable failed")); 154 ACPI_WARNING((AE_INFO, "AcpiEnable failed"));
155 return_ACPI_STATUS(status); 155 return_ACPI_STATUS(status);
156 } 156 }
157 } 157 }
@@ -246,7 +246,7 @@ acpi_status acpi_initialize_objects(u32 flags)
246{ 246{
247 acpi_status status = AE_OK; 247 acpi_status status = AE_OK;
248 248
249 ACPI_FUNCTION_TRACE("acpi_initialize_objects"); 249 ACPI_FUNCTION_TRACE(acpi_initialize_objects);
250 250
251 /* 251 /*
252 * Run all _REG methods 252 * Run all _REG methods
@@ -257,7 +257,7 @@ acpi_status acpi_initialize_objects(u32 flags)
257 */ 257 */
258 if (!(flags & ACPI_NO_ADDRESS_SPACE_INIT)) { 258 if (!(flags & ACPI_NO_ADDRESS_SPACE_INIT)) {
259 ACPI_DEBUG_PRINT((ACPI_DB_EXEC, 259 ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
260 "[Init] Executing _REG op_region methods\n")); 260 "[Init] Executing _REG OpRegion methods\n"));
261 261
262 status = acpi_ev_initialize_op_regions(); 262 status = acpi_ev_initialize_op_regions();
263 if (ACPI_FAILURE(status)) { 263 if (ACPI_FAILURE(status)) {
@@ -322,7 +322,7 @@ acpi_status acpi_terminate(void)
322{ 322{
323 acpi_status status; 323 acpi_status status;
324 324
325 ACPI_FUNCTION_TRACE("acpi_terminate"); 325 ACPI_FUNCTION_TRACE(acpi_terminate);
326 326
327 /* Terminate the AML Debugger if present */ 327 /* Terminate the AML Debugger if present */
328 328
@@ -400,7 +400,7 @@ acpi_status acpi_get_system_info(struct acpi_buffer * out_buffer)
400 acpi_status status; 400 acpi_status status;
401 u32 i; 401 u32 i;
402 402
403 ACPI_FUNCTION_TRACE("acpi_get_system_info"); 403 ACPI_FUNCTION_TRACE(acpi_get_system_info);
404 404
405 /* Parameter validation */ 405 /* Parameter validation */
406 406
@@ -451,8 +451,8 @@ acpi_status acpi_get_system_info(struct acpi_buffer * out_buffer)
451 451
452 /* Current status of the ACPI tables, per table type */ 452 /* Current status of the ACPI tables, per table type */
453 453
454 info_ptr->num_table_types = NUM_ACPI_TABLE_TYPES; 454 info_ptr->num_table_types = ACPI_TABLE_ID_MAX + 1;
455 for (i = 0; i < NUM_ACPI_TABLE_TYPES; i++) { 455 for (i = 0; i < (ACPI_TABLE_ID_MAX + 1); i++) {
456 info_ptr->table_info[i].count = acpi_gbl_table_lists[i].count; 456 info_ptr->table_info[i].count = acpi_gbl_table_lists[i].count;
457 } 457 }
458 458
@@ -507,7 +507,7 @@ ACPI_EXPORT_SYMBOL(acpi_install_initialization_handler)
507 ****************************************************************************/ 507 ****************************************************************************/
508acpi_status acpi_purge_cached_objects(void) 508acpi_status acpi_purge_cached_objects(void)
509{ 509{
510 ACPI_FUNCTION_TRACE("acpi_purge_cached_objects"); 510 ACPI_FUNCTION_TRACE(acpi_purge_cached_objects);
511 511
512 (void)acpi_os_purge_cache(acpi_gbl_state_cache); 512 (void)acpi_os_purge_cache(acpi_gbl_state_cache);
513 (void)acpi_os_purge_cache(acpi_gbl_operand_cache); 513 (void)acpi_os_purge_cache(acpi_gbl_operand_cache);