Merge tag 'arm-dt-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[linux-2.6-microblaze.git] / drivers / spi / spi-tegra114.c

diff --git a/drivers/spi/spi-tegra114.c b/drivers/spi/spi-tegra114.c
index 8f34524..d9be80e 100644 (file)
--- a/drivers/spi/spi-tegra114.c
+++ b/drivers/spi/spi-tegra114.c
@@ -964,9 +964,8 @@ static int tegra_spi_setup(struct spi_device *spi)
                spi->controller_data = cdata;
        }
 
-       ret = pm_runtime_get_sync(tspi->dev);
+       ret = pm_runtime_resume_and_get(tspi->dev);
        if (ret < 0) {
-               pm_runtime_put_noidle(tspi->dev);
                dev_err(tspi->dev, "pm runtime failed, e = %d\n", ret);
                if (cdata)
                        tegra_spi_cleanup(spi);
@@ -1394,10 +1393,9 @@ static int tegra_spi_probe(struct platform_device *pdev)
                        goto exit_pm_disable;
        }
 
-       ret = pm_runtime_get_sync(&pdev->dev);
+       ret = pm_runtime_resume_and_get(&pdev->dev);
        if (ret < 0) {
                dev_err(&pdev->dev, "pm runtime get failed, e = %d\n", ret);
-               pm_runtime_put_noidle(&pdev->dev);
                goto exit_pm_disable;
        }
 
@@ -1476,9 +1474,8 @@ static int tegra_spi_resume(struct device *dev)
        struct tegra_spi_data *tspi = spi_master_get_devdata(master);
        int ret;
 
-       ret = pm_runtime_get_sync(dev);
+       ret = pm_runtime_resume_and_get(dev);
        if (ret < 0) {
-               pm_runtime_put_noidle(dev);
                dev_err(dev, "pm runtime failed, e = %d\n", ret);
                return ret;
        }