1 files changed, 5 insertions, 10 deletions

diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c
index 971c45474703..bfc31cb0dd3e 100644
--- a/drivers/acpi/processor_driver.c
+++ b/drivers/acpi/processor_driver.c
@@ -93,6 +93,9 @@ static const struct acpi_device_id processor_device_ids[] = {
 };
 MODULE_DEVICE_TABLE(acpi, processor_device_ids);
 
+static SIMPLE_DEV_PM_OPS(acpi_processor_pm,
+                         acpi_processor_suspend, acpi_processor_resume);
+
 static struct acpi_driver acpi_processor_driver = {
         .name = "processor",
         .class = ACPI_PROCESSOR_CLASS,
@@ -100,10 +103,9 @@ static struct acpi_driver acpi_processor_driver = {
         .ops = {
                 .add = acpi_processor_add,
                 .remove = acpi_processor_remove,
-                .suspend = acpi_processor_suspend,
-                .resume = acpi_processor_resume,
                 .notify = acpi_processor_notify,
                 },
+        .drv.pm = &acpi_processor_pm,
 };
 
 #define INSTALL_NOTIFY_HANDLER          1
@@ -427,22 +429,15 @@ static int acpi_cpu_soft_notify(struct notifier_block *nfb,
                  * Initialize missing things
                  */
                 if (pr->flags.need_hotplug_init) {
-                        struct cpuidle_driver *idle_driver =
-                                cpuidle_get_driver();
-
                         printk(KERN_INFO "Will online and init hotplugged "
                                "CPU: %d\n", pr->id);
                         WARN(acpi_processor_start(pr), "Failed to start CPU:"
                                 " %d\n", pr->id);
                         pr->flags.need_hotplug_init = 0;
-                        if (idle_driver && !strcmp(idle_driver->name,
-                                                   "intel_idle")) {
-                                intel_idle_cpu_init(pr->id);
-                        }
                 /* Normal CPU soft online event */
                 } else {
                         acpi_processor_ppc_has_changed(pr, 0);
-                        acpi_processor_cst_has_changed(pr);
+                        acpi_processor_hotplug(pr);
                         acpi_processor_reevaluate_tstate(pr, action);
                         acpi_processor_tstate_has_changed(pr);
                 }