spi: spi-imx: using pm_runtime_resume_and_get instead of pm_runtime_get_sync
authorMinghao Chi <chi.minghao@zte.com.cn>
Thu, 14 Apr 2022 08:53:42 +0000 (08:53 +0000)
committerMark Brown <broonie@kernel.org>
Mon, 25 Apr 2022 13:00:58 +0000 (14:00 +0100)
Using pm_runtime_resume_and_get() to replace pm_runtime_get_sync and
pm_runtime_put_noidle. This change is just to simplify the code, no
actual functional changes.

Reported-by: Zeal Robot <zealci@zte.com.cn>
Signed-off-by: Minghao Chi <chi.minghao@zte.com.cn>
Link: https://lore.kernel.org/r/20220414085343.2541608-1-chi.minghao@zte.com.cn
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi-imx.c

index 4e1bfe2f043acbd3b48002f361850394df117bfb..733e40e71ee6efc397e0185fee9dbb12a5087a63 100644 (file)
@@ -1572,9 +1572,8 @@ spi_imx_prepare_message(struct spi_master *master, struct spi_message *msg)
        struct spi_imx_data *spi_imx = spi_master_get_devdata(master);
        int ret;
 
-       ret = pm_runtime_get_sync(spi_imx->dev);
+       ret = pm_runtime_resume_and_get(spi_imx->dev);
        if (ret < 0) {
-               pm_runtime_put_noidle(spi_imx->dev);
                dev_err(spi_imx->dev, "failed to enable clock\n");
                return ret;
        }
@@ -1793,9 +1792,8 @@ static int spi_imx_remove(struct platform_device *pdev)
 
        spi_bitbang_stop(&spi_imx->bitbang);
 
-       ret = pm_runtime_get_sync(spi_imx->dev);
+       ret = pm_runtime_resume_and_get(spi_imx->dev);
        if (ret < 0) {
-               pm_runtime_put_noidle(spi_imx->dev);
                dev_err(spi_imx->dev, "failed to enable clock\n");
                return ret;
        }