Hi On 4/12/22 09:09, cgel.zte@xxxxxxxxx wrote: > From: Minghao Chi <chi.minghao@xxxxxxxxxx> > > Using pm_runtime_resume_and_get is more appropriate > for simplifing code > > Reported-by: Zeal Robot <zealci@xxxxxxxxxx> > Signed-off-by: Minghao Chi <chi.minghao@xxxxxxxxxx> > --- > drivers/spi/spi-stm32-qspi.c | 30 ++++++++++-------------------- > 1 file changed, 10 insertions(+), 20 deletions(-) > > diff --git a/drivers/spi/spi-stm32-qspi.c b/drivers/spi/spi-stm32-qspi.c > index ffdc55f87e82..b3586521d08e 100644 > --- a/drivers/spi/spi-stm32-qspi.c > +++ b/drivers/spi/spi-stm32-qspi.c > @@ -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); Reviewed-by: Patrice Chotard <patrice.chotard@xxxxxxxxxxx> Thanks Patrice