diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-24 13:38:55 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-24 13:38:55 +1000 |
| commit | 43f6ad1993d5b899c1b601c7deda20bd471634fc (patch) | |
| tree | 450c9755f38e31bd2948090d2e1542c81a71258b | |
| parent | 053f1f02f8da7df61b9632ad3aa489f8b4fa7031 (diff) | |
Revert "ACPI: allow a native cpuidle driver to displace ACPI"
This reverts commit 2828bdc92eeea6e9c79ffcb430f4b67e4ebd1559.
| -rw-r--r-- | drivers/acpi/processor_driver.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c index bbc3697b2e9b..5675d9747e87 100644 --- a/drivers/acpi/processor_driver.c +++ b/drivers/acpi/processor_driver.c @@ -616,8 +616,7 @@ static int __cpuinit acpi_processor_add(struct acpi_device *device) acpi_processor_get_limit_info(pr); - if (cpuidle_get_driver() == &acpi_idle_driver) - acpi_processor_power_init(pr, device); + acpi_processor_power_init(pr, device); pr->cdev = thermal_cooling_device_register("Processor", device, &processor_cooling_ops); @@ -921,10 +920,9 @@ static int __init acpi_processor_init(void) if (!acpi_processor_dir) return -ENOMEM; #endif - - if (!cpuidle_register_driver(&acpi_idle_driver) - printk(KERN_DEBUG "ACPI: %s registered with cpuidle\n", - acpi_idle_driver.name); + result = cpuidle_register_driver(&acpi_idle_driver); + if (result < 0) + goto out_proc; result = acpi_bus_register_driver(&acpi_processor_driver); if (result < 0) @@ -943,6 +941,7 @@ static int __init acpi_processor_init(void) out_cpuidle: cpuidle_unregister_driver(&acpi_idle_driver); +out_proc: #ifdef CONFIG_ACPI_PROCFS remove_proc_entry(ACPI_PROCESSOR_CLASS, acpi_root_dir); #endif |