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

spi: spi-stm32-qspi: 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>
Reviewed-by: default avatarPatrice Chotard <patrice.chotard@foss.st.com>
Link: https://lore.kernel.org/r/20220412070906.2532091-1-chi.minghao@zte.com.cn


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

drivers/spi/spi-stm32-qspi.c

+10 −20
Original line number Diff line number Diff line
@@ -463,11 +463,9 @@ static int stm32_qspi_poll_status(struct spi_mem *mem, const struct spi_mem_op * 
	if (!spi_mem_supports_op(mem, op))

		return -EOPNOTSUPP;



	ret = pm_runtime_get_sync(qspi->dev);

	if (ret < 0) {

		pm_runtime_put_noidle(qspi->dev);

	ret = pm_runtime_resume_and_get(qspi->dev);

	if (ret < 0)

		return ret;

	}



	mutex_lock(&qspi->lock);
@@ -490,11 +488,9 @@ static int stm32_qspi_exec_op(struct spi_mem *mem, const struct spi_mem_op *op) 
	struct stm32_qspi *qspi = spi_controller_get_devdata(mem->spi->master);

	int ret;



	ret = pm_runtime_get_sync(qspi->dev);

	if (ret < 0) {

		pm_runtime_put_noidle(qspi->dev);

	ret = pm_runtime_resume_and_get(qspi->dev);

	if (ret < 0)

		return ret;

	}



	mutex_lock(&qspi->lock);

	if (op->data.dir == SPI_MEM_DATA_IN && op->data.nbytes)
@@ -536,11 +532,9 @@ static ssize_t stm32_qspi_dirmap_read(struct spi_mem_dirmap_desc *desc, 
	u32 addr_max;

	int ret;



	ret = pm_runtime_get_sync(qspi->dev);

	if (ret < 0) {

		pm_runtime_put_noidle(qspi->dev);

	ret = pm_runtime_resume_and_get(qspi->dev);

	if (ret < 0)

		return ret;

	}



	mutex_lock(&qspi->lock);

	/* make a local copy of desc op_tmpl and complete dirmap rdesc
@@ -583,11 +577,9 @@ static int stm32_qspi_setup(struct spi_device *spi) 
	if (!spi->max_speed_hz)

		return -EINVAL;



	ret = pm_runtime_get_sync(qspi->dev);

	if (ret < 0) {

		pm_runtime_put_noidle(qspi->dev);

	ret = pm_runtime_resume_and_get(qspi->dev);

	if (ret < 0)

		return ret;

	}



	presc = DIV_ROUND_UP(qspi->clk_rate, spi->max_speed_hz) - 1;
@@ -851,11 +843,9 @@ static int __maybe_unused stm32_qspi_resume(struct device *dev) 


	pinctrl_pm_select_default_state(dev);



	ret = pm_runtime_get_sync(dev);

	if (ret < 0) {

		pm_runtime_put_noidle(dev);

	ret = pm_runtime_resume_and_get(dev);

	if (ret < 0)

		return ret;

	}



	writel_relaxed(qspi->cr_reg, qspi->io_base + QSPI_CR);

	writel_relaxed(qspi->dcr_reg, qspi->io_base + QSPI_DCR);