[PATCH] usb: cdns3: imx: simplify system pm using _force_suspend/_resume

Shenwei Wang shenwei.wang at nxp.com
Thu Jul 25 14:28:11 PDT 2024


By utilizing _force_suspend and _force_resume, ensures a more consistent
and simple approach to handling system sleep states. It also aligns the
driver's PM behavior with the other drivers' common practices.

Fixes: db3c4e366287 ("usb: cdns3: imx: Rework system PM to avoid duplicated operations")
Reviewed-by: Frank Li <frank.li at nxp.com>
Signed-off-by: Shenwei Wang <shenwei.wang at nxp.com>
---
 drivers/usb/cdns3/cdns3-imx.c | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/drivers/usb/cdns3/cdns3-imx.c b/drivers/usb/cdns3/cdns3-imx.c
index 281de47e2a3b..9051cbe9d68b 100644
--- a/drivers/usb/cdns3/cdns3-imx.c
+++ b/drivers/usb/cdns3/cdns3-imx.c
@@ -360,7 +360,6 @@ static int cdns_imx_suspend(struct device *dev)
 	return 0;
 }
 
-
 /* Indicate if the controller was power lost before */
 static inline bool cdns_imx_is_power_lost(struct cdns_imx *data)
 {
@@ -373,22 +372,18 @@ static inline bool cdns_imx_is_power_lost(struct cdns_imx *data)
 		return false;
 }
 
-static int __maybe_unused cdns_imx_system_suspend(struct device *dev)
-{
-	pm_runtime_put_sync(dev);
-	return 0;
-}
-
 static int __maybe_unused cdns_imx_system_resume(struct device *dev)
 {
 	struct cdns_imx *data = dev_get_drvdata(dev);
 	int ret;
 
+	ret = pm_runtime_force_resume(dev);
+	if (ret)
+		return ret;
+
 	ret = pm_runtime_resume_and_get(dev);
-	if (ret < 0) {
-		dev_err(dev, "Could not get runtime PM.\n");
+	if (ret)
 		return ret;
-	}
 
 	if (cdns_imx_is_power_lost(data)) {
 		dev_dbg(dev, "resume from power lost\n");
@@ -397,6 +392,7 @@ static int __maybe_unused cdns_imx_system_resume(struct device *dev)
 			cdns_imx_suspend(dev);
 	}
 
+	pm_runtime_put_autosuspend(dev);
 	return ret;
 }
 
@@ -411,7 +407,7 @@ static int cdns_imx_platform_suspend(struct device *dev,
 
 static const struct dev_pm_ops cdns_imx_pm_ops = {
 	SET_RUNTIME_PM_OPS(cdns_imx_suspend, cdns_imx_resume, NULL)
-	SET_SYSTEM_SLEEP_PM_OPS(cdns_imx_system_suspend, cdns_imx_system_resume)
+	SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, cdns_imx_system_resume)
 };
 
 static const struct of_device_id cdns_imx_of_match[] = {
-- 
2.34.1




More information about the linux-arm-kernel mailing list