From 649237ccf440c1921a770435a708374faaa73ba5 Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Sat, 14 Oct 2023 12:40:26 -0400 Subject: [PATCH] Revert "spi: zynqmp-gqspi: fix clock imbalance on probe failure" This reverts commit 19f3d5d13b756b913be582a9e0d0afdeca9c397e. Reported issues with backport, revert for now. Signed-off-by: Sasha Levin --- drivers/spi/spi-zynqmp-gqspi.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/drivers/spi/spi-zynqmp-gqspi.c b/drivers/spi/spi-zynqmp-gqspi.c index 12d9c5d6b9e2..ed68e237314f 100644 --- a/drivers/spi/spi-zynqmp-gqspi.c +++ b/drivers/spi/spi-zynqmp-gqspi.c @@ -1197,9 +1197,9 @@ static int zynqmp_qspi_probe(struct platform_device *pdev) return 0; clk_dis_all: - pm_runtime_disable(&pdev->dev); - pm_runtime_put_noidle(&pdev->dev); + pm_runtime_put_sync(&pdev->dev); pm_runtime_set_suspended(&pdev->dev); + pm_runtime_disable(&pdev->dev); clk_disable_unprepare(xqspi->refclk); clk_dis_pclk: clk_disable_unprepare(xqspi->pclk); @@ -1223,15 +1223,11 @@ static int zynqmp_qspi_remove(struct platform_device *pdev) { struct zynqmp_qspi *xqspi = platform_get_drvdata(pdev); - pm_runtime_get_sync(&pdev->dev); - zynqmp_gqspi_write(xqspi, GQSPI_EN_OFST, 0x0); - - pm_runtime_disable(&pdev->dev); - pm_runtime_put_noidle(&pdev->dev); - pm_runtime_set_suspended(&pdev->dev); clk_disable_unprepare(xqspi->refclk); clk_disable_unprepare(xqspi->pclk); + pm_runtime_set_suspended(&pdev->dev); + pm_runtime_disable(&pdev->dev); return 0; }