git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
drivers
/
acpi
/
namespace
/
nswalk.c
diff --git
a/drivers/acpi/namespace/nswalk.c
b/drivers/acpi/namespace/nswalk.c
index
c8f6bef
..
fcab1e7
100644
(file)
--- a/
drivers/acpi/namespace/nswalk.c
+++ b/
drivers/acpi/namespace/nswalk.c
@@
-76,7
+76,6
@@
struct acpi_namespace_node *acpi_ns_get_next_node(acpi_object_type type,
ACPI_FUNCTION_ENTRY();
if (!child_node) {
ACPI_FUNCTION_ENTRY();
if (!child_node) {
-
/* It's really the parent's _scope_ that we want */
if (parent_node->child) {
/* It's really the parent's _scope_ that we want */
if (parent_node->child) {
@@
-93,7
+92,6
@@
struct acpi_namespace_node *acpi_ns_get_next_node(acpi_object_type type,
/* If any type is OK, we are done */
if (type == ACPI_TYPE_ANY) {
/* If any type is OK, we are done */
if (type == ACPI_TYPE_ANY) {
-
/* next_node is NULL if we are at the end-of-list */
return (next_node);
/* next_node is NULL if we are at the end-of-list */
return (next_node);
@@
-102,7
+100,6
@@
struct acpi_namespace_node *acpi_ns_get_next_node(acpi_object_type type,
/* Must search for the node -- but within this scope only */
while (next_node) {
/* Must search for the node -- but within this scope only */
while (next_node) {
-
/* If type matches, we are done */
if (next_node->type == type) {
/* If type matches, we are done */
if (next_node->type == type) {
@@
-164,7
+161,7
@@
acpi_ns_walk_namespace(acpi_object_type type,
acpi_object_type child_type;
u32 level;
acpi_object_type child_type;
u32 level;
- ACPI_FUNCTION_TRACE(
ns_walk_namespace
);
+ ACPI_FUNCTION_TRACE(
"ns_walk_namespace"
);
/* Special case for the namespace Root Node */
/* Special case for the namespace Root Node */
@@
-185,7
+182,6
@@
acpi_ns_walk_namespace(acpi_object_type type,
* bubbled up to (and passed) the original parent handle (start_entry)
*/
while (level > 0) {
* bubbled up to (and passed) the original parent handle (start_entry)
*/
while (level > 0) {
-
/* Get the next node in this scope. Null if not found */
status = AE_OK;
/* Get the next node in this scope. Null if not found */
status = AE_OK;