Commit 5db20c49 authored by Wolfram Sang's avatar Wolfram Sang

Revert "i2c: tegra: convert normal suspend/resume to *_noirq"

This reverts commit 7c86d44c.
Stephen says:

IIRC, I proposed it before solely to solve some suspend/resume ordering
issues, and Colin Cross NAKd it. These days, deferred probe should make
this change unnecessary.
Reported-by: default avatarStephen Warren <swarren@wwwdotorg.org>
Signed-off-by: default avatarWolfram Sang <w.sang@pengutronix.de>
parent b61d1575
......@@ -713,7 +713,7 @@ static int __devexit tegra_i2c_remove(struct platform_device *pdev)
}
#ifdef CONFIG_PM
static int tegra_i2c_suspend_noirq(struct device *dev)
static int tegra_i2c_suspend(struct device *dev)
{
struct tegra_i2c_dev *i2c_dev = dev_get_drvdata(dev);
......@@ -724,7 +724,7 @@ static int tegra_i2c_suspend_noirq(struct device *dev)
return 0;
}
static int tegra_i2c_resume_noirq(struct device *dev)
static int tegra_i2c_resume(struct device *dev)
{
struct tegra_i2c_dev *i2c_dev = dev_get_drvdata(dev);
int ret;
......@@ -745,10 +745,7 @@ static int tegra_i2c_resume_noirq(struct device *dev)
return 0;
}
static const struct dev_pm_ops tegra_i2c_pm = {
.suspend_noirq = tegra_i2c_suspend_noirq,
.resume_noirq = tegra_i2c_resume_noirq,
};
static SIMPLE_DEV_PM_OPS(tegra_i2c_pm, tegra_i2c_suspend, tegra_i2c_resume);
#define TEGRA_I2C_PM (&tegra_i2c_pm)
#else
#define TEGRA_I2C_PM NULL
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment