diff options
Diffstat (limited to 'drivers/acpi/namespace/nsdumpdv.c')
-rw-r--r-- | drivers/acpi/namespace/nsdumpdv.c | 74 |
1 files changed, 29 insertions, 45 deletions
diff --git a/drivers/acpi/namespace/nsdumpdv.c b/drivers/acpi/namespace/nsdumpdv.c index 27c4f7cd2a43..55de883943d6 100644 --- a/drivers/acpi/namespace/nsdumpdv.c +++ b/drivers/acpi/namespace/nsdumpdv.c | |||
@@ -41,20 +41,15 @@ | |||
41 | * POSSIBILITY OF SUCH DAMAGES. | 41 | * POSSIBILITY OF SUCH DAMAGES. |
42 | */ | 42 | */ |
43 | 43 | ||
44 | |||
45 | #include <acpi/acpi.h> | 44 | #include <acpi/acpi.h> |
46 | 45 | ||
47 | |||
48 | /* TBD: This entire module is apparently obsolete and should be removed */ | 46 | /* TBD: This entire module is apparently obsolete and should be removed */ |
49 | 47 | ||
50 | #define _COMPONENT ACPI_NAMESPACE | 48 | #define _COMPONENT ACPI_NAMESPACE |
51 | ACPI_MODULE_NAME ("nsdumpdv") | 49 | ACPI_MODULE_NAME("nsdumpdv") |
52 | |||
53 | #ifdef ACPI_OBSOLETE_FUNCTIONS | 50 | #ifdef ACPI_OBSOLETE_FUNCTIONS |
54 | #if defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DEBUGGER) | 51 | #if defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DEBUGGER) |
55 | |||
56 | #include <acpi/acnamesp.h> | 52 | #include <acpi/acnamesp.h> |
57 | |||
58 | /******************************************************************************* | 53 | /******************************************************************************* |
59 | * | 54 | * |
60 | * FUNCTION: acpi_ns_dump_one_device | 55 | * FUNCTION: acpi_ns_dump_one_device |
@@ -70,44 +65,39 @@ | |||
70 | * This procedure is a user_function called by acpi_ns_walk_namespace. | 65 | * This procedure is a user_function called by acpi_ns_walk_namespace. |
71 | * | 66 | * |
72 | ******************************************************************************/ | 67 | ******************************************************************************/ |
73 | |||
74 | static acpi_status | 68 | static acpi_status |
75 | acpi_ns_dump_one_device ( | 69 | acpi_ns_dump_one_device(acpi_handle obj_handle, |
76 | acpi_handle obj_handle, | 70 | u32 level, void *context, void **return_value) |
77 | u32 level, | ||
78 | void *context, | ||
79 | void **return_value) | ||
80 | { | 71 | { |
81 | struct acpi_buffer buffer; | 72 | struct acpi_buffer buffer; |
82 | struct acpi_device_info *info; | 73 | struct acpi_device_info *info; |
83 | acpi_status status; | 74 | acpi_status status; |
84 | u32 i; | 75 | u32 i; |
85 | |||
86 | 76 | ||
87 | ACPI_FUNCTION_NAME ("ns_dump_one_device"); | 77 | ACPI_FUNCTION_NAME("ns_dump_one_device"); |
88 | 78 | ||
89 | 79 | status = | |
90 | status = acpi_ns_dump_one_object (obj_handle, level, context, return_value); | 80 | acpi_ns_dump_one_object(obj_handle, level, context, return_value); |
91 | 81 | ||
92 | buffer.length = ACPI_ALLOCATE_LOCAL_BUFFER; | 82 | buffer.length = ACPI_ALLOCATE_LOCAL_BUFFER; |
93 | status = acpi_get_object_info (obj_handle, &buffer); | 83 | status = acpi_get_object_info(obj_handle, &buffer); |
94 | if (ACPI_SUCCESS (status)) { | 84 | if (ACPI_SUCCESS(status)) { |
95 | info = buffer.pointer; | 85 | info = buffer.pointer; |
96 | for (i = 0; i < level; i++) { | 86 | for (i = 0; i < level; i++) { |
97 | ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, " ")); | 87 | ACPI_DEBUG_PRINT_RAW((ACPI_DB_TABLES, " ")); |
98 | } | 88 | } |
99 | 89 | ||
100 | ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, | 90 | ACPI_DEBUG_PRINT_RAW((ACPI_DB_TABLES, |
101 | " HID: %s, ADR: %8.8X%8.8X, Status: %X\n", | 91 | " HID: %s, ADR: %8.8X%8.8X, Status: %X\n", |
102 | info->hardware_id.value, ACPI_FORMAT_UINT64 (info->address), | 92 | info->hardware_id.value, |
103 | info->current_status)); | 93 | ACPI_FORMAT_UINT64(info->address), |
104 | ACPI_MEM_FREE (info); | 94 | info->current_status)); |
95 | ACPI_MEM_FREE(info); | ||
105 | } | 96 | } |
106 | 97 | ||
107 | return (status); | 98 | return (status); |
108 | } | 99 | } |
109 | 100 | ||
110 | |||
111 | /******************************************************************************* | 101 | /******************************************************************************* |
112 | * | 102 | * |
113 | * FUNCTION: acpi_ns_dump_root_devices | 103 | * FUNCTION: acpi_ns_dump_root_devices |
@@ -120,16 +110,12 @@ acpi_ns_dump_one_device ( | |||
120 | * | 110 | * |
121 | ******************************************************************************/ | 111 | ******************************************************************************/ |
122 | 112 | ||
123 | void | 113 | void acpi_ns_dump_root_devices(void) |
124 | acpi_ns_dump_root_devices ( | ||
125 | void) | ||
126 | { | 114 | { |
127 | acpi_handle sys_bus_handle; | 115 | acpi_handle sys_bus_handle; |
128 | acpi_status status; | 116 | acpi_status status; |
129 | |||
130 | |||
131 | ACPI_FUNCTION_NAME ("ns_dump_root_devices"); | ||
132 | 117 | ||
118 | ACPI_FUNCTION_NAME("ns_dump_root_devices"); | ||
133 | 119 | ||
134 | /* Only dump the table if tracing is enabled */ | 120 | /* Only dump the table if tracing is enabled */ |
135 | 121 | ||
@@ -138,19 +124,17 @@ acpi_ns_dump_root_devices ( | |||
138 | } | 124 | } |
139 | 125 | ||
140 | status = acpi_get_handle(NULL, ACPI_NS_SYSTEM_BUS, &sys_bus_handle); | 126 | status = acpi_get_handle(NULL, ACPI_NS_SYSTEM_BUS, &sys_bus_handle); |
141 | if (ACPI_FAILURE (status)) { | 127 | if (ACPI_FAILURE(status)) { |
142 | return; | 128 | return; |
143 | } | 129 | } |
144 | 130 | ||
145 | ACPI_DEBUG_PRINT ((ACPI_DB_TABLES, | 131 | ACPI_DEBUG_PRINT((ACPI_DB_TABLES, |
146 | "Display of all devices in the namespace:\n")); | 132 | "Display of all devices in the namespace:\n")); |
147 | 133 | ||
148 | status = acpi_ns_walk_namespace (ACPI_TYPE_DEVICE, sys_bus_handle, | 134 | status = acpi_ns_walk_namespace(ACPI_TYPE_DEVICE, sys_bus_handle, |
149 | ACPI_UINT32_MAX, ACPI_NS_WALK_NO_UNLOCK, | 135 | ACPI_UINT32_MAX, ACPI_NS_WALK_NO_UNLOCK, |
150 | acpi_ns_dump_one_device, NULL, NULL); | 136 | acpi_ns_dump_one_device, NULL, NULL); |
151 | } | 137 | } |
152 | 138 | ||
153 | #endif | 139 | #endif |
154 | #endif | 140 | #endif |
155 | |||
156 | |||