diff options
author | Shubhrajyoti Datta <shubhrajyoti.datta@xilinx.com> | 2016-04-05 14:07:53 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-04-05 14:51:10 -0400 |
commit | 2198b7483d4a89cf2cc710045c76a76dba573ea5 (patch) | |
tree | 340c2b3066e3c643349fbe81950a5efbb30620c3 | |
parent | d36ccd9f7ea41f343391a15677b8a858376e1107 (diff) |
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>
-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) | |||
621 | { | 621 | { |
622 | struct platform_device *pdev = to_platform_device(dev); | 622 | struct platform_device *pdev = to_platform_device(dev); |
623 | struct spi_master *master = platform_get_drvdata(pdev); | 623 | struct spi_master *master = platform_get_drvdata(pdev); |
624 | struct cdns_spi *xspi = spi_master_get_devdata(master); | ||
625 | 624 | ||
626 | spi_master_suspend(master); | 625 | spi_master_suspend(master); |
627 | 626 | ||
628 | clk_disable_unprepare(xspi->ref_clk); | ||
629 | |||
630 | clk_disable_unprepare(xspi->pclk); | ||
631 | |||
632 | return 0; | 627 | return 0; |
633 | } | 628 | } |
634 | 629 | ||
@@ -644,21 +639,7 @@ static int __maybe_unused cdns_spi_resume(struct device *dev) | |||
644 | { | 639 | { |
645 | struct platform_device *pdev = to_platform_device(dev); | 640 | struct platform_device *pdev = to_platform_device(dev); |
646 | struct spi_master *master = platform_get_drvdata(pdev); | 641 | struct spi_master *master = platform_get_drvdata(pdev); |
647 | struct cdns_spi *xspi = spi_master_get_devdata(master); | ||
648 | int ret = 0; | ||
649 | |||
650 | ret = clk_prepare_enable(xspi->pclk); | ||
651 | if (ret) { | ||
652 | dev_err(dev, "Cannot enable APB clock.\n"); | ||
653 | return ret; | ||
654 | } | ||
655 | 642 | ||
656 | ret = clk_prepare_enable(xspi->ref_clk); | ||
657 | if (ret) { | ||
658 | dev_err(dev, "Cannot enable device clock.\n"); | ||
659 | clk_disable(xspi->pclk); | ||
660 | return ret; | ||
661 | } | ||
662 | spi_master_resume(master); | 643 | spi_master_resume(master); |
663 | 644 | ||
664 | return 0; | 645 | return 0; |