Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

PNP: convert PNP driver bus legacy pm_ops to dev_pm_ops

Browse source 
Convert drivers/pnp/driver.c bus legacy pm_ops to dev_pm_ops using
existing suspend and resume routines.  Add freeze interface to
handle PM_EVENT_FREEZE correctly with dev_pm_ops.  pm_op() looks for
freeze interface when the event is PM_EVENT_FREEZE.

Signed-off-by: Shuah Khan <shuah.kh@samsung.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Shuah Khan 2013-07-26 15:07:26 -06:00 committed by Rafael J. Wysocki
parent 3b2f64d00c
commit eaf140b60e
1 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
drivers/pnp/driver.c
View file

@ -154,7 +154,7 @@ static int pnp_bus_match(struct device *dev, struct device_driver *drv)
return 1; return 1;
} }
static int pnp_bus_suspend(struct device *dev, pm_message_t state) static int __pnp_bus_suspend(struct device *dev, pm_message_t state)
{ {
struct pnp_dev *pnp_dev = to_pnp_dev(dev); struct pnp_dev *pnp_dev = to_pnp_dev(dev);
struct pnp_driver *pnp_drv = pnp_dev->driver; struct pnp_driver *pnp_drv = pnp_dev->driver;
@ -180,6 +180,16 @@ static int pnp_bus_suspend(struct device *dev, pm_message_t state)
return 0; return 0;
} }
static int pnp_bus_suspend(struct device *dev)
{
return __pnp_bus_suspend(dev, PMSG_SUSPEND);
}
static int pnp_bus_freeze(struct device *dev)
{
return __pnp_bus_suspend(dev, PMSG_FREEZE);
}
static int pnp_bus_resume(struct device *dev) static int pnp_bus_resume(struct device *dev)
{ {
struct pnp_dev *pnp_dev = to_pnp_dev(dev); struct pnp_dev *pnp_dev = to_pnp_dev(dev);
@ -210,14 +220,19 @@ static int pnp_bus_resume(struct device *dev)
return 0; return 0;
} }
static const struct dev_pm_ops pnp_bus_dev_pm_ops = {
.suspend = pnp_bus_suspend,
.freeze = pnp_bus_freeze,
.resume = pnp_bus_resume,
};
struct bus_type pnp_bus_type = { struct bus_type pnp_bus_type = {
.name = "pnp", .name = "pnp",
.match = pnp_bus_match, .match = pnp_bus_match,
.probe = pnp_device_probe, .probe = pnp_device_probe,
.remove = pnp_device_remove, .remove = pnp_device_remove,
.shutdown = pnp_device_shutdown, .shutdown = pnp_device_shutdown,
.suspend = pnp_bus_suspend, .pm = &pnp_bus_dev_pm_ops,
.resume = pnp_bus_resume,
.dev_attrs = pnp_interface_attrs, .dev_attrs = pnp_interface_attrs,
}; };