diff options
| author | Thierry Reding <treding@nvidia.com> | 2020-04-30 13:31:58 +0200 |
|---|---|---|
| committer | Thierry Reding <treding@nvidia.com> | 2020-05-07 11:45:45 +0200 |
| commit | 78ad73421831247e46c31899a7bead02740e4bef (patch) | |
| tree | 21a419225932d1a4b2d387842955f6d26572642c /drivers/i2c/busses/i2c-tegra.c | |
| parent | Linux 5.7-rc4 (diff) | |
| download | linux-78ad73421831247e46c31899a7bead02740e4bef.tar.xz linux-78ad73421831247e46c31899a7bead02740e4bef.zip | |
Revert "i2c: tegra: Fix suspending in active runtime PM state"
This reverts commit 9f42de8d4ec2304f10bbc51dc0484f3503d61196.
It's not safe to use pm_runtime_force_{suspend,resume}(), especially
during the noirq phase of suspend. See also the guidance provided in
commit 1e2ef05bb8cf ("PM: Limit race conditions between runtime PM
and system sleep (v2)").
Signed-off-by: Thierry Reding <treding@nvidia.com>
Diffstat (limited to 'drivers/i2c/busses/i2c-tegra.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-tegra.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c index 4c4d17ddc96b..7c88611c732c 100644 --- a/drivers/i2c/busses/i2c-tegra.c +++ b/drivers/i2c/busses/i2c-tegra.c @@ -1769,14 +1769,9 @@ static int tegra_i2c_remove(struct platform_device *pdev) static int __maybe_unused tegra_i2c_suspend(struct device *dev) { struct tegra_i2c_dev *i2c_dev = dev_get_drvdata(dev); - int err; i2c_mark_adapter_suspended(&i2c_dev->adapter); - err = pm_runtime_force_suspend(dev); - if (err < 0) - return err; - return 0; } @@ -1797,10 +1792,6 @@ static int __maybe_unused tegra_i2c_resume(struct device *dev) if (err) return err; - err = pm_runtime_force_resume(dev); - if (err < 0) - return err; - i2c_mark_adapter_resumed(&i2c_dev->adapter); return 0; |