summaryrefslogtreecommitdiffstats
path: root/drivers/spi
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2018-05-18 10:30:08 -0700
committerMark Brown <broonie@kernel.org>2018-05-21 16:44:29 +0100
commitd073bfa56bb74128802f5ffd444721774e03ac6d (patch)
treec733a99d214564d8e0a538019c6e6f3307082a43 /drivers/spi
parent7e48e23a1f4a50f93ac1073f1326e0a73829b631 (diff)
downloadlinux-d073bfa56bb74128802f5ffd444721774e03ac6d.tar.bz2
spi: omap2-mcspi: Remove unnecessary pm_runtime_force_suspend()
Commit 5a686b2c9ed4 ("spi: omap2-mcspi: Idle hardware during suspend and resume") added calls for pm_runtime_force_suspend() and pm_runtime_force_resume() to make sure spi is idled between device_prepare() and device_complete(). But testing Linux next, I now noticed that we will get the following: spi_master spi0: Failed to power device: -13 Looking at things more turns out we can just remove this non-standard code. I was probably testing with some extra experimental patches earlier when I thought we need pm_runtime_force_suspend() and pm_runtime_force_resume(). Fixes: 5a686b2c9ed4 ("spi: omap2-mcspi: Idle hardware during suspend and resume") Signed-off-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/spi-omap2-mcspi.c22
1 files changed, 0 insertions, 22 deletions
diff --git a/drivers/spi/spi-omap2-mcspi.c b/drivers/spi/spi-omap2-mcspi.c
index 0d69cb96442c..6c628a54e946 100644
--- a/drivers/spi/spi-omap2-mcspi.c
+++ b/drivers/spi/spi-omap2-mcspi.c
@@ -1467,20 +1467,6 @@ MODULE_ALIAS("platform:omap2_mcspi");
#ifdef CONFIG_SUSPEND
static int omap2_mcspi_suspend_noirq(struct device *dev)
{
- int error;
-
- /*
- * Make sure device gets idled if other drivers call SPI
- * functions between device_prepare() and device_complete()
- */
- error = pm_runtime_force_suspend(dev);
- if (error < 0) {
- dev_err(dev, "%s: force suspend failed: %i\n",
- __func__, error);
-
- return error;
- }
-
return pinctrl_pm_select_sleep_state(dev);
}
@@ -1495,14 +1481,6 @@ static int omap2_mcspi_resume_noirq(struct device *dev)
dev_warn(mcspi->dev, "%s: failed to set pins: %i\n",
__func__, error);
- error = pm_runtime_force_resume(mcspi->dev);
- if (error < 0) {
- dev_warn(mcspi->dev, "%s: force resume failed: %i\n",
- __func__, error);
-
- return error;
- }
-
return 0;
}