Unverified Commit dd769f15 authored by Minghao Chi's avatar Minghao Chi Committed by Mark Brown
Browse files

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: default avatarZeal Robot <zealci@zte.com.cn>
Signed-off-by: default avatarMinghao Chi <chi.minghao@zte.com.cn>
Link: https://lore.kernel.org/r/20220418110226.2559081-1-chi.minghao@zte.com.cn


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 79422ed9

drivers/spi/spi.c

+2 −4
Original line number Diff line number Diff line
@@ -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;