@@ -459,7 +459,7 @@ static int atmel_qspi_exec_op(struct spi_mem *mem, const struct spi_mem_op *op)
pm_runtime_put:
pm_runtime_mark_last_busy(&aq->pdev->dev);
- pm_runtime_put_autosuspend(&aq->pdev->dev);
+ __pm_runtime_put_autosuspend(&aq->pdev->dev);
return err;
}
@@ -506,7 +506,7 @@ static int atmel_qspi_setup(struct spi_device *spi)
atmel_qspi_write(aq->scr, aq, QSPI_SCR);
pm_runtime_mark_last_busy(ctrl->dev.parent);
- pm_runtime_put_autosuspend(ctrl->dev.parent);
+ __pm_runtime_put_autosuspend(ctrl->dev.parent);
return 0;
}
@@ -568,7 +568,7 @@ static int atmel_qspi_set_cs_timing(struct spi_device *spi)
atmel_qspi_write(aq->mr, aq, QSPI_MR);
pm_runtime_mark_last_busy(ctrl->dev.parent);
- pm_runtime_put_autosuspend(ctrl->dev.parent);
+ __pm_runtime_put_autosuspend(ctrl->dev.parent);
return 0;
}
@@ -713,7 +713,7 @@ static int atmel_qspi_probe(struct platform_device *pdev)
goto disable_qspick;
}
pm_runtime_mark_last_busy(&pdev->dev);
- pm_runtime_put_autosuspend(&pdev->dev);
+ __pm_runtime_put_autosuspend(&pdev->dev);
return 0;
@@ -801,7 +801,7 @@ static int __maybe_unused atmel_qspi_resume(struct device *dev)
atmel_qspi_write(aq->scr, aq, QSPI_SCR);
pm_runtime_mark_last_busy(dev);
- pm_runtime_put_autosuspend(dev);
+ __pm_runtime_put_autosuspend(dev);
return 0;
}
@@ -1443,7 +1443,7 @@ static int cqspi_exec_mem_op(struct spi_mem *mem, const struct spi_mem_op *op)
ret = cqspi_mem_process(mem, op);
pm_runtime_mark_last_busy(dev);
- pm_runtime_put_autosuspend(dev);
+ __pm_runtime_put_autosuspend(dev);
if (ret)
dev_err(&mem->spi->dev, "operation failed with %d\n", ret);
@@ -1936,7 +1936,7 @@ static int cqspi_probe(struct platform_device *pdev)
}
pm_runtime_mark_last_busy(dev);
- pm_runtime_put_autosuspend(dev);
+ __pm_runtime_put_autosuspend(dev);
return 0;
probe_setup_failed:
@@ -663,7 +663,7 @@ static int cdns_spi_probe(struct platform_device *pdev)
ctlr->max_speed_hz = xspi->clk_rate / 4;
xspi->speed_hz = ctlr->max_speed_hz;
pm_runtime_mark_last_busy(&pdev->dev);
- pm_runtime_put_autosuspend(&pdev->dev);
+ __pm_runtime_put_autosuspend(&pdev->dev);
} else {
ctlr->mode_bits |= SPI_NO_CS;
ctlr->target_abort = cdns_target_abort;
@@ -140,7 +140,7 @@ static int dw_spi_pci_probe(struct pci_dev *pdev, const struct pci_device_id *en
pm_runtime_set_autosuspend_delay(&pdev->dev, 1000);
pm_runtime_use_autosuspend(&pdev->dev);
- pm_runtime_put_autosuspend(&pdev->dev);
+ __pm_runtime_put_autosuspend(&pdev->dev);
pm_runtime_allow(&pdev->dev);
return 0;
@@ -514,7 +514,7 @@ static int fsl_espi_setup(struct spi_device *spi)
fsl_espi_setup_transfer(spi, NULL);
pm_runtime_mark_last_busy(espi->dev);
- pm_runtime_put_autosuspend(espi->dev);
+ __pm_runtime_put_autosuspend(espi->dev);
return 0;
}
@@ -727,7 +727,7 @@ static int fsl_espi_probe(struct device *dev, struct resource *mem,
dev_info(dev, "irq = %u\n", irq);
pm_runtime_mark_last_busy(dev);
- pm_runtime_put_autosuspend(dev);
+ __pm_runtime_put_autosuspend(dev);
return 0;
@@ -234,7 +234,7 @@ static int lpspi_unprepare_xfer_hardware(struct spi_controller *controller)
spi_controller_get_devdata(controller);
pm_runtime_mark_last_busy(fsl_lpspi->dev);
- pm_runtime_put_autosuspend(fsl_lpspi->dev);
+ __pm_runtime_put_autosuspend(fsl_lpspi->dev);
return 0;
}
@@ -967,7 +967,7 @@ static int fsl_lpspi_probe(struct platform_device *pdev)
}
pm_runtime_mark_last_busy(fsl_lpspi->dev);
- pm_runtime_put_autosuspend(fsl_lpspi->dev);
+ __pm_runtime_put_autosuspend(fsl_lpspi->dev);
return 0;
@@ -1671,7 +1671,7 @@ spi_imx_prepare_message(struct spi_controller *controller, struct spi_message *m
ret = spi_imx->devtype_data->prepare_message(spi_imx, msg);
if (ret) {
pm_runtime_mark_last_busy(spi_imx->dev);
- pm_runtime_put_autosuspend(spi_imx->dev);
+ __pm_runtime_put_autosuspend(spi_imx->dev);
}
return ret;
@@ -1683,7 +1683,7 @@ spi_imx_unprepare_message(struct spi_controller *controller, struct spi_message
struct spi_imx_data *spi_imx = spi_controller_get_devdata(controller);
pm_runtime_mark_last_busy(spi_imx->dev);
- pm_runtime_put_autosuspend(spi_imx->dev);
+ __pm_runtime_put_autosuspend(spi_imx->dev);
return 0;
}
@@ -1856,7 +1856,7 @@ static int spi_imx_probe(struct platform_device *pdev)
}
pm_runtime_mark_last_busy(spi_imx->dev);
- pm_runtime_put_autosuspend(spi_imx->dev);
+ __pm_runtime_put_autosuspend(spi_imx->dev);
return ret;
@@ -919,7 +919,7 @@ static int mtk_nor_probe(struct platform_device *pdev)
goto err_probe;
pm_runtime_mark_last_busy(&pdev->dev);
- pm_runtime_put_autosuspend(&pdev->dev);
+ __pm_runtime_put_autosuspend(&pdev->dev);
dev_info(&pdev->dev, "spi frequency: %d Hz\n", sp->spi_freq);
@@ -272,7 +272,7 @@ static void omap2_mcspi_set_cs(struct spi_device *spi, bool enable)
mcspi_write_chconf0(spi, l);
pm_runtime_mark_last_busy(mcspi->dev);
- pm_runtime_put_autosuspend(mcspi->dev);
+ __pm_runtime_put_autosuspend(mcspi->dev);
}
}
@@ -1102,7 +1102,7 @@ static int omap2_mcspi_setup(struct spi_device *spi)
omap2_mcspi_cleanup(spi);
pm_runtime_mark_last_busy(mcspi->dev);
- pm_runtime_put_autosuspend(mcspi->dev);
+ __pm_runtime_put_autosuspend(mcspi->dev);
return ret;
}
@@ -1374,7 +1374,7 @@ static int omap2_mcspi_controller_setup(struct omap2_mcspi *mcspi)
omap2_mcspi_set_mode(ctlr);
pm_runtime_mark_last_busy(mcspi->dev);
- pm_runtime_put_autosuspend(mcspi->dev);
+ __pm_runtime_put_autosuspend(mcspi->dev);
return 0;
}
@@ -304,7 +304,7 @@ static int pxa2xx_spi_pci_probe(struct pci_dev *dev,
pm_runtime_set_autosuspend_delay(&dev->dev, 50);
pm_runtime_use_autosuspend(&dev->dev);
- pm_runtime_put_autosuspend(&dev->dev);
+ __pm_runtime_put_autosuspend(&dev->dev);
pm_runtime_allow(&dev->dev);
return 0;
@@ -1044,14 +1044,14 @@ static int s3c64xx_spi_setup(struct spi_device *spi)
}
pm_runtime_mark_last_busy(&sdd->pdev->dev);
- pm_runtime_put_autosuspend(&sdd->pdev->dev);
+ __pm_runtime_put_autosuspend(&sdd->pdev->dev);
s3c64xx_spi_set_cs(spi, false);
return 0;
setup_exit:
pm_runtime_mark_last_busy(&sdd->pdev->dev);
- pm_runtime_put_autosuspend(&sdd->pdev->dev);
+ __pm_runtime_put_autosuspend(&sdd->pdev->dev);
/* setup() returns with device de-selected */
s3c64xx_spi_set_cs(spi, false);
@@ -1383,7 +1383,7 @@ static int s3c64xx_spi_probe(struct platform_device *pdev)
mem_res, sdd->fifo_depth);
pm_runtime_mark_last_busy(&pdev->dev);
- pm_runtime_put_autosuspend(&pdev->dev);
+ __pm_runtime_put_autosuspend(&pdev->dev);
return 0;
@@ -983,7 +983,7 @@ static int sprd_spi_probe(struct platform_device *pdev)
goto err_rpm_put;
pm_runtime_mark_last_busy(&pdev->dev);
- pm_runtime_put_autosuspend(&pdev->dev);
+ __pm_runtime_put_autosuspend(&pdev->dev);
return 0;
@@ -469,7 +469,7 @@ static int stm32_qspi_poll_status(struct spi_mem *mem, const struct spi_mem_op *
mutex_unlock(&qspi->lock);
pm_runtime_mark_last_busy(qspi->dev);
- pm_runtime_put_autosuspend(qspi->dev);
+ __pm_runtime_put_autosuspend(qspi->dev);
return ret;
}
@@ -493,7 +493,7 @@ static int stm32_qspi_exec_op(struct spi_mem *mem, const struct spi_mem_op *op)
mutex_unlock(&qspi->lock);
pm_runtime_mark_last_busy(qspi->dev);
- pm_runtime_put_autosuspend(qspi->dev);
+ __pm_runtime_put_autosuspend(qspi->dev);
return ret;
}
@@ -549,7 +549,7 @@ static ssize_t stm32_qspi_dirmap_read(struct spi_mem_dirmap_desc *desc,
mutex_unlock(&qspi->lock);
pm_runtime_mark_last_busy(qspi->dev);
- pm_runtime_put_autosuspend(qspi->dev);
+ __pm_runtime_put_autosuspend(qspi->dev);
return ret ?: len;
}
@@ -633,7 +633,7 @@ static int stm32_qspi_transfer_one_message(struct spi_controller *ctrl,
spi_finalize_current_message(ctrl);
pm_runtime_mark_last_busy(qspi->dev);
- pm_runtime_put_autosuspend(qspi->dev);
+ __pm_runtime_put_autosuspend(qspi->dev);
return ret;
}
@@ -690,7 +690,7 @@ static int stm32_qspi_setup(struct spi_device *spi)
mutex_unlock(&qspi->lock);
pm_runtime_mark_last_busy(qspi->dev);
- pm_runtime_put_autosuspend(qspi->dev);
+ __pm_runtime_put_autosuspend(qspi->dev);
return 0;
}
@@ -864,7 +864,7 @@ static int stm32_qspi_probe(struct platform_device *pdev)
goto err_pm_runtime_free;
pm_runtime_mark_last_busy(dev);
- pm_runtime_put_autosuspend(dev);
+ __pm_runtime_put_autosuspend(dev);
return 0;
@@ -944,7 +944,7 @@ static int __maybe_unused stm32_qspi_resume(struct device *dev)
writel_relaxed(qspi->dcr_reg, qspi->io_base + QSPI_DCR);
pm_runtime_mark_last_busy(dev);
- pm_runtime_put_autosuspend(dev);
+ __pm_runtime_put_autosuspend(dev);
return 0;
}
@@ -2233,7 +2233,7 @@ static int stm32_spi_probe(struct platform_device *pdev)
}
pm_runtime_mark_last_busy(&pdev->dev);
- pm_runtime_put_autosuspend(&pdev->dev);
+ __pm_runtime_put_autosuspend(&pdev->dev);
dev_info(&pdev->dev, "driver initialized (%s mode)\n",
STM32_SPI_HOST_MODE(spi) ? "host" : "device");
@@ -2342,7 +2342,7 @@ static int __maybe_unused stm32_spi_resume(struct device *dev)
spi->cfg->config(spi);
pm_runtime_mark_last_busy(dev);
- pm_runtime_put_autosuspend(dev);
+ __pm_runtime_put_autosuspend(dev);
return 0;
}
@@ -159,7 +159,7 @@ static int ti_qspi_setup(struct spi_device *spi)
}
pm_runtime_mark_last_busy(qspi->dev);
- ret = pm_runtime_put_autosuspend(qspi->dev);
+ ret = __pm_runtime_put_autosuspend(qspi->dev);
if (ret < 0) {
dev_err(qspi->dev, "pm_runtime_put_autosuspend() failed\n");
return ret;
@@ -196,7 +196,7 @@ static void ti_qspi_setup_clk(struct ti_qspi *qspi, u32 speed_hz)
}
pm_runtime_mark_last_busy(qspi->dev);
- pm_runtime_put_autosuspend(qspi->dev);
+ __pm_runtime_put_autosuspend(qspi->dev);
}
static void ti_qspi_restore_ctx(struct ti_qspi *qspi)
@@ -1345,7 +1345,7 @@ static int zynqmp_qspi_probe(struct platform_device *pdev)
}
pm_runtime_mark_last_busy(&pdev->dev);
- pm_runtime_put_autosuspend(&pdev->dev);
+ __pm_runtime_put_autosuspend(&pdev->dev);
return 0;
@@ -1726,7 +1726,7 @@ static void spi_idle_runtime_pm(struct spi_controller *ctlr)
{
if (ctlr->auto_runtime_pm) {
pm_runtime_mark_last_busy(ctlr->dev.parent);
- pm_runtime_put_autosuspend(ctlr->dev.parent);
+ __pm_runtime_put_autosuspend(ctlr->dev.parent);
}
}
@@ -3860,7 +3860,7 @@ static int spi_set_cs_timing(struct spi_device *spi)
status = spi->controller->set_cs_timing(spi);
pm_runtime_mark_last_busy(parent);
- pm_runtime_put_autosuspend(parent);
+ __pm_runtime_put_autosuspend(parent);
} else {
status = spi->controller->set_cs_timing(spi);
}
@@ -3995,7 +3995,7 @@ int spi_setup(struct spi_device *spi)
spi_set_cs(spi, false, true);
pm_runtime_mark_last_busy(spi->controller->dev.parent);
- pm_runtime_put_autosuspend(spi->controller->dev.parent);
+ __pm_runtime_put_autosuspend(spi->controller->dev.parent);
} else {
spi_set_cs(spi, false, true);
}
pm_runtime_put_autosuspend() will soon be changed to include a call to pm_runtime_mark_last_busy(). This patch switches the current users to __pm_runtime_put_autosuspend() which will continue to have the functionality of old pm_runtime_put_autosuspend(). Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> --- drivers/spi/atmel-quadspi.c | 10 +++++----- drivers/spi/spi-cadence-quadspi.c | 4 ++-- drivers/spi/spi-cadence.c | 2 +- drivers/spi/spi-dw-pci.c | 2 +- drivers/spi/spi-fsl-espi.c | 4 ++-- drivers/spi/spi-fsl-lpspi.c | 4 ++-- drivers/spi/spi-imx.c | 6 +++--- drivers/spi/spi-mtk-nor.c | 2 +- drivers/spi/spi-omap2-mcspi.c | 6 +++--- drivers/spi/spi-pxa2xx-pci.c | 2 +- drivers/spi/spi-s3c64xx.c | 6 +++--- drivers/spi/spi-sprd.c | 2 +- drivers/spi/spi-stm32-qspi.c | 14 +++++++------- drivers/spi/spi-stm32.c | 4 ++-- drivers/spi/spi-ti-qspi.c | 4 ++-- drivers/spi/spi-zynqmp-gqspi.c | 2 +- drivers/spi/spi.c | 6 +++--- 17 files changed, 40 insertions(+), 40 deletions(-)