diff options
| author |   Minghao Chi <chi.minghao@zte.com.cn> | 2022-04-18 11:02:26 +0000 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2022-04-19 13:13:50 +0100 |
| commit | dd769f15483cac1895fd219eb17e6f04c9a5548f (patch) | |
| tree | 3f2f980b94434e2042d6b3608125b80e79c0d39e /drivers/spi/spi.c | |
| parent | spi: spi-imx: add support for SPI_RX_CPHA_FLIP (diff) | |
| download | linux-dev-dd769f15483cac1895fd219eb17e6f04c9a5548f.tar.xz linux-dev-dd769f15483cac1895fd219eb17e6f04c9a5548f.zip | |
spi: using pm_runtime_resume_and_get instead of pm_runtime_get_sync
Using pm_runtime_resume_and_get is more appropriate
for simplifing code
Reported-by: Zeal Robot <zealci@zte.com.cn>
Signed-off-by: Minghao Chi <chi.minghao@zte.com.cn>
Link: https://lore.kernel.org/r/20220418110226.2559081-1-chi.minghao@zte.com.cn
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi/spi.c')
| -rw-r--r-- | drivers/spi/spi.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 82a2fe3d340e..136bd0e51ada 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -1611,9 +1611,8 @@ static void __spi_pump_messages(struct spi_controller *ctlr, bool in_kthread) mutex_lock(&ctlr->io_mutex); if (!was_busy && ctlr->auto_runtime_pm) { - ret = pm_runtime_get_sync(ctlr->dev.parent); + ret = pm_runtime_resume_and_get(ctlr->dev.parent); if (ret < 0) { - pm_runtime_put_noidle(ctlr->dev.parent); dev_err(&ctlr->dev, "Failed to power device: %d\n", ret); mutex_unlock(&ctlr->io_mutex); @@ -3548,10 +3547,9 @@ int spi_setup(struct spi_device *spi) } if (spi->controller->auto_runtime_pm && spi->controller->set_cs) { - status = pm_runtime_get_sync(spi->controller->dev.parent); + status = pm_runtime_resume_and_get(spi->controller->dev.parent); if (status < 0) { mutex_unlock(&spi->controller->io_mutex); - pm_runtime_put_noidle(spi->controller->dev.parent); dev_err(&spi->controller->dev, "Failed to power device: %d\n", status); return status; |