3 files changed, 7 insertions, 11 deletions

diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c
index bfc31cb0dd3e..9c9288b7e410 100644
--- a/drivers/acpi/processor_driver.c
+++ b/drivers/acpi/processor_driver.c
@@ -475,7 +475,7 @@ static __ref int acpi_processor_start(struct acpi_processor *pr)
         acpi_processor_get_limit_info(pr);
 
         if (!cpuidle_get_driver() || cpuidle_get_driver() == &acpi_idle_driver)
-                acpi_processor_power_init(pr, device);
+                acpi_processor_power_init(pr);
 
         pr->cdev = thermal_cooling_device_register("Processor", device,
                                                    &processor_cooling_ops);
@@ -509,7 +509,7 @@ err_remove_sysfs_thermal:
 err_thermal_unregister:
         thermal_cooling_device_unregister(pr->cdev);
 err_power_exit:
-        acpi_processor_power_exit(pr, device);
+        acpi_processor_power_exit(pr);
 
         return result;
 }
@@ -620,7 +620,7 @@ static int acpi_processor_remove(struct acpi_device *device, int type)
                         return -EINVAL;
         }
 
-        acpi_processor_power_exit(pr, device);
+        acpi_processor_power_exit(pr);
 
         sysfs_remove_link(&device->dev.kobj, "sysdev");
 
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index de896242d144..c46a44a8c860 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -1216,8 +1216,7 @@ int acpi_processor_cst_has_changed(struct acpi_processor *pr)
 
 static int acpi_processor_registered;
 
-int __cpuinit acpi_processor_power_init(struct acpi_processor *pr,
-                              struct acpi_device *device)
+int __cpuinit acpi_processor_power_init(struct acpi_processor *pr)
 {
         acpi_status status = 0;
         int retval;
@@ -1281,8 +1280,7 @@ int __cpuinit acpi_processor_power_init(struct acpi_processor *pr,
         return 0;
 }
 
-int acpi_processor_power_exit(struct acpi_processor *pr,
-                              struct acpi_device *device)
+int acpi_processor_power_exit(struct acpi_processor *pr)
 {
         if (disabled_by_idle_boot_param())
                 return 0;
diff --git a/include/acpi/processor.h b/include/acpi/processor.h
index db427fa8cf82..1d3c1a68acce 100644
--- a/include/acpi/processor.h
+++ b/include/acpi/processor.h
@@ -324,12 +324,10 @@ extern void acpi_processor_reevaluate_tstate(struct acpi_processor *pr,
 extern const struct file_operations acpi_processor_throttling_fops;
 extern void acpi_processor_throttling_init(void);
 /* in processor_idle.c */
-int acpi_processor_power_init(struct acpi_processor *pr,
-                              struct acpi_device *device);
+int acpi_processor_power_init(struct acpi_processor *pr);
+int acpi_processor_power_exit(struct acpi_processor *pr);
 int acpi_processor_cst_has_changed(struct acpi_processor *pr);
 int acpi_processor_hotplug(struct acpi_processor *pr);
-int acpi_processor_power_exit(struct acpi_processor *pr,
-                              struct acpi_device *device);
 int acpi_processor_suspend(struct device *dev);
 int acpi_processor_resume(struct device *dev);
 extern struct cpuidle_driver acpi_idle_driver;