git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull sony into release branch
[pandora-kernel.git]
/
drivers
/
acpi
/
dispatcher
/
dswscope.c
diff --git
a/drivers/acpi/dispatcher/dswscope.c
b/drivers/acpi/dispatcher/dswscope.c
index
defe956
..
3927c49
100644
(file)
--- a/
drivers/acpi/dispatcher/dswscope.c
+++ b/
drivers/acpi/dispatcher/dswscope.c
@@
-5,7
+5,7
@@
*****************************************************************************/
/*
*****************************************************************************/
/*
- * Copyright (C) 2000 - 200
5
, R. Byron Moore
+ * Copyright (C) 2000 - 200
7
, R. Byron Moore
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@
-63,9
+63,10
@@
void acpi_ds_scope_stack_clear(struct acpi_walk_state *walk_state)
{
union acpi_generic_state *scope_info;
{
union acpi_generic_state *scope_info;
- ACPI_FUNCTION_NAME(
"ds_scope_stack_clear"
);
+ ACPI_FUNCTION_NAME(
ds_scope_stack_clear
);
while (walk_state->scope_info) {
while (walk_state->scope_info) {
+
/* Pop a scope off the stack */
scope_info = walk_state->scope_info;
/* Pop a scope off the stack */
scope_info = walk_state->scope_info;
@@
-102,19
+103,20
@@
acpi_ds_scope_stack_push(struct acpi_namespace_node *node,
union acpi_generic_state *scope_info;
union acpi_generic_state *old_scope_info;
union acpi_generic_state *scope_info;
union acpi_generic_state *old_scope_info;
- ACPI_FUNCTION_TRACE(
"ds_scope_stack_push"
);
+ ACPI_FUNCTION_TRACE(
ds_scope_stack_push
);
if (!node) {
if (!node) {
+
/* Invalid scope */
/* Invalid scope */
- ACPI_
REPORT_ERROR(("ds_scope_stack_push: null scope passed\n
"));
+ ACPI_
ERROR((AE_INFO, "Null scope parameter
"));
return_ACPI_STATUS(AE_BAD_PARAMETER);
}
/* Make sure object type is valid */
if (!acpi_ut_valid_object_type(type)) {
return_ACPI_STATUS(AE_BAD_PARAMETER);
}
/* Make sure object type is valid */
if (!acpi_ut_valid_object_type(type)) {
- ACPI_
REPORT_WARNING(("ds_scope_stack_push: Invalid object type: 0x%X\n
", type));
+ ACPI_
WARNING((AE_INFO, "Invalid object type: 0x%X
", type));
}
/* Allocate a new scope object */
}
/* Allocate a new scope object */
@@
-126,7
+128,7
@@
acpi_ds_scope_stack_push(struct acpi_namespace_node *node,
/* Init new scope object */
/* Init new scope object */
- scope_info->common.d
ata
_type = ACPI_DESC_TYPE_STATE_WSCOPE;
+ scope_info->common.d
escriptor
_type = ACPI_DESC_TYPE_STATE_WSCOPE;
scope_info->scope.node = node;
scope_info->common.value = (u16) type;
scope_info->scope.node = node;
scope_info->common.value = (u16) type;
@@
-176,7
+178,7
@@
acpi_status acpi_ds_scope_stack_pop(struct acpi_walk_state *walk_state)
union acpi_generic_state *scope_info;
union acpi_generic_state *new_scope_info;
union acpi_generic_state *scope_info;
union acpi_generic_state *new_scope_info;
- ACPI_FUNCTION_TRACE(
"ds_scope_stack_pop"
);
+ ACPI_FUNCTION_TRACE(
ds_scope_stack_pop
);
/*
* Pop scope info object off the stack.
/*
* Pop scope info object off the stack.