[PATCH] Revert "i2c-omap: fix static suspend vs. runtime suspend"

[PATCH] Revert "i2c-omap: fix static suspend vs. runtime suspend"

[Kevin Hilman]

This reverts commit adf6e07922255937c8bfeea777d19502b4c9a2be.

Remove system PM methods which can race with runtime PM methods.

Also, as of v3.1, the PM domain level code for OMAP handles device
power state transistions automatically for devices, so calling them
from

Signed-off-by: Kevin Hilman <khilman-l0cyMroinI0@public.gmane.org>
---
Ben, with your ack, I'll queue this up with a couple other fixes to
this driver for v3.1-rc.  Thanks.

 drivers/i2c/busses/i2c-omap.c |   29 -----------------------------
 1 files changed, 0 insertions(+), 29 deletions(-)

diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index 84df53f..e854be0 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -1148,41 +1148,12 @@ omap_i2c_remove(struct platform_device *pdev)
 	return 0;
 }
 
-#ifdef CONFIG_SUSPEND
-static int omap_i2c_suspend(struct device *dev)
-{
-	if (!pm_runtime_suspended(dev))
-		if (dev->bus && dev->bus->pm && dev->bus->pm->runtime_suspend)
-			dev->bus->pm->runtime_suspend(dev);
-
-	return 0;
-}
-
-static int omap_i2c_resume(struct device *dev)
-{
-	if (!pm_runtime_suspended(dev))
-		if (dev->bus && dev->bus->pm && dev->bus->pm->runtime_resume)
-			dev->bus->pm->runtime_resume(dev);
-
-	return 0;
-}
-
-static struct dev_pm_ops omap_i2c_pm_ops = {
-	.suspend = omap_i2c_suspend,
-	.resume = omap_i2c_resume,
-};
-#define OMAP_I2C_PM_OPS (&omap_i2c_pm_ops)
-#else
-#define OMAP_I2C_PM_OPS NULL
-#endif
-
 static struct platform_driver omap_i2c_driver = {
 	.probe		= omap_i2c_probe,
 	.remove		= omap_i2c_remove,
 	.driver		= {
 		.name	= "omap_i2c",
 		.owner	= THIS_MODULE,
-		.pm	= OMAP_I2C_PM_OPS,
 	},
 };
 
-- 
1.7.6

Re: [PATCH] Revert "i2c-omap: fix static suspend vs. runtime suspend"

[Felipe Balbi]

[-- Attachment #1: Type: text/plain, Size: 411 bytes --]

On Wed, Aug 03, 2011 at 10:59:39AM -0700, Kevin Hilman wrote:
> This reverts commit adf6e07922255937c8bfeea777d19502b4c9a2be.
> 
> Remove system PM methods which can race with runtime PM methods.
> 
> Also, as of v3.1, the PM domain level code for OMAP handles device
> power state transistions automatically for devices, so calling them
> from

from where ? I didn't quite get this ;-)

-- 
balbi

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 490 bytes --]

Re: [PATCH] Revert "i2c-omap: fix static suspend vs. runtime suspend"

[Kevin Hilman]

Felipe Balbi <balbi@ti.com> writes:

> On Wed, Aug 03, 2011 at 10:59:39AM -0700, Kevin Hilman wrote:
>> This reverts commit adf6e07922255937c8bfeea777d19502b4c9a2be.
>> 
>> Remove system PM methods which can race with runtime PM methods.
>> 
>> Also, as of v3.1, the PM domain level code for OMAP handles device
>> power state transistions automatically for devices, so calling them
>> from
>
> from where ? I didn't quite get this ;-)

heh, looks like i got distracted before finishing the changelog.   Will
respin.

Thanks,

Kevin