PM / Runtime: Lenient generic runtime pm callbacks

ohadbc · rjwysocki · commit 05aa55dddb9e · 2010-10-17T01:57:41.000+02:00
Allow drivers, that belong to subsystems which use the generic
runtime pm callbacks, not to define runtime pm suspend/resume handlers,
by implicitly assuming success in such cases.

This is needed to eliminate nop handlers that would otherwise be
necessary by drivers which enable runtime pm, but don't need
to do anything when their devices are runtime-suspended/resumed.

Signed-off-by: Ohad Ben-Cohen &lt;ohad@wizery.com&gt;
Acked-by: Kevin Hilman &lt;khilman@deeprootsystems.com&gt;
Acked-by: Mark Brown &lt;broonie@opensource.wolfsonmicro.com&gt;
Signed-off-by: Rafael J. Wysocki &lt;rjw@sisk.pl&gt;
diff --git a/drivers/base/power/generic_ops.c b/drivers/base/power/generic_ops.c
@@ -46,7 +46,7 @@ int pm_generic_runtime_suspend(struct device *dev)
 	const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
 	int ret;
 
-	ret = pm && pm->runtime_suspend ? pm->runtime_suspend(dev) : -EINVAL;
+	ret = pm && pm->runtime_suspend ? pm->runtime_suspend(dev) : 0;
 
 	return ret;
 }
@@ -65,7 +65,7 @@ int pm_generic_runtime_resume(struct device *dev)
 	const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
 	int ret;
 
-	ret = pm && pm->runtime_resume ? pm->runtime_resume(dev) : -EINVAL;
+	ret = pm && pm->runtime_resume ? pm->runtime_resume(dev) : 0;
 
 	return ret;
 }

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ int pm_generic_runtime_suspend(struct device *dev)`
`46`	`46`	`const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;`
`47`	`47`	`int ret;`
`48`	`48`
`49`		`- ret = pm && pm->runtime_suspend ? pm->runtime_suspend(dev) : -EINVAL;`
	`49`	`+ ret = pm && pm->runtime_suspend ? pm->runtime_suspend(dev) : 0;`
`50`	`50`
`51`	`51`	`return ret;`
`52`	`52`	`}`
`@@ -65,7 +65,7 @@ int pm_generic_runtime_resume(struct device *dev)`
`65`	`65`	`const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;`
`66`	`66`	`int ret;`
`67`	`67`
`68`		`- ret = pm && pm->runtime_resume ? pm->runtime_resume(dev) : -EINVAL;`
	`68`	`+ ret = pm && pm->runtime_resume ? pm->runtime_resume(dev) : 0;`
`69`	`69`
`70`	`70`	`return ret;`
`71`	`71`	`}`