diff options
author | Heiner Kallweit <hkallweit1@gmail.com> | 2015-09-03 22:40:53 +0200 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-09-14 18:57:32 +0100 |
commit | 8ebe9d163e93e10458f3fd7522f29f9149e58632 (patch) | |
tree | 94849db97db1c1fd8fb653cc5bc7c51b28ec4d6c /drivers/spi/spi-s3c64xx.c | |
parent | 4fcd9b9e06d43b93d00bf02c767d578e7cf8b25c (diff) | |
download | linux-stable-8ebe9d163e93e10458f3fd7522f29f9149e58632.tar.gz linux-stable-8ebe9d163e93e10458f3fd7522f29f9149e58632.tar.bz2 linux-stable-8ebe9d163e93e10458f3fd7522f29f9149e58632.zip |
spi: s3c64xx: replace clock disabling with runtime PM suspend call in remove function
Simplify s3c64xx_spi_remove by replacing the clock disabling with calling
runtime PM suspend which does the same.
Waking up the device if it was suspended wouldn't be strictly needed
for this driver but using pm_runtime_get_sync is cleaner and makes
s3c64xx_spi_remove more consistent with the runtime PM handling in
s3c64xx_spi_setup.
pm_runtime_force_suspend does most of the work for us:
disabling the clocks, disabling runtime PM and setting it to
"suspended" state.
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi/spi-s3c64xx.c')
-rw-r--r-- | drivers/spi/spi-s3c64xx.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c index 4e5931cabfa2..dee82e1ae65d 100644 --- a/drivers/spi/spi-s3c64xx.c +++ b/drivers/spi/spi-s3c64xx.c @@ -1225,7 +1225,7 @@ static int s3c64xx_spi_remove(struct platform_device *pdev) struct spi_master *master = spi_master_get(platform_get_drvdata(pdev)); struct s3c64xx_spi_driver_data *sdd = spi_master_get_devdata(master); - pm_runtime_disable(&pdev->dev); + pm_runtime_get_sync(&pdev->dev); writel(0, sdd->regs + S3C64XX_SPI_INT_EN); @@ -1233,6 +1233,10 @@ static int s3c64xx_spi_remove(struct platform_device *pdev) clk_disable_unprepare(sdd->clk); + pm_runtime_put_noidle(&pdev->dev); + pm_runtime_disable(&pdev->dev); + pm_runtime_set_suspended(&pdev->dev); + return 0; } |