diff options
author | Len Brown <len.brown@intel.com> | 2007-01-11 01:55:25 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2007-01-11 01:55:25 -0500 |
commit | 85f4544fbf02f60993c76f5b92517a87f220472d (patch) | |
tree | f88eb4526e9cb6684f93b04ab440b42634aa5728 /drivers | |
parent | f3a2c3ee458bd614231e548c13acb0cf33a68631 (diff) | |
parent | 8b59a454c421542a51c391f542c80d165f7547a0 (diff) |
Pull trivial into release branch
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/acpi/ec.c | 4 | ||||
-rw-r--r-- | drivers/acpi/processor_core.c | 3 | ||||
-rw-r--r-- | drivers/acpi/processor_perflib.c | 4 |
3 files changed, 2 insertions, 9 deletions
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c index 4144d5dd442e..cbdf031f3c09 100644 --- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c | |||
@@ -1016,8 +1016,8 @@ static int __init acpi_ec_set_intr_mode(char *str) | |||
1016 | acpi_ec_mode = EC_POLL; | 1016 | acpi_ec_mode = EC_POLL; |
1017 | } | 1017 | } |
1018 | acpi_ec_driver.ops.add = acpi_ec_add; | 1018 | acpi_ec_driver.ops.add = acpi_ec_add; |
1019 | ACPI_DEBUG_PRINT((ACPI_DB_INFO, "EC %s mode.\n", | 1019 | printk(KERN_NOTICE PREFIX "%s mode.\n", |
1020 | intr ? "interrupt" : "polling")); | 1020 | intr ? "interrupt" : "polling"); |
1021 | 1021 | ||
1022 | return 1; | 1022 | return 1; |
1023 | } | 1023 | } |
diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c index 25718fed39f1..5f9496d59ed6 100644 --- a/drivers/acpi/processor_core.c +++ b/drivers/acpi/processor_core.c | |||
@@ -476,9 +476,6 @@ static int acpi_processor_get_info(struct acpi_processor *pr) | |||
476 | if (cpu_index == -1) { | 476 | if (cpu_index == -1) { |
477 | if (ACPI_FAILURE | 477 | if (ACPI_FAILURE |
478 | (acpi_processor_hotadd_init(pr->handle, &pr->id))) { | 478 | (acpi_processor_hotadd_init(pr->handle, &pr->id))) { |
479 | printk(KERN_ERR PREFIX | ||
480 | "Getting cpuindex for acpiid 0x%x\n", | ||
481 | pr->acpi_id); | ||
482 | return -ENODEV; | 479 | return -ENODEV; |
483 | } | 480 | } |
484 | } | 481 | } |
diff --git a/drivers/acpi/processor_perflib.c b/drivers/acpi/processor_perflib.c index 0e60382714bb..5207f9e4b443 100644 --- a/drivers/acpi/processor_perflib.c +++ b/drivers/acpi/processor_perflib.c | |||
@@ -736,10 +736,6 @@ int acpi_processor_preregister_performance( | |||
736 | } | 736 | } |
737 | 737 | ||
738 | err_ret: | 738 | err_ret: |
739 | if (retval) { | ||
740 | ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Error while parsing _PSD domain information. Assuming no coordination\n")); | ||
741 | } | ||
742 | |||
743 | for_each_possible_cpu(i) { | 739 | for_each_possible_cpu(i) { |
744 | pr = processors[i]; | 740 | pr = processors[i]; |
745 | if (!pr || !pr->performance) | 741 | if (!pr || !pr->performance) |