[PATCH 05/20] usb/cdns3: core: Use pm_ptr() macro

Paul Cercueil paul at crapouillou.net
Thu Sep 3 21:25:39 AEST 2020


Use the newly introduced pm_ptr() macro, and mark the suspend/resume
functions __maybe_unused. These functions can then be moved outside the
CONFIG_PM_SUSPEND block, and the compiler can then process them and
detect build failures independently of the config. If unused, they will
simply be discarded by the compiler.

Signed-off-by: Paul Cercueil <paul at crapouillou.net>
---
 drivers/usb/cdns3/core.c | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/drivers/usb/cdns3/core.c b/drivers/usb/cdns3/core.c
index 5c1586ec7824..dacab9e9ef92 100644
--- a/drivers/usb/cdns3/core.c
+++ b/drivers/usb/cdns3/core.c
@@ -546,9 +546,7 @@ static int cdns3_remove(struct platform_device *pdev)
 	return 0;
 }
 
-#ifdef CONFIG_PM_SLEEP
-
-static int cdns3_suspend(struct device *dev)
+static int __maybe_unused cdns3_suspend(struct device *dev)
 {
 	struct cdns3 *cdns = dev_get_drvdata(dev);
 	unsigned long flags;
@@ -568,7 +566,7 @@ static int cdns3_suspend(struct device *dev)
 	return 0;
 }
 
-static int cdns3_resume(struct device *dev)
+static int __maybe_unused cdns3_resume(struct device *dev)
 {
 	struct cdns3 *cdns = dev_get_drvdata(dev);
 	unsigned long flags;
@@ -588,11 +586,8 @@ static int cdns3_resume(struct device *dev)
 
 	return 0;
 }
-#endif
 
-static const struct dev_pm_ops cdns3_pm_ops = {
-	SET_SYSTEM_SLEEP_PM_OPS(cdns3_suspend, cdns3_resume)
-};
+static SIMPLE_DEV_PM_OPS(cdns3_pm_ops, cdns3_suspend, cdns3_resume);
 
 #ifdef CONFIG_OF
 static const struct of_device_id of_cdns3_match[] = {
@@ -608,7 +603,7 @@ static struct platform_driver cdns3_driver = {
 	.driver		= {
 		.name	= "cdns-usb3",
 		.of_match_table	= of_match_ptr(of_cdns3_match),
-		.pm	= &cdns3_pm_ops,
+		.pm	= pm_ptr(&cdns3_pm_ops),
 	},
 };
 
-- 
2.28.0



More information about the openbmc mailing list