diff options
author | Shubhrajyoti Datta <shubhrajyoti.datta@xilinx.com> | 2016-04-05 23:37:53 +0530 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-04-05 11:51:10 -0700 |
commit | 2198b7483d4a89cf2cc710045c76a76dba573ea5 (patch) | |
tree | 340c2b3066e3c643349fbe81950a5efbb30620c3 /drivers/spi/spi-cadence.c | |
parent | d36ccd9f7ea41f343391a15677b8a858376e1107 (diff) | |
download | linux-stable-2198b7483d4a89cf2cc710045c76a76dba573ea5.tar.gz linux-stable-2198b7483d4a89cf2cc710045c76a76dba573ea5.tar.bz2 linux-stable-2198b7483d4a89cf2cc710045c76a76dba573ea5.zip |
spi: cadence: Remove the clock enable and disable from suspend and resume
Now that the clocks are enabled and disabled per transaction
, remove the clock enable and disable from resume and suspend
hooks.
Signed-off-by: Shubhrajyoti Datta <shubhraj@xilinx.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi/spi-cadence.c')
-rw-r--r-- | drivers/spi/spi-cadence.c | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/drivers/spi/spi-cadence.c b/drivers/spi/spi-cadence.c index 3b94063b2823..d0cdd1801e9e 100644 --- a/drivers/spi/spi-cadence.c +++ b/drivers/spi/spi-cadence.c @@ -621,14 +621,9 @@ static int __maybe_unused cdns_spi_suspend(struct device *dev) { struct platform_device *pdev = to_platform_device(dev); struct spi_master *master = platform_get_drvdata(pdev); - struct cdns_spi *xspi = spi_master_get_devdata(master); spi_master_suspend(master); - clk_disable_unprepare(xspi->ref_clk); - - clk_disable_unprepare(xspi->pclk); - return 0; } @@ -644,21 +639,7 @@ static int __maybe_unused cdns_spi_resume(struct device *dev) { struct platform_device *pdev = to_platform_device(dev); struct spi_master *master = platform_get_drvdata(pdev); - struct cdns_spi *xspi = spi_master_get_devdata(master); - int ret = 0; - - ret = clk_prepare_enable(xspi->pclk); - if (ret) { - dev_err(dev, "Cannot enable APB clock.\n"); - return ret; - } - ret = clk_prepare_enable(xspi->ref_clk); - if (ret) { - dev_err(dev, "Cannot enable device clock.\n"); - clk_disable(xspi->pclk); - return ret; - } spi_master_resume(master); return 0; |