Skip to contentSkip to conversation

spi: s3c64xx: simplify suspend / resume handlers

PATCH RESEND In review Heiner Kallweit 2 participants 2 messages Aug 20, 2015 – Aug 21, 2015 1 message not in the archive

Subsystems (3)
SPI Arm Samsung Exynos Samsung SPI drivers
lore
Share & tools
lore

Heiner Kallweit

author
#0 lore raw

PATCH RESEND 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]>

---
Changed:
- Replaced pm_runtime_suspend/resume calls with their .._force_.. equivalents.

 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
Reviewed-by
#2 lore raw
In reply to a message not in the archive
Quoted 37 lines · Heiner Kallweit

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]>

---
Changed:
- Replaced pm_runtime_suspend/resume calls with their .._force_.. equivalents.

 drivers/spi/spi-s3c64xx.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)
drivers/spi/spi-s3c64xx.c +4 -4
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;

drivers/spi/spi-s3c64xx.c static int s3c64xx_spi_resume(struct device *dev) · line 1270

Quoted 10 lines
drivers/spi/spi-s3c64xx.c +3 -4
 	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;

The logic of resume is changed.
Previously if device was runtime suspended when sleeping then clocks would not be enabled during system resume.
Now device is always runtime suspended before and always runtime resumed after. So this is different... but I think it's right approach with current PM model:

Reviewed-by Krzysztof Kozlowski <[email protected]>

Best regards,
Krzysztof

drivers/spi/spi-s3c64xx.c static int s3c64xx_spi_resume(struct device *dev)

Quoted 4 lines
drivers/spi/spi-s3c64xx.c +0 -0
 	s3c64xx_spi_hwinit(sdd, sdd->port_id);

--
To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html