leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ACPI: Use struct dev_pm_ops for power management in processor driver

Browse Source 
Make the ACPI processor driver define its PM callbacks through
a struct dev_pm_ops object rather than by using legacy PM hooks
in struct acpi_device_ops.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
This commit is contained in:
Rafael J. Wysocki 2012-06-27 23:26:26 +02:00
parent 167cffb646
commit e8110b64af
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/acpi/processor_driver.c
View File

@ -93,6 +93,9 @@ static const struct acpi_device_id processor_device_ids[] = {
}; };
MODULE_DEVICE_TABLE(acpi, 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 = { static struct acpi_driver acpi_processor_driver = {
.name = "processor", .name = "processor",
.class = ACPI_PROCESSOR_CLASS, .class = ACPI_PROCESSOR_CLASS,
@ -100,10 +103,9 @@ static struct acpi_driver acpi_processor_driver = {
.ops = { .ops = {
.add = acpi_processor_add, .add = acpi_processor_add,
.remove = acpi_processor_remove, .remove = acpi_processor_remove,
.suspend = acpi_processor_suspend,
.resume = acpi_processor_resume,
.notify = acpi_processor_notify, .notify = acpi_processor_notify,
}, },
.drv.pm = &acpi_processor_pm,
}; };
#define INSTALL_NOTIFY_HANDLER 1 #define INSTALL_NOTIFY_HANDLER 1

4
drivers/acpi/processor_idle.c
View File

@ -241,7 +241,7 @@ static void acpi_idle_bm_rld_restore(void)
acpi_write_bit_register(ACPI_BITREG_BUS_MASTER_RLD, saved_bm_rld); acpi_write_bit_register(ACPI_BITREG_BUS_MASTER_RLD, saved_bm_rld);
} }
int acpi_processor_suspend(struct acpi_device * device) int acpi_processor_suspend(struct device *dev)
{ {
if (acpi_idle_suspend == 1) if (acpi_idle_suspend == 1)
return 0; return 0;
@ -251,7 +251,7 @@ int acpi_processor_suspend(struct acpi_device * device)
return 0; return 0;
} }
int acpi_processor_resume(struct acpi_device * device) int acpi_processor_resume(struct device *dev)
{ {
if (acpi_idle_suspend == 0) if (acpi_idle_suspend == 0)
return 0; return 0;

4
include/acpi/processor.h
View File

@ -334,8 +334,8 @@ int acpi_processor_cst_has_changed(struct acpi_processor *pr);
int acpi_processor_hotplug(struct acpi_processor *pr); int acpi_processor_hotplug(struct acpi_processor *pr);
int acpi_processor_power_exit(struct acpi_processor *pr, int acpi_processor_power_exit(struct acpi_processor *pr,
struct acpi_device *device); struct acpi_device *device);
int acpi_processor_suspend(struct acpi_device * device); int acpi_processor_suspend(struct device *dev);
int acpi_processor_resume(struct acpi_device * device); int acpi_processor_resume(struct device *dev);
extern struct cpuidle_driver acpi_idle_driver; extern struct cpuidle_driver acpi_idle_driver;
/* in processor_thermal.c */ /* in processor_thermal.c */