Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 584b408d authored by Kevin Hilman's avatar Kevin Hilman Committed by Ben Dooks
Browse files

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



This reverts commit adf6e079.

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 drivers no
longer need to specifically call the bus/pm_domain methods themselves.

Signed-off-by: default avatarKevin Hilman <khilman@ti.com>
Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
parent 4b723a47

drivers/i2c/busses/i2c-omap.c

+0 −29
Original line number Original line Diff line number Diff line
@@ -1139,41 +1139,12 @@ omap_i2c_remove(struct platform_device *pdev) 
	return 0;

	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 = {

static struct platform_driver omap_i2c_driver = {

	.probe		= omap_i2c_probe,

	.probe		= omap_i2c_probe,

	.remove		= omap_i2c_remove,

	.remove		= omap_i2c_remove,

	.driver		= {

	.driver		= {

		.name	= "omap_i2c",

		.name	= "omap_i2c",

		.owner	= THIS_MODULE,

		.owner	= THIS_MODULE,

		.pm	= OMAP_I2C_PM_OPS,

	},

	},

};

};