openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

i2c: Factor out runtime suspend checks from PM operations 

When devices use dev_pm_ops the I2C API is implementing standard functionality
for integration with runtime PM and for checking for the presence of a per
device op. The PM core provides pm_generic_ functions implementing this
behaviour - use them to reduce coupling with future PM updates.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
This commit is contained in:
Mark Brown 2011-01-14 22:03:49 +01:00 committed by Jean Delvare
parent 5219bf884b
commit d529de2994
1 changed files with 20 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
drivers/i2c/i2c-core.c
View File

@ -196,88 +196,60 @@ static int i2c_device_pm_suspend(struct device *dev)
{ {
const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL; const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
if (pm) { if (pm)
if (pm_runtime_suspended(dev)) return pm_generic_suspend(dev);
return 0; else
else return i2c_legacy_suspend(dev, PMSG_SUSPEND);
return pm->suspend ? pm->suspend(dev) : 0;
}
return i2c_legacy_suspend(dev, PMSG_SUSPEND);
} }
static int i2c_device_pm_resume(struct device *dev) static int i2c_device_pm_resume(struct device *dev)
{ {
const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL; const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
int ret;
if (pm) if (pm)
ret = pm->resume ? pm->resume(dev) : 0; return pm_generic_resume(dev);
else else
ret = i2c_legacy_resume(dev); return i2c_legacy_resume(dev);
return ret;
} }
static int i2c_device_pm_freeze(struct device *dev) static int i2c_device_pm_freeze(struct device *dev)
{ {
const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL; const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
if (pm) { if (pm)
if (pm_runtime_suspended(dev)) return pm_generic_freeze(dev);
return 0; else
else return i2c_legacy_suspend(dev, PMSG_FREEZE);
return pm->freeze ? pm->freeze(dev) : 0;
}
return i2c_legacy_suspend(dev, PMSG_FREEZE);
} }
static int i2c_device_pm_thaw(struct device *dev) static int i2c_device_pm_thaw(struct device *dev)
{ {
const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL; const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
if (pm) { if (pm)
if (pm_runtime_suspended(dev)) return pm_generic_thaw(dev);
return 0; else
else return i2c_legacy_resume(dev);
return pm->thaw ? pm->thaw(dev) : 0;
}
return i2c_legacy_resume(dev);
} }
static int i2c_device_pm_poweroff(struct device *dev) static int i2c_device_pm_poweroff(struct device *dev)
{ {
const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL; const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
if (pm) { if (pm)
if (pm_runtime_suspended(dev)) return pm_generic_poweroff(dev);
return 0; else
else return i2c_legacy_suspend(dev, PMSG_HIBERNATE);
return pm->poweroff ? pm->poweroff(dev) : 0;
}
return i2c_legacy_suspend(dev, PMSG_HIBERNATE);
} }
static int i2c_device_pm_restore(struct device *dev) static int i2c_device_pm_restore(struct device *dev)
{ {
const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL; const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
int ret;
if (pm) if (pm)
ret = pm->restore ? pm->restore(dev) : 0; return pm_generic_restore(dev);
else else
ret = i2c_legacy_resume(dev); return i2c_legacy_resume(dev);
if (!ret) {
pm_runtime_disable(dev);
pm_runtime_set_active(dev);
pm_runtime_enable(dev);
}
return ret;
} }
#else /* !CONFIG_PM_SLEEP */ #else /* !CONFIG_PM_SLEEP */
#define i2c_device_pm_suspend NULL #define i2c_device_pm_suspend NULL