From: Axel Lin <axel.lin@ingics.com>
Date: Wed, 5 Mar 2014 07:19:09 +0000 (+0800)
Subject: spi: sirf: Add missing spi_master_{resume,suspend} calls to PM callbacks
X-Git-Tag: MMI-PSA29.97-13-9~12508^2~2^7
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a82ba3a318dd5eaf1f3dcbc335f81770d557a4fc;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

spi: sirf: Add missing spi_master_{resume,suspend} calls to PM callbacks

This is required since commit 2025172e3280 "spi/bitbang: Use core message pump".
spi-bitbang now uses core message pump, so it needs to call spi_master_suspend/
spi_master_resume to stop/start the queue while suspend/resume.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
---

diff --git a/drivers/spi/spi-sirf.c b/drivers/spi/spi-sirf.c
index a72b8f87a156..1a77ad52812f 100644
--- a/drivers/spi/spi-sirf.c
+++ b/drivers/spi/spi-sirf.c
@@ -748,6 +748,11 @@ static int spi_sirfsoc_suspend(struct device *dev)
 {
 	struct spi_master *master = dev_get_drvdata(dev);
 	struct sirfsoc_spi *sspi = spi_master_get_devdata(master);
+	int ret;
+
+	ret = spi_master_suspend(master);
+	if (ret)
+		return ret;
 
 	clk_disable(sspi->clk);
 	return 0;
@@ -764,7 +769,7 @@ static int spi_sirfsoc_resume(struct device *dev)
 	writel(SIRFSOC_SPI_FIFO_START, sspi->base + SIRFSOC_SPI_RXFIFO_OP);
 	writel(SIRFSOC_SPI_FIFO_START, sspi->base + SIRFSOC_SPI_TXFIFO_OP);
 
-	return 0;
+	return spi_master_resume(master);
 }
 #endif