mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 09:19:51 +00:00
ACPI: Use struct dev_pm_ops for power management in processor driver
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:
parent
167cffb646
commit
e8110b64af
3 changed files with 8 additions and 6 deletions
|
@ -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
|
||||||
|
|
|
@ -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;
|
||||||
|
|
|
@ -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 */
|
||||||
|
|
Loading…
Reference in a new issue