diff options
Diffstat (limited to 'drivers/acpi/namespace')
-rw-r--r-- | drivers/acpi/namespace/nsaccess.c | 2 | ||||
-rw-r--r-- | drivers/acpi/namespace/nsalloc.c | 5 | ||||
-rw-r--r-- | drivers/acpi/namespace/nsdump.c | 8 | ||||
-rw-r--r-- | drivers/acpi/namespace/nsparse.c | 2 |
4 files changed, 9 insertions, 8 deletions
diff --git a/drivers/acpi/namespace/nsaccess.c b/drivers/acpi/namespace/nsaccess.c index 9df0a64ba9e9..0bda88d18685 100644 --- a/drivers/acpi/namespace/nsaccess.c +++ b/drivers/acpi/namespace/nsaccess.c | |||
@@ -163,7 +163,7 @@ acpi_ns_root_initialize ( | |||
163 | 163 | ||
164 | /* | 164 | /* |
165 | * i_aSL Compiler cheats by putting parameter count | 165 | * i_aSL Compiler cheats by putting parameter count |
166 | * in the owner_iD | 166 | * in the owner_iD (param_count max is 7) |
167 | */ | 167 | */ |
168 | new_node->owner_id = obj_desc->method.param_count; | 168 | new_node->owner_id = obj_desc->method.param_count; |
169 | #else | 169 | #else |
diff --git a/drivers/acpi/namespace/nsalloc.c b/drivers/acpi/namespace/nsalloc.c index 3f94b0806ecf..edbf1db36b68 100644 --- a/drivers/acpi/namespace/nsalloc.c +++ b/drivers/acpi/namespace/nsalloc.c | |||
@@ -190,7 +190,7 @@ acpi_ns_install_node ( | |||
190 | struct acpi_namespace_node *node, /* New Child*/ | 190 | struct acpi_namespace_node *node, /* New Child*/ |
191 | acpi_object_type type) | 191 | acpi_object_type type) |
192 | { | 192 | { |
193 | u16 owner_id = 0; | 193 | acpi_owner_id owner_id = 0; |
194 | struct acpi_namespace_node *child_node; | 194 | struct acpi_namespace_node *child_node; |
195 | #ifdef ACPI_ALPHABETIC_NAMESPACE | 195 | #ifdef ACPI_ALPHABETIC_NAMESPACE |
196 | 196 | ||
@@ -559,7 +559,7 @@ acpi_ns_remove_reference ( | |||
559 | 559 | ||
560 | void | 560 | void |
561 | acpi_ns_delete_namespace_by_owner ( | 561 | acpi_ns_delete_namespace_by_owner ( |
562 | u16 owner_id) | 562 | acpi_owner_id owner_id) |
563 | { | 563 | { |
564 | struct acpi_namespace_node *child_node; | 564 | struct acpi_namespace_node *child_node; |
565 | struct acpi_namespace_node *deletion_node; | 565 | struct acpi_namespace_node *deletion_node; |
@@ -635,6 +635,7 @@ acpi_ns_delete_namespace_by_owner ( | |||
635 | } | 635 | } |
636 | } | 636 | } |
637 | 637 | ||
638 | (void) acpi_ut_release_owner_id (owner_id); | ||
638 | return_VOID; | 639 | return_VOID; |
639 | } | 640 | } |
640 | 641 | ||
diff --git a/drivers/acpi/namespace/nsdump.c b/drivers/acpi/namespace/nsdump.c index c9f35dd7a431..d86ccbc8a134 100644 --- a/drivers/acpi/namespace/nsdump.c +++ b/drivers/acpi/namespace/nsdump.c | |||
@@ -203,7 +203,7 @@ acpi_ns_dump_one_object ( | |||
203 | 203 | ||
204 | /* Check if the owner matches */ | 204 | /* Check if the owner matches */ |
205 | 205 | ||
206 | if ((info->owner_id != ACPI_UINT32_MAX) && | 206 | if ((info->owner_id != ACPI_OWNER_ID_MAX) && |
207 | (info->owner_id != this_node->owner_id)) { | 207 | (info->owner_id != this_node->owner_id)) { |
208 | return (AE_OK); | 208 | return (AE_OK); |
209 | } | 209 | } |
@@ -598,7 +598,7 @@ acpi_ns_dump_objects ( | |||
598 | acpi_object_type type, | 598 | acpi_object_type type, |
599 | u8 display_type, | 599 | u8 display_type, |
600 | u32 max_depth, | 600 | u32 max_depth, |
601 | u32 owner_id, | 601 | acpi_owner_id owner_id, |
602 | acpi_handle start_handle) | 602 | acpi_handle start_handle) |
603 | { | 603 | { |
604 | struct acpi_walk_info info; | 604 | struct acpi_walk_info info; |
@@ -643,7 +643,7 @@ acpi_ns_dump_entry ( | |||
643 | 643 | ||
644 | 644 | ||
645 | info.debug_level = debug_level; | 645 | info.debug_level = debug_level; |
646 | info.owner_id = ACPI_UINT32_MAX; | 646 | info.owner_id = ACPI_OWNER_ID_MAX; |
647 | info.display_type = ACPI_DISPLAY_SUMMARY; | 647 | info.display_type = ACPI_DISPLAY_SUMMARY; |
648 | 648 | ||
649 | (void) acpi_ns_dump_one_object (handle, 1, &info, NULL); | 649 | (void) acpi_ns_dump_one_object (handle, 1, &info, NULL); |
@@ -694,7 +694,7 @@ acpi_ns_dump_tables ( | |||
694 | } | 694 | } |
695 | 695 | ||
696 | acpi_ns_dump_objects (ACPI_TYPE_ANY, ACPI_DISPLAY_OBJECTS, max_depth, | 696 | acpi_ns_dump_objects (ACPI_TYPE_ANY, ACPI_DISPLAY_OBJECTS, max_depth, |
697 | ACPI_UINT32_MAX, search_handle); | 697 | ACPI_OWNER_ID_MAX, search_handle); |
698 | return_VOID; | 698 | return_VOID; |
699 | } | 699 | } |
700 | #endif /* _ACPI_ASL_COMPILER */ | 700 | #endif /* _ACPI_ASL_COMPILER */ |
diff --git a/drivers/acpi/namespace/nsparse.c b/drivers/acpi/namespace/nsparse.c index f81b836e77f1..64e0b2b9f55c 100644 --- a/drivers/acpi/namespace/nsparse.c +++ b/drivers/acpi/namespace/nsparse.c | |||
@@ -87,7 +87,7 @@ acpi_ns_one_complete_parse ( | |||
87 | 87 | ||
88 | /* Create and initialize a new walk state */ | 88 | /* Create and initialize a new walk state */ |
89 | 89 | ||
90 | walk_state = acpi_ds_create_walk_state (table_desc->table_id, | 90 | walk_state = acpi_ds_create_walk_state (table_desc->owner_id, |
91 | NULL, NULL, NULL); | 91 | NULL, NULL, NULL); |
92 | if (!walk_state) { | 92 | if (!walk_state) { |
93 | acpi_ps_free_op (parse_root); | 93 | acpi_ps_free_op (parse_root); |