diff options
| author | Brian King <brking@linux.vnet.ibm.com> | 2010-05-14 12:04:41 +0000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-05-21 17:31:09 +1000 |
| commit | a1263c71448aa70afb6097fdedf93c3dff5a7a15 (patch) | |
| tree | 241a4f88e7a09a769c29ff62f99b4ee9cff7a025 | |
| parent | e62cee42e66dcca83aae02748535f62e0f564a0c (diff) | |
| download | kernel_samsung_crespo-a1263c71448aa70afb6097fdedf93c3dff5a7a15.zip kernel_samsung_crespo-a1263c71448aa70afb6097fdedf93c3dff5a7a15.tar.gz kernel_samsung_crespo-a1263c71448aa70afb6097fdedf93c3dff5a7a15.tar.bz2 | |
powerpc/vio: Switch VIO Bus PM to use generic helpers
Switch to use the generic power management helpers.
Signed-off-by: Brian King <brking@linux.vnet.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
| -rw-r--r-- | arch/powerpc/kernel/vio.c | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/arch/powerpc/kernel/vio.c b/arch/powerpc/kernel/vio.c index b8e311d..9ce7b62 100644 --- a/arch/powerpc/kernel/vio.c +++ b/arch/powerpc/kernel/vio.c @@ -1381,29 +1381,6 @@ static int vio_hotplug(struct device *dev, struct kobj_uevent_env *env) return 0; } -static int vio_pm_suspend(struct device *dev) -{ - const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL; - - if (pm && pm->suspend) - return pm->suspend(dev); - return 0; -} - -static int vio_pm_resume(struct device *dev) -{ - const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL; - - if (pm && pm->resume) - return pm->resume(dev); - return 0; -} - -const struct dev_pm_ops vio_dev_pm_ops = { - .suspend = vio_pm_suspend, - .resume = vio_pm_resume, -}; - static struct bus_type vio_bus_type = { .name = "vio", .dev_attrs = vio_dev_attrs, @@ -1411,7 +1388,7 @@ static struct bus_type vio_bus_type = { .match = vio_bus_match, .probe = vio_bus_probe, .remove = vio_bus_remove, - .pm = &vio_dev_pm_ops, + .pm = GENERIC_SUBSYS_PM_OPS, }; /** |