Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 350893
b: refs/heads/master
c: 3e5621a
h: refs/heads/master
i:
  350891: 72e5c68
v: v3
  • Loading branch information
Bob Moore authored and Rafael J. Wysocki committed Jan 10, 2013
1 parent 8947a3c commit 81dbf7a
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 15 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2fae3e56ca302366e422118107fc04247775825f
refs/heads/master: 3e5621a750e2cfb26748c34acbb67c691845494a
22 changes: 12 additions & 10 deletions trunk/drivers/acpi/acpica/evgpeblk.c
Original file line number Diff line number Diff line change
Expand Up @@ -405,13 +405,13 @@ acpi_ev_create_gpe_block(struct acpi_namespace_node *gpe_device,
(*return_gpe_block) = gpe_block;
}

ACPI_DEBUG_PRINT((ACPI_DB_INIT,
"GPE %02X to %02X [%4.4s] %u regs on int 0x%X\n",
(u32) gpe_block->block_base_number,
(u32) (gpe_block->block_base_number +
(gpe_block->gpe_count - 1)),
gpe_device->name.ascii, gpe_block->register_count,
interrupt_number));
ACPI_DEBUG_PRINT_RAW((ACPI_DB_INIT,
" Initialized GPE %02X to %02X [%4.4s] %u regs on interrupt 0x%X\n",
(u32)gpe_block->block_base_number,
(u32)(gpe_block->block_base_number +
(gpe_block->gpe_count - 1)),
gpe_device->name.ascii, gpe_block->register_count,
interrupt_number));

/* Update global count of currently available GPEs */

Expand Down Expand Up @@ -496,9 +496,11 @@ acpi_ev_initialize_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
}

if (gpe_enabled_count) {
ACPI_DEBUG_PRINT((ACPI_DB_INIT,
"Enabled %u GPEs in this block\n",
gpe_enabled_count));
ACPI_INFO((AE_INFO,
"Enabled %u GPEs in block %02X to %02X",
gpe_enabled_count, (u32)gpe_block->block_base_number,
(u32)(gpe_block->block_base_number +
(gpe_block->gpe_count - 1))));
}

gpe_block->initialized = TRUE;
Expand Down
3 changes: 3 additions & 0 deletions trunk/drivers/acpi/acpica/evgpeinit.c
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,9 @@ acpi_status acpi_ev_gpe_initialize(void)

ACPI_FUNCTION_TRACE(ev_gpe_initialize);

ACPI_DEBUG_PRINT_RAW((ACPI_DB_INIT,
"Initializing General Purpose Events (GPEs):\n"));

status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
if (ACPI_FAILURE(status)) {
return_ACPI_STATUS(status);
Expand Down
6 changes: 3 additions & 3 deletions trunk/drivers/acpi/acpica/nsinit.c
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ acpi_status acpi_ns_initialize_objects(void)
}

ACPI_DEBUG_PRINT_RAW((ACPI_DB_INIT,
"Initialized %u/%u Regions %u/%u Fields %u/%u "
" Initialized %u/%u Regions %u/%u Fields %u/%u "
"Buffers %u/%u Packages (%u nodes)\n",
info.op_region_init, info.op_region_count,
info.field_init, info.field_count,
Expand Down Expand Up @@ -149,7 +149,7 @@ acpi_status acpi_ns_initialize_devices(void)

ACPI_DEBUG_PRINT_RAW((ACPI_DB_INIT,
"Initializing Device/Processor/Thermal objects "
"and executing _INI methods:\n"));
"and executing _INI/_STA methods:\n"));

/* Tree analysis: find all subtrees that contain _INI methods */

Expand Down Expand Up @@ -207,7 +207,7 @@ acpi_status acpi_ns_initialize_devices(void)
}

ACPI_DEBUG_PRINT_RAW((ACPI_DB_INIT,
"Executed %u _INI methods requiring %u _STA executions "
" Executed %u _INI methods requiring %u _STA executions "
"(examined %u objects)\n",
info.num_INI, info.num_STA, info.device_count));

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/acpi/acpica/tbxfload.c
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ static acpi_status acpi_tb_load_namespace(void)
(void)acpi_ut_acquire_mutex(ACPI_MTX_TABLES);
}

ACPI_DEBUG_PRINT((ACPI_DB_INIT, "ACPI Tables successfully acquired\n"));
ACPI_INFO((AE_INFO, "All ACPI Tables successfully acquired"));

unlock_and_exit:
(void)acpi_ut_release_mutex(ACPI_MTX_TABLES);
Expand Down

0 comments on commit 81dbf7a

Please sign in to comment.