diff options
| -rw-r--r-- | drivers/acpi/acpica/acstruct.h | 6 | ||||
| -rw-r--r-- | drivers/acpi/acpica/nsinit.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/acpi/acpica/acstruct.h b/drivers/acpi/acpica/acstruct.h index 0e2c66af3c9d..6e5dd97949fe 100644 --- a/drivers/acpi/acpica/acstruct.h +++ b/drivers/acpi/acpica/acstruct.h | |||
| @@ -201,11 +201,11 @@ struct acpi_evaluate_info { | |||
| 201 | /* Info used by acpi_ns_initialize_devices */ | 201 | /* Info used by acpi_ns_initialize_devices */ |
| 202 | 202 | ||
| 203 | struct acpi_device_walk_info { | 203 | struct acpi_device_walk_info { |
| 204 | u16 device_count; | ||
| 205 | u16 num_STA; | ||
| 206 | u16 num_INI; | ||
| 207 | struct acpi_table_desc *table_desc; | 204 | struct acpi_table_desc *table_desc; |
| 208 | struct acpi_evaluate_info *evaluate_info; | 205 | struct acpi_evaluate_info *evaluate_info; |
| 206 | u32 device_count; | ||
| 207 | u32 num_STA; | ||
| 208 | u32 num_INI; | ||
| 209 | }; | 209 | }; |
| 210 | 210 | ||
| 211 | /* TBD: [Restructure] Merge with struct above */ | 211 | /* TBD: [Restructure] Merge with struct above */ |
diff --git a/drivers/acpi/acpica/nsinit.c b/drivers/acpi/acpica/nsinit.c index 88145820d887..f0e49df7c13b 100644 --- a/drivers/acpi/acpica/nsinit.c +++ b/drivers/acpi/acpica/nsinit.c | |||
| @@ -208,8 +208,8 @@ acpi_status acpi_ns_initialize_devices(void) | |||
| 208 | } | 208 | } |
| 209 | 209 | ||
| 210 | ACPI_DEBUG_PRINT_RAW((ACPI_DB_INIT, | 210 | ACPI_DEBUG_PRINT_RAW((ACPI_DB_INIT, |
| 211 | "\nExecuted %hd _INI methods requiring %hd _STA executions " | 211 | "\nExecuted %u _INI methods requiring %u _STA executions " |
| 212 | "(examined %hd objects)\n", | 212 | "(examined %u objects)\n", |
| 213 | info.num_INI, info.num_STA, info.device_count)); | 213 | info.num_INI, info.num_STA, info.device_count)); |
| 214 | 214 | ||
| 215 | return_ACPI_STATUS(status); | 215 | return_ACPI_STATUS(status); |
