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@xxxxxxxxxxxxxxx> --- drivers/crypto/ccree/cc_pm.c | 2 +- drivers/crypto/hisilicon/qm.c | 2 +- drivers/crypto/omap-aes-gcm.c | 2 +- drivers/crypto/omap-aes.c | 2 +- drivers/crypto/omap-des.c | 2 +- drivers/crypto/omap-sham.c | 2 +- drivers/crypto/rockchip/rk3288_crypto_ahash.c | 2 +- drivers/crypto/rockchip/rk3288_crypto_skcipher.c | 2 +- drivers/crypto/stm32/stm32-crc32.c | 4 ++-- drivers/crypto/stm32/stm32-cryp.c | 2 +- drivers/crypto/stm32/stm32-hash.c | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/crypto/ccree/cc_pm.c b/drivers/crypto/ccree/cc_pm.c index 6124fbbbed94..e4b7eab2e143 100644 --- a/drivers/crypto/ccree/cc_pm.c +++ b/drivers/crypto/ccree/cc_pm.c @@ -78,5 +78,5 @@ int cc_pm_get(struct device *dev) void cc_pm_put_suspend(struct device *dev) { pm_runtime_mark_last_busy(dev); - pm_runtime_put_autosuspend(dev); + __pm_runtime_put_autosuspend(dev); } diff --git a/drivers/crypto/hisilicon/qm.c b/drivers/crypto/hisilicon/qm.c index 07983af9e3e2..13408c43fa20 100644 --- a/drivers/crypto/hisilicon/qm.c +++ b/drivers/crypto/hisilicon/qm.c @@ -840,7 +840,7 @@ static void qm_pm_put_sync(struct hisi_qm *qm) return; pm_runtime_mark_last_busy(dev); - pm_runtime_put_autosuspend(dev); + __pm_runtime_put_autosuspend(dev); } static void qm_cq_head_update(struct hisi_qp *qp) diff --git a/drivers/crypto/omap-aes-gcm.c b/drivers/crypto/omap-aes-gcm.c index c498950402e8..a5566268d928 100644 --- a/drivers/crypto/omap-aes-gcm.c +++ b/drivers/crypto/omap-aes-gcm.c @@ -39,7 +39,7 @@ static void omap_aes_gcm_finish_req(struct omap_aes_dev *dd, int ret) crypto_finalize_aead_request(dd->engine, req, ret); pm_runtime_mark_last_busy(dd->dev); - pm_runtime_put_autosuspend(dd->dev); + __pm_runtime_put_autosuspend(dd->dev); } static void omap_aes_gcm_done_task(struct omap_aes_dev *dd) diff --git a/drivers/crypto/omap-aes.c b/drivers/crypto/omap-aes.c index bad1adacbc84..bf0d953b8697 100644 --- a/drivers/crypto/omap-aes.c +++ b/drivers/crypto/omap-aes.c @@ -402,7 +402,7 @@ static void omap_aes_finish_req(struct omap_aes_dev *dd, int err) crypto_finalize_skcipher_request(dd->engine, req, err); pm_runtime_mark_last_busy(dd->dev); - pm_runtime_put_autosuspend(dd->dev); + __pm_runtime_put_autosuspend(dd->dev); } int omap_aes_crypt_dma_stop(struct omap_aes_dev *dd) diff --git a/drivers/crypto/omap-des.c b/drivers/crypto/omap-des.c index 209d3dc03a9b..156ef345e7fe 100644 --- a/drivers/crypto/omap-des.c +++ b/drivers/crypto/omap-des.c @@ -493,7 +493,7 @@ static void omap_des_finish_req(struct omap_des_dev *dd, int err) crypto_finalize_skcipher_request(dd->engine, req, err); pm_runtime_mark_last_busy(dd->dev); - pm_runtime_put_autosuspend(dd->dev); + __pm_runtime_put_autosuspend(dd->dev); } static int omap_des_crypt_dma_stop(struct omap_des_dev *dd) diff --git a/drivers/crypto/omap-sham.c b/drivers/crypto/omap-sham.c index 5bcd9ab0f72a..6b36a1abd371 100644 --- a/drivers/crypto/omap-sham.c +++ b/drivers/crypto/omap-sham.c @@ -1168,7 +1168,7 @@ static void omap_sham_finish_req(struct ahash_request *req, int err) BIT(FLAGS_DMA_READY) | BIT(FLAGS_OUTPUT_READY)); pm_runtime_mark_last_busy(dd->dev); - pm_runtime_put_autosuspend(dd->dev); + __pm_runtime_put_autosuspend(dd->dev); ctx->offset = 0; diff --git a/drivers/crypto/rockchip/rk3288_crypto_ahash.c b/drivers/crypto/rockchip/rk3288_crypto_ahash.c index 69d6019d8abc..0c9e1a7ee429 100644 --- a/drivers/crypto/rockchip/rk3288_crypto_ahash.c +++ b/drivers/crypto/rockchip/rk3288_crypto_ahash.c @@ -330,7 +330,7 @@ static int rk_hash_run(struct crypto_engine *engine, void *breq) } theend: - pm_runtime_put_autosuspend(rkc->dev); + __pm_runtime_put_autosuspend(rkc->dev); rk_hash_unprepare(engine, breq); diff --git a/drivers/crypto/rockchip/rk3288_crypto_skcipher.c b/drivers/crypto/rockchip/rk3288_crypto_skcipher.c index 9393e10671c2..8ed80ab982ed 100644 --- a/drivers/crypto/rockchip/rk3288_crypto_skcipher.c +++ b/drivers/crypto/rockchip/rk3288_crypto_skcipher.c @@ -413,7 +413,7 @@ static int rk_cipher_run(struct crypto_engine *engine, void *async_req) } theend: - pm_runtime_put_autosuspend(rkc->dev); + __pm_runtime_put_autosuspend(rkc->dev); local_bh_disable(); crypto_finalize_skcipher_request(engine, areq, err); diff --git a/drivers/crypto/stm32/stm32-crc32.c b/drivers/crypto/stm32/stm32-crc32.c index e0faddbf8990..366f8ed11b7f 100644 --- a/drivers/crypto/stm32/stm32-crc32.c +++ b/drivers/crypto/stm32/stm32-crc32.c @@ -139,7 +139,7 @@ static int stm32_crc_init(struct shash_desc *desc) spin_unlock_irqrestore(&crc->lock, flags); pm_runtime_mark_last_busy(crc->dev); - pm_runtime_put_autosuspend(crc->dev); + __pm_runtime_put_autosuspend(crc->dev); return 0; } @@ -209,7 +209,7 @@ static int burst_update(struct shash_desc *desc, const u8 *d8, pm_out: pm_runtime_mark_last_busy(crc->dev); - pm_runtime_put_autosuspend(crc->dev); + __pm_runtime_put_autosuspend(crc->dev); return 0; } diff --git a/drivers/crypto/stm32/stm32-cryp.c b/drivers/crypto/stm32/stm32-cryp.c index 937f6dab8955..c4f926925f03 100644 --- a/drivers/crypto/stm32/stm32-cryp.c +++ b/drivers/crypto/stm32/stm32-cryp.c @@ -852,7 +852,7 @@ static void stm32_cryp_finish_req(struct stm32_cryp *cryp, int err) stm32_cryp_get_iv(cryp); pm_runtime_mark_last_busy(cryp->dev); - pm_runtime_put_autosuspend(cryp->dev); + __pm_runtime_put_autosuspend(cryp->dev); if (is_gcm(cryp) || is_ccm(cryp)) crypto_finalize_aead_request(cryp->engine, cryp->areq, err); diff --git a/drivers/crypto/stm32/stm32-hash.c b/drivers/crypto/stm32/stm32-hash.c index 351827372ea6..0d4b8a491620 100644 --- a/drivers/crypto/stm32/stm32-hash.c +++ b/drivers/crypto/stm32/stm32-hash.c @@ -1374,7 +1374,7 @@ static void stm32_hash_unprepare_request(struct ahash_request *req) pm_runtime: pm_runtime_mark_last_busy(hdev->dev); - pm_runtime_put_autosuspend(hdev->dev); + __pm_runtime_put_autosuspend(hdev->dev); } static int stm32_hash_enqueue(struct ahash_request *req, unsigned int op) -- 2.39.5