Skip to contentSkip to conversation

pinctrl: imx: Switch to LATE_SYSTEM_SLEEP_PM_OPS()

PATCH In review Fabio Estevam 4 participants 4 messages Aug 8, 2024 – Aug 23, 2024

Subsystems (4)
Arm i.MX and Layerscape GPIO Pin control Pin controller - Freescale
lore
Share & tools
lore

Fabio Estevam

author maintainer
#0 lore raw

PATCH v3 1/1 pinctrl: imx: Switch to LATE_SYSTEM_SLEEP_PM_OPS()

From: Fabio Estevam <[email protected]>

Replace SET_LATE_SYSTEM_SLEEP_PM_OPS() with its modern LATE_SYSTEM_SLEEP_PM_OPS() alternative.

The combined usage of pm_sleep_ptr() and LATE_SYSTEM_SLEEP_PM_OPS() allows the compiler to evaluate if the runtime suspend/resume() functions are used at build time or are simply dead code.

This allows removing the __maybe_unused notation from the runtime suspend/resume() functions.

Signed-off-by Fabio Estevam <[email protected]>

---
Changes since v2:
- Use pm_sleep_ptr() (Peng).

 drivers/pinctrl/freescale/pinctrl-imx.c    | 7 +++----
 drivers/pinctrl/freescale/pinctrl-imx8mq.c | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)
drivers/pinctrl/freescale/pinctrl-imx.c +3 -4
index 9c2680df082c..d05c2c478e79 100644
@@ -804,14 +804,14 @@ int imx_pinctrl_probe(struct platform_device *pdev,
 }
 EXPORT_SYMBOL_GPL(imx_pinctrl_probe);
 
-static int __maybe_unused imx_pinctrl_suspend(struct device *dev)
+static int imx_pinctrl_suspend(struct device *dev)
 {
 	struct imx_pinctrl *ipctl = dev_get_drvdata(dev);
 
 	return pinctrl_force_sleep(ipctl->pctl);
 }
 
-static int __maybe_unused imx_pinctrl_resume(struct device *dev)
+static int imx_pinctrl_resume(struct device *dev)
 {
 	struct imx_pinctrl *ipctl = dev_get_drvdata(dev);
 

@@ -819,8 +819,7 @@ static int __maybe_unused imx_pinctrl_resume(struct device *dev)
 }
 
 const struct dev_pm_ops imx_pinctrl_pm_ops = {
-	SET_LATE_SYSTEM_SLEEP_PM_OPS(imx_pinctrl_suspend,
-					imx_pinctrl_resume)
+	LATE_SYSTEM_SLEEP_PM_OPS(imx_pinctrl_suspend, imx_pinctrl_resume)
 };
 EXPORT_SYMBOL_GPL(imx_pinctrl_pm_ops);
drivers/pinctrl/freescale/pinctrl-imx8mq.c +1 -1
index 529eebe46298..e59e4fc80193 100644
@@ -341,7 +341,7 @@ static struct platform_driver imx8mq_pinctrl_driver = {
 	.driver = {
 		.name = "imx8mq-pinctrl",
 		.of_match_table = imx8mq_pinctrl_of_match,
-		.pm = &imx_pinctrl_pm_ops,
+		.pm = pm_sleep_ptr(&imx_pinctrl_pm_ops),
 		.suppress_bind_attrs = true,
 	},
 	.probe = imx8mq_pinctrl_probe,
Signature · 1 line
2.34.1
Reviewed-by on v3 1/1
#1 lore raw
Quoted 13 lines

Subject: [PATCH v3] pinctrl: imx: Switch to
LATE_SYSTEM_SLEEP_PM_OPS()

From: Fabio Estevam <[email protected]>

Replace SET_LATE_SYSTEM_SLEEP_PM_OPS() with its modern LATE_SYSTEM_SLEEP_PM_OPS() alternative.

The combined usage of pm_sleep_ptr() and LATE_SYSTEM_SLEEP_PM_OPS() allows the compiler to evaluate if the runtime suspend/resume() functions are used at build time or are simply dead code.

Quoted 5 lines

This allows removing the __maybe_unused notation from the runtime suspend/resume() functions.

Signed-off-by Fabio Estevam <[email protected]>

---

Reviewed-by Peng Fan <[email protected]>
#2 lore raw
In reply to Fabio Estevam
Quoted 5 lines · Fabio Estevam

From: Fabio Estevam <[email protected]>

Replace SET_LATE_SYSTEM_SLEEP_PM_OPS() with its modern LATE_SYSTEM_SLEEP_PM_OPS() alternative.

Quoted 8 lines

The combined usage of pm_sleep_ptr() and LATE_SYSTEM_SLEEP_PM_OPS() allows the compiler to evaluate if the runtime suspend/resume() functions are used at build time or are simply dead code.

This allows removing the __maybe_unused notation from the runtime suspend/resume() functions.

Signed-off-by Fabio Estevam <[email protected]>

Patch applied!

Yours,
Linus Walleij

#3 lore raw
In reply to Fabio Estevam
Quoted 11 lines · Fabio Estevam

From: Fabio Estevam <[email protected]>

Replace SET_LATE_SYSTEM_SLEEP_PM_OPS() with its modern LATE_SYSTEM_SLEEP_PM_OPS() alternative.

The combined usage of pm_sleep_ptr() and LATE_SYSTEM_SLEEP_PM_OPS() allows the compiler to evaluate if the runtime suspend/resume() functions are used at build time or are simply dead code.

This allows removing the __maybe_unused notation from the runtime suspend/resume() functions.

...

drivers/pinctrl/freescale/pinctrl-imx.c static int __maybe_unused imx_pinctrl_resume(struct device *dev) · line 824

Quoted 6 lines

const struct dev_pm_ops imx_pinctrl_pm_ops = {

drivers/pinctrl/freescale/pinctrl-imx.c +1 -2
-	SET_LATE_SYSTEM_SLEEP_PM_OPS(imx_pinctrl_suspend,
-					imx_pinctrl_resume)
+	LATE_SYSTEM_SLEEP_PM_OPS(imx_pinctrl_suspend, imx_pinctrl_resume)
 };
 EXPORT_SYMBOL_GPL(imx_pinctrl_pm_ops);

Can go even further

	EXPORT_GPL_DEV_PM_OPS(...) = {
		LATE_SYSTEM_SLEEP_PM_OPS(...)
	};
Signature · 2 lines
With Best Regards,
Andy Shevchenko