PM: Simplify the new suspend/hibernation framework for devices
PM: Simplify the new suspend/hibernation framework for devices Following the discussion at the Kernel Summit, simplify the new device PM framework by merging 'struct pm_ops' and 'struct pm_ext_ops' and removing pointers to 'struct pm_ext_ops' from 'struct platform_driver' and 'struct pci_driver'. After this change, the suspend/hibernation callbacks will only reside in 'struct device_driver' as well as at the bus type/ device class/device type level. Accordingly, PCI and platform device drivers are now expected to put their suspend/hibernation callbacks into the 'struct device_driver' embedded in 'struct pci_driver' or 'struct platform_driver', respectively. Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Acked-by: Pavel Machek <pavel@suse.cz> Cc: Jesse Barnes <jbarnes@virtuousgeek.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
238c6d5483
commit
adf094931f
|
@ -503,8 +503,6 @@ int platform_driver_register(struct platform_driver *drv)
|
||||||
drv->driver.suspend = platform_drv_suspend;
|
drv->driver.suspend = platform_drv_suspend;
|
||||||
if (drv->resume)
|
if (drv->resume)
|
||||||
drv->driver.resume = platform_drv_resume;
|
drv->driver.resume = platform_drv_resume;
|
||||||
if (drv->pm)
|
|
||||||
drv->driver.pm = &drv->pm->base;
|
|
||||||
return driver_register(&drv->driver);
|
return driver_register(&drv->driver);
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL_GPL(platform_driver_register);
|
EXPORT_SYMBOL_GPL(platform_driver_register);
|
||||||
|
@ -686,7 +684,10 @@ static int platform_pm_suspend(struct device *dev)
|
||||||
struct device_driver *drv = dev->driver;
|
struct device_driver *drv = dev->driver;
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
|
|
||||||
if (drv && drv->pm) {
|
if (!drv)
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
if (drv->pm) {
|
||||||
if (drv->pm->suspend)
|
if (drv->pm->suspend)
|
||||||
ret = drv->pm->suspend(dev);
|
ret = drv->pm->suspend(dev);
|
||||||
} else {
|
} else {
|
||||||
|
@ -698,16 +699,15 @@ static int platform_pm_suspend(struct device *dev)
|
||||||
|
|
||||||
static int platform_pm_suspend_noirq(struct device *dev)
|
static int platform_pm_suspend_noirq(struct device *dev)
|
||||||
{
|
{
|
||||||
struct platform_driver *pdrv;
|
struct device_driver *drv = dev->driver;
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
|
|
||||||
if (!dev->driver)
|
if (!drv)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
pdrv = to_platform_driver(dev->driver);
|
if (drv->pm) {
|
||||||
if (pdrv->pm) {
|
if (drv->pm->suspend_noirq)
|
||||||
if (pdrv->pm->suspend_noirq)
|
ret = drv->pm->suspend_noirq(dev);
|
||||||
ret = pdrv->pm->suspend_noirq(dev);
|
|
||||||
} else {
|
} else {
|
||||||
ret = platform_legacy_suspend_late(dev, PMSG_SUSPEND);
|
ret = platform_legacy_suspend_late(dev, PMSG_SUSPEND);
|
||||||
}
|
}
|
||||||
|
@ -720,7 +720,10 @@ static int platform_pm_resume(struct device *dev)
|
||||||
struct device_driver *drv = dev->driver;
|
struct device_driver *drv = dev->driver;
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
|
|
||||||
if (drv && drv->pm) {
|
if (!drv)
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
if (drv->pm) {
|
||||||
if (drv->pm->resume)
|
if (drv->pm->resume)
|
||||||
ret = drv->pm->resume(dev);
|
ret = drv->pm->resume(dev);
|
||||||
} else {
|
} else {
|
||||||
|
@ -732,16 +735,15 @@ static int platform_pm_resume(struct device *dev)
|
||||||
|
|
||||||
static int platform_pm_resume_noirq(struct device *dev)
|
static int platform_pm_resume_noirq(struct device *dev)
|
||||||
{
|
{
|
||||||
struct platform_driver *pdrv;
|
struct device_driver *drv = dev->driver;
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
|
|
||||||
if (!dev->driver)
|
if (!drv)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
pdrv = to_platform_driver(dev->driver);
|
if (drv->pm) {
|
||||||
if (pdrv->pm) {
|
if (drv->pm->resume_noirq)
|
||||||
if (pdrv->pm->resume_noirq)
|
ret = drv->pm->resume_noirq(dev);
|
||||||
ret = pdrv->pm->resume_noirq(dev);
|
|
||||||
} else {
|
} else {
|
||||||
ret = platform_legacy_resume_early(dev);
|
ret = platform_legacy_resume_early(dev);
|
||||||
}
|
}
|
||||||
|
@ -780,16 +782,15 @@ static int platform_pm_freeze(struct device *dev)
|
||||||
|
|
||||||
static int platform_pm_freeze_noirq(struct device *dev)
|
static int platform_pm_freeze_noirq(struct device *dev)
|
||||||
{
|
{
|
||||||
struct platform_driver *pdrv;
|
struct device_driver *drv = dev->driver;
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
|
|
||||||
if (!dev->driver)
|
if (!drv)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
pdrv = to_platform_driver(dev->driver);
|
if (drv->pm) {
|
||||||
if (pdrv->pm) {
|
if (drv->pm->freeze_noirq)
|
||||||
if (pdrv->pm->freeze_noirq)
|
ret = drv->pm->freeze_noirq(dev);
|
||||||
ret = pdrv->pm->freeze_noirq(dev);
|
|
||||||
} else {
|
} else {
|
||||||
ret = platform_legacy_suspend_late(dev, PMSG_FREEZE);
|
ret = platform_legacy_suspend_late(dev, PMSG_FREEZE);
|
||||||
}
|
}
|
||||||
|
@ -802,7 +803,10 @@ static int platform_pm_thaw(struct device *dev)
|
||||||
struct device_driver *drv = dev->driver;
|
struct device_driver *drv = dev->driver;
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
|
|
||||||
if (drv && drv->pm) {
|
if (!drv)
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
if (drv->pm) {
|
||||||
if (drv->pm->thaw)
|
if (drv->pm->thaw)
|
||||||
ret = drv->pm->thaw(dev);
|
ret = drv->pm->thaw(dev);
|
||||||
} else {
|
} else {
|
||||||
|
@ -814,16 +818,15 @@ static int platform_pm_thaw(struct device *dev)
|
||||||
|
|
||||||
static int platform_pm_thaw_noirq(struct device *dev)
|
static int platform_pm_thaw_noirq(struct device *dev)
|
||||||
{
|
{
|
||||||
struct platform_driver *pdrv;
|
struct device_driver *drv = dev->driver;
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
|
|
||||||
if (!dev->driver)
|
if (!drv)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
pdrv = to_platform_driver(dev->driver);
|
if (drv->pm) {
|
||||||
if (pdrv->pm) {
|
if (drv->pm->thaw_noirq)
|
||||||
if (pdrv->pm->thaw_noirq)
|
ret = drv->pm->thaw_noirq(dev);
|
||||||
ret = pdrv->pm->thaw_noirq(dev);
|
|
||||||
} else {
|
} else {
|
||||||
ret = platform_legacy_resume_early(dev);
|
ret = platform_legacy_resume_early(dev);
|
||||||
}
|
}
|
||||||
|
@ -836,7 +839,10 @@ static int platform_pm_poweroff(struct device *dev)
|
||||||
struct device_driver *drv = dev->driver;
|
struct device_driver *drv = dev->driver;
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
|
|
||||||
if (drv && drv->pm) {
|
if (!drv)
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
if (drv->pm) {
|
||||||
if (drv->pm->poweroff)
|
if (drv->pm->poweroff)
|
||||||
ret = drv->pm->poweroff(dev);
|
ret = drv->pm->poweroff(dev);
|
||||||
} else {
|
} else {
|
||||||
|
@ -848,16 +854,15 @@ static int platform_pm_poweroff(struct device *dev)
|
||||||
|
|
||||||
static int platform_pm_poweroff_noirq(struct device *dev)
|
static int platform_pm_poweroff_noirq(struct device *dev)
|
||||||
{
|
{
|
||||||
struct platform_driver *pdrv;
|
struct device_driver *drv = dev->driver;
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
|
|
||||||
if (!dev->driver)
|
if (!drv)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
pdrv = to_platform_driver(dev->driver);
|
if (drv->pm) {
|
||||||
if (pdrv->pm) {
|
if (drv->pm->poweroff_noirq)
|
||||||
if (pdrv->pm->poweroff_noirq)
|
ret = drv->pm->poweroff_noirq(dev);
|
||||||
ret = pdrv->pm->poweroff_noirq(dev);
|
|
||||||
} else {
|
} else {
|
||||||
ret = platform_legacy_suspend_late(dev, PMSG_HIBERNATE);
|
ret = platform_legacy_suspend_late(dev, PMSG_HIBERNATE);
|
||||||
}
|
}
|
||||||
|
@ -870,7 +875,10 @@ static int platform_pm_restore(struct device *dev)
|
||||||
struct device_driver *drv = dev->driver;
|
struct device_driver *drv = dev->driver;
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
|
|
||||||
if (drv && drv->pm) {
|
if (!drv)
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
if (drv->pm) {
|
||||||
if (drv->pm->restore)
|
if (drv->pm->restore)
|
||||||
ret = drv->pm->restore(dev);
|
ret = drv->pm->restore(dev);
|
||||||
} else {
|
} else {
|
||||||
|
@ -882,16 +890,15 @@ static int platform_pm_restore(struct device *dev)
|
||||||
|
|
||||||
static int platform_pm_restore_noirq(struct device *dev)
|
static int platform_pm_restore_noirq(struct device *dev)
|
||||||
{
|
{
|
||||||
struct platform_driver *pdrv;
|
struct device_driver *drv = dev->driver;
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
|
|
||||||
if (!dev->driver)
|
if (!drv)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
pdrv = to_platform_driver(dev->driver);
|
if (drv->pm) {
|
||||||
if (pdrv->pm) {
|
if (drv->pm->restore_noirq)
|
||||||
if (pdrv->pm->restore_noirq)
|
ret = drv->pm->restore_noirq(dev);
|
||||||
ret = pdrv->pm->restore_noirq(dev);
|
|
||||||
} else {
|
} else {
|
||||||
ret = platform_legacy_resume_early(dev);
|
ret = platform_legacy_resume_early(dev);
|
||||||
}
|
}
|
||||||
|
@ -912,17 +919,15 @@ static int platform_pm_restore_noirq(struct device *dev)
|
||||||
|
|
||||||
#endif /* !CONFIG_HIBERNATION */
|
#endif /* !CONFIG_HIBERNATION */
|
||||||
|
|
||||||
static struct pm_ext_ops platform_pm_ops = {
|
static struct dev_pm_ops platform_dev_pm_ops = {
|
||||||
.base = {
|
.prepare = platform_pm_prepare,
|
||||||
.prepare = platform_pm_prepare,
|
.complete = platform_pm_complete,
|
||||||
.complete = platform_pm_complete,
|
.suspend = platform_pm_suspend,
|
||||||
.suspend = platform_pm_suspend,
|
.resume = platform_pm_resume,
|
||||||
.resume = platform_pm_resume,
|
.freeze = platform_pm_freeze,
|
||||||
.freeze = platform_pm_freeze,
|
.thaw = platform_pm_thaw,
|
||||||
.thaw = platform_pm_thaw,
|
.poweroff = platform_pm_poweroff,
|
||||||
.poweroff = platform_pm_poweroff,
|
.restore = platform_pm_restore,
|
||||||
.restore = platform_pm_restore,
|
|
||||||
},
|
|
||||||
.suspend_noirq = platform_pm_suspend_noirq,
|
.suspend_noirq = platform_pm_suspend_noirq,
|
||||||
.resume_noirq = platform_pm_resume_noirq,
|
.resume_noirq = platform_pm_resume_noirq,
|
||||||
.freeze_noirq = platform_pm_freeze_noirq,
|
.freeze_noirq = platform_pm_freeze_noirq,
|
||||||
|
@ -931,7 +936,7 @@ static struct pm_ext_ops platform_pm_ops = {
|
||||||
.restore_noirq = platform_pm_restore_noirq,
|
.restore_noirq = platform_pm_restore_noirq,
|
||||||
};
|
};
|
||||||
|
|
||||||
#define PLATFORM_PM_OPS_PTR &platform_pm_ops
|
#define PLATFORM_PM_OPS_PTR (&platform_dev_pm_ops)
|
||||||
|
|
||||||
#else /* !CONFIG_PM_SLEEP */
|
#else /* !CONFIG_PM_SLEEP */
|
||||||
|
|
||||||
|
|
|
@ -112,7 +112,8 @@ void device_pm_remove(struct device *dev)
|
||||||
* @ops: PM operations to choose from.
|
* @ops: PM operations to choose from.
|
||||||
* @state: PM transition of the system being carried out.
|
* @state: PM transition of the system being carried out.
|
||||||
*/
|
*/
|
||||||
static int pm_op(struct device *dev, struct pm_ops *ops, pm_message_t state)
|
static int pm_op(struct device *dev, struct dev_pm_ops *ops,
|
||||||
|
pm_message_t state)
|
||||||
{
|
{
|
||||||
int error = 0;
|
int error = 0;
|
||||||
|
|
||||||
|
@ -174,7 +175,7 @@ static int pm_op(struct device *dev, struct pm_ops *ops, pm_message_t state)
|
||||||
* The operation is executed with interrupts disabled by the only remaining
|
* The operation is executed with interrupts disabled by the only remaining
|
||||||
* functional CPU in the system.
|
* functional CPU in the system.
|
||||||
*/
|
*/
|
||||||
static int pm_noirq_op(struct device *dev, struct pm_ext_ops *ops,
|
static int pm_noirq_op(struct device *dev, struct dev_pm_ops *ops,
|
||||||
pm_message_t state)
|
pm_message_t state)
|
||||||
{
|
{
|
||||||
int error = 0;
|
int error = 0;
|
||||||
|
@ -354,7 +355,7 @@ static int resume_device(struct device *dev, pm_message_t state)
|
||||||
if (dev->bus) {
|
if (dev->bus) {
|
||||||
if (dev->bus->pm) {
|
if (dev->bus->pm) {
|
||||||
pm_dev_dbg(dev, state, "");
|
pm_dev_dbg(dev, state, "");
|
||||||
error = pm_op(dev, &dev->bus->pm->base, state);
|
error = pm_op(dev, dev->bus->pm, state);
|
||||||
} else if (dev->bus->resume) {
|
} else if (dev->bus->resume) {
|
||||||
pm_dev_dbg(dev, state, "legacy ");
|
pm_dev_dbg(dev, state, "legacy ");
|
||||||
error = dev->bus->resume(dev);
|
error = dev->bus->resume(dev);
|
||||||
|
@ -451,9 +452,9 @@ static void complete_device(struct device *dev, pm_message_t state)
|
||||||
dev->type->pm->complete(dev);
|
dev->type->pm->complete(dev);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (dev->bus && dev->bus->pm && dev->bus->pm->base.complete) {
|
if (dev->bus && dev->bus->pm && dev->bus->pm->complete) {
|
||||||
pm_dev_dbg(dev, state, "completing ");
|
pm_dev_dbg(dev, state, "completing ");
|
||||||
dev->bus->pm->base.complete(dev);
|
dev->bus->pm->complete(dev);
|
||||||
}
|
}
|
||||||
|
|
||||||
up(&dev->sem);
|
up(&dev->sem);
|
||||||
|
@ -624,7 +625,7 @@ static int suspend_device(struct device *dev, pm_message_t state)
|
||||||
if (dev->bus) {
|
if (dev->bus) {
|
||||||
if (dev->bus->pm) {
|
if (dev->bus->pm) {
|
||||||
pm_dev_dbg(dev, state, "");
|
pm_dev_dbg(dev, state, "");
|
||||||
error = pm_op(dev, &dev->bus->pm->base, state);
|
error = pm_op(dev, dev->bus->pm, state);
|
||||||
} else if (dev->bus->suspend) {
|
} else if (dev->bus->suspend) {
|
||||||
pm_dev_dbg(dev, state, "legacy ");
|
pm_dev_dbg(dev, state, "legacy ");
|
||||||
error = dev->bus->suspend(dev, state);
|
error = dev->bus->suspend(dev, state);
|
||||||
|
@ -685,10 +686,10 @@ static int prepare_device(struct device *dev, pm_message_t state)
|
||||||
|
|
||||||
down(&dev->sem);
|
down(&dev->sem);
|
||||||
|
|
||||||
if (dev->bus && dev->bus->pm && dev->bus->pm->base.prepare) {
|
if (dev->bus && dev->bus->pm && dev->bus->pm->prepare) {
|
||||||
pm_dev_dbg(dev, state, "preparing ");
|
pm_dev_dbg(dev, state, "preparing ");
|
||||||
error = dev->bus->pm->base.prepare(dev);
|
error = dev->bus->pm->prepare(dev);
|
||||||
suspend_report_result(dev->bus->pm->base.prepare, error);
|
suspend_report_result(dev->bus->pm->prepare, error);
|
||||||
if (error)
|
if (error)
|
||||||
goto End;
|
goto End;
|
||||||
}
|
}
|
||||||
|
|
|
@ -433,8 +433,7 @@ static int pci_pm_suspend(struct device *dev)
|
||||||
|
|
||||||
static int pci_pm_suspend_noirq(struct device *dev)
|
static int pci_pm_suspend_noirq(struct device *dev)
|
||||||
{
|
{
|
||||||
struct pci_dev *pci_dev = to_pci_dev(dev);
|
struct device_driver *drv = dev->driver;
|
||||||
struct pci_driver *drv = pci_dev->driver;
|
|
||||||
int error = 0;
|
int error = 0;
|
||||||
|
|
||||||
if (drv && drv->pm) {
|
if (drv && drv->pm) {
|
||||||
|
@ -469,11 +468,10 @@ static int pci_pm_resume(struct device *dev)
|
||||||
|
|
||||||
static int pci_pm_resume_noirq(struct device *dev)
|
static int pci_pm_resume_noirq(struct device *dev)
|
||||||
{
|
{
|
||||||
struct pci_dev *pci_dev = to_pci_dev(dev);
|
struct device_driver *drv = dev->driver;
|
||||||
struct pci_driver *drv = pci_dev->driver;
|
|
||||||
int error = 0;
|
int error = 0;
|
||||||
|
|
||||||
pci_fixup_device(pci_fixup_resume_early, pci_dev);
|
pci_fixup_device(pci_fixup_resume_early, to_pci_dev(dev));
|
||||||
|
|
||||||
if (drv && drv->pm) {
|
if (drv && drv->pm) {
|
||||||
if (drv->pm->resume_noirq)
|
if (drv->pm->resume_noirq)
|
||||||
|
@ -519,8 +517,7 @@ static int pci_pm_freeze(struct device *dev)
|
||||||
|
|
||||||
static int pci_pm_freeze_noirq(struct device *dev)
|
static int pci_pm_freeze_noirq(struct device *dev)
|
||||||
{
|
{
|
||||||
struct pci_dev *pci_dev = to_pci_dev(dev);
|
struct device_driver *drv = dev->driver;
|
||||||
struct pci_driver *drv = pci_dev->driver;
|
|
||||||
int error = 0;
|
int error = 0;
|
||||||
|
|
||||||
if (drv && drv->pm) {
|
if (drv && drv->pm) {
|
||||||
|
@ -553,15 +550,14 @@ static int pci_pm_thaw(struct device *dev)
|
||||||
|
|
||||||
static int pci_pm_thaw_noirq(struct device *dev)
|
static int pci_pm_thaw_noirq(struct device *dev)
|
||||||
{
|
{
|
||||||
struct pci_dev *pci_dev = to_pci_dev(dev);
|
struct device_driver *drv = dev->driver;
|
||||||
struct pci_driver *drv = pci_dev->driver;
|
|
||||||
int error = 0;
|
int error = 0;
|
||||||
|
|
||||||
if (drv && drv->pm) {
|
if (drv && drv->pm) {
|
||||||
if (drv->pm->thaw_noirq)
|
if (drv->pm->thaw_noirq)
|
||||||
error = drv->pm->thaw_noirq(dev);
|
error = drv->pm->thaw_noirq(dev);
|
||||||
} else {
|
} else {
|
||||||
pci_fixup_device(pci_fixup_resume_early, pci_dev);
|
pci_fixup_device(pci_fixup_resume_early, to_pci_dev(dev));
|
||||||
error = pci_legacy_resume_early(dev);
|
error = pci_legacy_resume_early(dev);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -589,8 +585,7 @@ static int pci_pm_poweroff(struct device *dev)
|
||||||
|
|
||||||
static int pci_pm_poweroff_noirq(struct device *dev)
|
static int pci_pm_poweroff_noirq(struct device *dev)
|
||||||
{
|
{
|
||||||
struct pci_dev *pci_dev = to_pci_dev(dev);
|
struct device_driver *drv = dev->driver;
|
||||||
struct pci_driver *drv = pci_dev->driver;
|
|
||||||
int error = 0;
|
int error = 0;
|
||||||
|
|
||||||
if (drv && drv->pm) {
|
if (drv && drv->pm) {
|
||||||
|
@ -625,7 +620,7 @@ static int pci_pm_restore(struct device *dev)
|
||||||
static int pci_pm_restore_noirq(struct device *dev)
|
static int pci_pm_restore_noirq(struct device *dev)
|
||||||
{
|
{
|
||||||
struct pci_dev *pci_dev = to_pci_dev(dev);
|
struct pci_dev *pci_dev = to_pci_dev(dev);
|
||||||
struct pci_driver *drv = pci_dev->driver;
|
struct device_driver *drv = dev->driver;
|
||||||
int error = 0;
|
int error = 0;
|
||||||
|
|
||||||
pci_fixup_device(pci_fixup_resume, pci_dev);
|
pci_fixup_device(pci_fixup_resume, pci_dev);
|
||||||
|
@ -654,17 +649,15 @@ static int pci_pm_restore_noirq(struct device *dev)
|
||||||
|
|
||||||
#endif /* !CONFIG_HIBERNATION */
|
#endif /* !CONFIG_HIBERNATION */
|
||||||
|
|
||||||
struct pm_ext_ops pci_pm_ops = {
|
struct dev_pm_ops pci_dev_pm_ops = {
|
||||||
.base = {
|
.prepare = pci_pm_prepare,
|
||||||
.prepare = pci_pm_prepare,
|
.complete = pci_pm_complete,
|
||||||
.complete = pci_pm_complete,
|
.suspend = pci_pm_suspend,
|
||||||
.suspend = pci_pm_suspend,
|
.resume = pci_pm_resume,
|
||||||
.resume = pci_pm_resume,
|
.freeze = pci_pm_freeze,
|
||||||
.freeze = pci_pm_freeze,
|
.thaw = pci_pm_thaw,
|
||||||
.thaw = pci_pm_thaw,
|
.poweroff = pci_pm_poweroff,
|
||||||
.poweroff = pci_pm_poweroff,
|
.restore = pci_pm_restore,
|
||||||
.restore = pci_pm_restore,
|
|
||||||
},
|
|
||||||
.suspend_noirq = pci_pm_suspend_noirq,
|
.suspend_noirq = pci_pm_suspend_noirq,
|
||||||
.resume_noirq = pci_pm_resume_noirq,
|
.resume_noirq = pci_pm_resume_noirq,
|
||||||
.freeze_noirq = pci_pm_freeze_noirq,
|
.freeze_noirq = pci_pm_freeze_noirq,
|
||||||
|
@ -673,7 +666,7 @@ struct pm_ext_ops pci_pm_ops = {
|
||||||
.restore_noirq = pci_pm_restore_noirq,
|
.restore_noirq = pci_pm_restore_noirq,
|
||||||
};
|
};
|
||||||
|
|
||||||
#define PCI_PM_OPS_PTR &pci_pm_ops
|
#define PCI_PM_OPS_PTR (&pci_dev_pm_ops)
|
||||||
|
|
||||||
#else /* !CONFIG_PM_SLEEP */
|
#else /* !CONFIG_PM_SLEEP */
|
||||||
|
|
||||||
|
@ -703,9 +696,6 @@ int __pci_register_driver(struct pci_driver *drv, struct module *owner,
|
||||||
drv->driver.owner = owner;
|
drv->driver.owner = owner;
|
||||||
drv->driver.mod_name = mod_name;
|
drv->driver.mod_name = mod_name;
|
||||||
|
|
||||||
if (drv->pm)
|
|
||||||
drv->driver.pm = &drv->pm->base;
|
|
||||||
|
|
||||||
spin_lock_init(&drv->dynids.lock);
|
spin_lock_init(&drv->dynids.lock);
|
||||||
INIT_LIST_HEAD(&drv->dynids.list);
|
INIT_LIST_HEAD(&drv->dynids.list);
|
||||||
|
|
||||||
|
|
|
@ -286,7 +286,7 @@ static int usb_dev_restore(struct device *dev)
|
||||||
return usb_resume(dev);
|
return usb_resume(dev);
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct pm_ops usb_device_pm_ops = {
|
static struct dev_pm_ops usb_device_pm_ops = {
|
||||||
.prepare = usb_dev_prepare,
|
.prepare = usb_dev_prepare,
|
||||||
.complete = usb_dev_complete,
|
.complete = usb_dev_complete,
|
||||||
.suspend = usb_dev_suspend,
|
.suspend = usb_dev_suspend,
|
||||||
|
@ -301,7 +301,7 @@ static struct pm_ops usb_device_pm_ops = {
|
||||||
|
|
||||||
#define ksuspend_usb_init() 0
|
#define ksuspend_usb_init() 0
|
||||||
#define ksuspend_usb_cleanup() do {} while (0)
|
#define ksuspend_usb_cleanup() do {} while (0)
|
||||||
#define usb_device_pm_ops (*(struct pm_ops *)0)
|
#define usb_device_pm_ops (*(struct dev_pm_ops *)0)
|
||||||
|
|
||||||
#endif /* CONFIG_PM */
|
#endif /* CONFIG_PM */
|
||||||
|
|
||||||
|
|
|
@ -65,7 +65,7 @@ struct bus_type {
|
||||||
int (*resume_early)(struct device *dev);
|
int (*resume_early)(struct device *dev);
|
||||||
int (*resume)(struct device *dev);
|
int (*resume)(struct device *dev);
|
||||||
|
|
||||||
struct pm_ext_ops *pm;
|
struct dev_pm_ops *pm;
|
||||||
|
|
||||||
struct bus_type_private *p;
|
struct bus_type_private *p;
|
||||||
};
|
};
|
||||||
|
@ -133,7 +133,7 @@ struct device_driver {
|
||||||
int (*resume) (struct device *dev);
|
int (*resume) (struct device *dev);
|
||||||
struct attribute_group **groups;
|
struct attribute_group **groups;
|
||||||
|
|
||||||
struct pm_ops *pm;
|
struct dev_pm_ops *pm;
|
||||||
|
|
||||||
struct driver_private *p;
|
struct driver_private *p;
|
||||||
};
|
};
|
||||||
|
@ -198,7 +198,7 @@ struct class {
|
||||||
int (*suspend)(struct device *dev, pm_message_t state);
|
int (*suspend)(struct device *dev, pm_message_t state);
|
||||||
int (*resume)(struct device *dev);
|
int (*resume)(struct device *dev);
|
||||||
|
|
||||||
struct pm_ops *pm;
|
struct dev_pm_ops *pm;
|
||||||
struct class_private *p;
|
struct class_private *p;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -291,7 +291,7 @@ struct device_type {
|
||||||
int (*suspend)(struct device *dev, pm_message_t state);
|
int (*suspend)(struct device *dev, pm_message_t state);
|
||||||
int (*resume)(struct device *dev);
|
int (*resume)(struct device *dev);
|
||||||
|
|
||||||
struct pm_ops *pm;
|
struct dev_pm_ops *pm;
|
||||||
};
|
};
|
||||||
|
|
||||||
/* interface for exporting device attributes */
|
/* interface for exporting device attributes */
|
||||||
|
|
|
@ -421,7 +421,6 @@ struct pci_driver {
|
||||||
int (*resume_early) (struct pci_dev *dev);
|
int (*resume_early) (struct pci_dev *dev);
|
||||||
int (*resume) (struct pci_dev *dev); /* Device woken up */
|
int (*resume) (struct pci_dev *dev); /* Device woken up */
|
||||||
void (*shutdown) (struct pci_dev *dev);
|
void (*shutdown) (struct pci_dev *dev);
|
||||||
struct pm_ext_ops *pm;
|
|
||||||
struct pci_error_handlers *err_handler;
|
struct pci_error_handlers *err_handler;
|
||||||
struct device_driver driver;
|
struct device_driver driver;
|
||||||
struct pci_dynids dynids;
|
struct pci_dynids dynids;
|
||||||
|
|
|
@ -55,7 +55,6 @@ struct platform_driver {
|
||||||
int (*suspend_late)(struct platform_device *, pm_message_t state);
|
int (*suspend_late)(struct platform_device *, pm_message_t state);
|
||||||
int (*resume_early)(struct platform_device *);
|
int (*resume_early)(struct platform_device *);
|
||||||
int (*resume)(struct platform_device *);
|
int (*resume)(struct platform_device *);
|
||||||
struct pm_ext_ops *pm;
|
|
||||||
struct device_driver driver;
|
struct device_driver driver;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -41,7 +41,7 @@ typedef struct pm_message {
|
||||||
} pm_message_t;
|
} pm_message_t;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* struct pm_ops - device PM callbacks
|
* struct dev_pm_ops - device PM callbacks
|
||||||
*
|
*
|
||||||
* Several driver power state transitions are externally visible, affecting
|
* Several driver power state transitions are externally visible, affecting
|
||||||
* the state of pending I/O queues and (for drivers that touch hardware)
|
* the state of pending I/O queues and (for drivers that touch hardware)
|
||||||
|
@ -126,46 +126,6 @@ typedef struct pm_message {
|
||||||
* On most platforms, there are no restrictions on availability of
|
* On most platforms, there are no restrictions on availability of
|
||||||
* resources like clocks during @restore().
|
* resources like clocks during @restore().
|
||||||
*
|
*
|
||||||
* All of the above callbacks, except for @complete(), return error codes.
|
|
||||||
* However, the error codes returned by the resume operations, @resume(),
|
|
||||||
* @thaw(), and @restore(), do not cause the PM core to abort the resume
|
|
||||||
* transition during which they are returned. The error codes returned in
|
|
||||||
* that cases are only printed by the PM core to the system logs for debugging
|
|
||||||
* purposes. Still, it is recommended that drivers only return error codes
|
|
||||||
* from their resume methods in case of an unrecoverable failure (i.e. when the
|
|
||||||
* device being handled refuses to resume and becomes unusable) to allow us to
|
|
||||||
* modify the PM core in the future, so that it can avoid attempting to handle
|
|
||||||
* devices that failed to resume and their children.
|
|
||||||
*
|
|
||||||
* It is allowed to unregister devices while the above callbacks are being
|
|
||||||
* executed. However, it is not allowed to unregister a device from within any
|
|
||||||
* of its own callbacks.
|
|
||||||
*/
|
|
||||||
|
|
||||||
struct pm_ops {
|
|
||||||
int (*prepare)(struct device *dev);
|
|
||||||
void (*complete)(struct device *dev);
|
|
||||||
int (*suspend)(struct device *dev);
|
|
||||||
int (*resume)(struct device *dev);
|
|
||||||
int (*freeze)(struct device *dev);
|
|
||||||
int (*thaw)(struct device *dev);
|
|
||||||
int (*poweroff)(struct device *dev);
|
|
||||||
int (*restore)(struct device *dev);
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* struct pm_ext_ops - extended device PM callbacks
|
|
||||||
*
|
|
||||||
* Some devices require certain operations related to suspend and hibernation
|
|
||||||
* to be carried out with interrupts disabled. Thus, 'struct pm_ext_ops' below
|
|
||||||
* is defined, adding callbacks to be executed with interrupts disabled to
|
|
||||||
* 'struct pm_ops'.
|
|
||||||
*
|
|
||||||
* The following callbacks included in 'struct pm_ext_ops' are executed with
|
|
||||||
* the nonboot CPUs switched off and with interrupts disabled on the only
|
|
||||||
* functional CPU. They also are executed with the PM core list of devices
|
|
||||||
* locked, so they must NOT unregister any devices.
|
|
||||||
*
|
|
||||||
* @suspend_noirq: Complete the operations of ->suspend() by carrying out any
|
* @suspend_noirq: Complete the operations of ->suspend() by carrying out any
|
||||||
* actions required for suspending the device that need interrupts to be
|
* actions required for suspending the device that need interrupts to be
|
||||||
* disabled
|
* disabled
|
||||||
|
@ -190,18 +150,32 @@ struct pm_ops {
|
||||||
* actions required for restoring the operations of the device that need
|
* actions required for restoring the operations of the device that need
|
||||||
* interrupts to be disabled
|
* interrupts to be disabled
|
||||||
*
|
*
|
||||||
* All of the above callbacks return error codes, but the error codes returned
|
* All of the above callbacks, except for @complete(), return error codes.
|
||||||
* by the resume operations, @resume_noirq(), @thaw_noirq(), and
|
* However, the error codes returned by the resume operations, @resume(),
|
||||||
* @restore_noirq(), do not cause the PM core to abort the resume transition
|
* @thaw(), @restore(), @resume_noirq(), @thaw_noirq(), and @restore_noirq() do
|
||||||
* during which they are returned. The error codes returned in that cases are
|
* not cause the PM core to abort the resume transition during which they are
|
||||||
* only printed by the PM core to the system logs for debugging purposes.
|
* returned. The error codes returned in that cases are only printed by the PM
|
||||||
* Still, as stated above, it is recommended that drivers only return error
|
* core to the system logs for debugging purposes. Still, it is recommended
|
||||||
* codes from their resume methods if the device being handled fails to resume
|
* that drivers only return error codes from their resume methods in case of an
|
||||||
* and is not usable any more.
|
* unrecoverable failure (i.e. when the device being handled refuses to resume
|
||||||
|
* and becomes unusable) to allow us to modify the PM core in the future, so
|
||||||
|
* that it can avoid attempting to handle devices that failed to resume and
|
||||||
|
* their children.
|
||||||
|
*
|
||||||
|
* It is allowed to unregister devices while the above callbacks are being
|
||||||
|
* executed. However, it is not allowed to unregister a device from within any
|
||||||
|
* of its own callbacks.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
struct pm_ext_ops {
|
struct dev_pm_ops {
|
||||||
struct pm_ops base;
|
int (*prepare)(struct device *dev);
|
||||||
|
void (*complete)(struct device *dev);
|
||||||
|
int (*suspend)(struct device *dev);
|
||||||
|
int (*resume)(struct device *dev);
|
||||||
|
int (*freeze)(struct device *dev);
|
||||||
|
int (*thaw)(struct device *dev);
|
||||||
|
int (*poweroff)(struct device *dev);
|
||||||
|
int (*restore)(struct device *dev);
|
||||||
int (*suspend_noirq)(struct device *dev);
|
int (*suspend_noirq)(struct device *dev);
|
||||||
int (*resume_noirq)(struct device *dev);
|
int (*resume_noirq)(struct device *dev);
|
||||||
int (*freeze_noirq)(struct device *dev);
|
int (*freeze_noirq)(struct device *dev);
|
||||||
|
|
Loading…
Reference in a new issue