Skip to contentSkip to conversation

powerpc: Add power management support to VIO bus

PATCH Superseded Brian King 2 participants 3 messages May 10, 2010 – May 14, 2010 PowerPC

lore
Share & tools
lore

Brian King

author
#0 lore raw

PATCH v2 2/3 powerpc: Add power management support to VIO bus

Adds support for suspend/resume for VIO devices. This is needed for support for HMC initiated hibernation.

---

 arch/powerpc/kernel/vio.c |    1 +
 1 file changed, 1 insertion(+)
arch/powerpc/kernel/vio.c renamed from arch/powerpc/kernel/vio.c~powerpc_vio_bus_pm +1 -0
diff -puN arch/powerpc/kernel/vio.c~powerpc_vio_bus_pm arch/powerpc/kernel/vio.c
@@ -1365,6 +1365,7 @@ static struct bus_type vio_bus_type = {
 	.match = vio_bus_match,
 	.probe = vio_bus_probe,
 	.remove = vio_bus_remove,
+	.pm = GENERIC_SUBSYS_PM_OPS,
 };
 
 /**

_

#1 lore raw
Quoted 2 lines · Brian King

Adds support for suspend/resume for VIO devices. This is needed for support for HMC initiated hibernation.

Your previous version of that patch is already in powerpc-next. Please make a new patch against it.

Cheers,
Ben.

Quoted 18 lines

---

 arch/powerpc/kernel/vio.c |    1 +
 1 file changed, 1 insertion(+)

diff -puN arch/powerpc/kernel/vio.c~powerpc_vio_bus_pm arch/powerpc/kernel/vio.c

arch/powerpc/kernel/vio.c renamed from arch/powerpc/kernel/vio.c~powerpc_vio_bus_pm +1 -0
@@ -1365,6 +1365,7 @@ static struct bus_type vio_bus_type = {
 	.match = vio_bus_match,
 	.probe = vio_bus_probe,
 	.remove = vio_bus_remove,
+	.pm = GENERIC_SUBSYS_PM_OPS,
 };
 
 /**

_

author
#2 lore raw

PATCH v3 2/3 powerpc: Switch VIO Bus PM to use generic helpers

Switch to use the generic power management helpers.

---

 arch/powerpc/kernel/vio.c |   25 +------------------------
 1 file changed, 1 insertion(+), 24 deletions(-)
arch/powerpc/kernel/vio.c renamed from arch/powerpc/kernel/vio.c~powerpc_vio_bus_pm2 +1 -24
diff -puN arch/powerpc/kernel/vio.c~powerpc_vio_bus_pm2 arch/powerpc/kernel/vio.c
@@ -1381,29 +1381,6 @@ static int vio_hotplug(struct device *de
 	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,
 };
 
 /**

_