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

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

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

drivers/i2c/busses/i2c-tegra.c

+3 −6
Original line number Original line Diff line number Diff line
@@ -713,7 +713,7 @@ static int __devexit tegra_i2c_remove(struct platform_device *pdev) 
}

}





#ifdef CONFIG_PM

#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);

	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;

	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);

	struct tegra_i2c_dev *i2c_dev = dev_get_drvdata(dev);

	int ret;

	int ret;
@@ -745,10 +745,7 @@ static int tegra_i2c_resume_noirq(struct device *dev) 
	return 0;

	return 0;

}

}





static const struct dev_pm_ops tegra_i2c_pm = {

static SIMPLE_DEV_PM_OPS(tegra_i2c_pm, tegra_i2c_suspend, tegra_i2c_resume);

	.suspend_noirq = tegra_i2c_suspend_noirq,

	.resume_noirq = tegra_i2c_resume_noirq,

};

#define TEGRA_I2C_PM	(&tegra_i2c_pm)

#define TEGRA_I2C_PM	(&tegra_i2c_pm)

#else

#else

#define TEGRA_I2C_PM	NULL

#define TEGRA_I2C_PM	NULL