diff options
Diffstat (limited to 'drivers/acpi/processor_driver.c')
-rw-r--r-- | drivers/acpi/processor_driver.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c index bfc31cb0dd3e..e78c2a52ea46 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) | |||
475 | acpi_processor_get_limit_info(pr); | 475 | acpi_processor_get_limit_info(pr); |
476 | 476 | ||
477 | if (!cpuidle_get_driver() || cpuidle_get_driver() == &acpi_idle_driver) | 477 | if (!cpuidle_get_driver() || cpuidle_get_driver() == &acpi_idle_driver) |
478 | acpi_processor_power_init(pr, device); | 478 | acpi_processor_power_init(pr); |
479 | 479 | ||
480 | pr->cdev = thermal_cooling_device_register("Processor", device, | 480 | pr->cdev = thermal_cooling_device_register("Processor", device, |
481 | &processor_cooling_ops); | 481 | &processor_cooling_ops); |
@@ -509,7 +509,7 @@ err_remove_sysfs_thermal: | |||
509 | err_thermal_unregister: | 509 | err_thermal_unregister: |
510 | thermal_cooling_device_unregister(pr->cdev); | 510 | thermal_cooling_device_unregister(pr->cdev); |
511 | err_power_exit: | 511 | err_power_exit: |
512 | acpi_processor_power_exit(pr, device); | 512 | acpi_processor_power_exit(pr); |
513 | 513 | ||
514 | return result; | 514 | return result; |
515 | } | 515 | } |
@@ -620,7 +620,7 @@ static int acpi_processor_remove(struct acpi_device *device, int type) | |||
620 | return -EINVAL; | 620 | return -EINVAL; |
621 | } | 621 | } |
622 | 622 | ||
623 | acpi_processor_power_exit(pr, device); | 623 | acpi_processor_power_exit(pr); |
624 | 624 | ||
625 | sysfs_remove_link(&device->dev.kobj, "sysdev"); | 625 | sysfs_remove_link(&device->dev.kobj, "sysdev"); |
626 | 626 | ||
@@ -905,8 +905,6 @@ static int __init acpi_processor_init(void) | |||
905 | if (acpi_disabled) | 905 | if (acpi_disabled) |
906 | return 0; | 906 | return 0; |
907 | 907 | ||
908 | memset(&errata, 0, sizeof(errata)); | ||
909 | |||
910 | result = acpi_bus_register_driver(&acpi_processor_driver); | 908 | result = acpi_bus_register_driver(&acpi_processor_driver); |
911 | if (result < 0) | 909 | if (result < 0) |
912 | return result; | 910 | return result; |