spi: s3c64xx: simplify suspend / resume handlers

PATCH RESEND In review Heiner Kallweit 1 participant 1 message Aug 21, 2015

Subsystems (3)

SPI Arm Samsung Exynos Samsung SPI drivers

lore

Share & tools

lore

Heiner Kallweit

author

2015-08-21 17:31 UTC #0 lore raw

PATCH RESEND v2 3/4 spi: s3c64xx: simplify suspend / resume handlers

The runtime PM suspend / resume handlers take care of the enabling/ disabling the clocks already. Therefore replace the duplicated clock handling with pm_runtime_force_suspend/resume.

Signed-off-by Heiner Kallweit <[email protected]>

Reviewed-by Krzysztof Kozlowski <[email protected]>

---
Changed:
- Replaced pm_runtime_suspend/resume calls with their .._force_.. equivalents.
v2:
- Added "Reviewed-by"

 drivers/spi/spi-s3c64xx.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

drivers/spi/spi-s3c64xx.c +7 -8

index edeac06..735b7f5 100644
@@ -1246,10 +1246,9 @@ static int s3c64xx_spi_suspend(struct device *dev)
 	if (ret)
 		return ret;
 
-	if (!pm_runtime_suspended(dev)) {
-		clk_disable_unprepare(sdd->clk);
-		clk_disable_unprepare(sdd->src_clk);
-	}
+	ret = pm_runtime_force_suspend(dev);
+	if (ret < 0)
+		return ret;
 
 	sdd->cur_speed = 0; /* Output Clock is stopped */

@@ -1261,14 +1260,14 @@ static int s3c64xx_spi_resume(struct device *dev)
 	struct spi_master *master = dev_get_drvdata(dev);
 	struct s3c64xx_spi_driver_data *sdd = spi_master_get_devdata(master);
 	struct s3c64xx_spi_info *sci = sdd->cntrlr_info;
+	int ret;
 
 	if (sci->cfg_gpio)
 		sci->cfg_gpio();
 
-	if (!pm_runtime_suspended(dev)) {
-		clk_prepare_enable(sdd->src_clk);
-		clk_prepare_enable(sdd->clk);
-	}
+	ret = pm_runtime_force_resume(dev);
+	if (ret < 0)
+		return ret;
 
 	s3c64xx_spi_hwinit(sdd, sdd->port_id);

Signature · 1 line

2.5.0