Skip to contentSkip to conversation

pinctrl: imx: Switch to LATE_SYSTEM_SLEEP_PM_OPS()

PATCH Superseded Fabio Estevam 1 participant 1 message Aug 7, 2024

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

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Fabio Estevam

author maintainer
#0 lore raw

PATCH 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_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]>
---
 drivers/pinctrl/freescale/pinctrl-imx.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)
drivers/pinctrl/freescale/pinctrl-imx.c +4 -5
index 9c2680df082c..c83e866d78e9 100644
@@ -772,7 +772,7 @@ int imx_pinctrl_probe(struct platform_device *pdev,
 	imx_pinctrl_desc->pins = info->pins;
 	imx_pinctrl_desc->npins = info->npins;
 	imx_pinctrl_desc->pctlops = &imx_pctrl_ops;
-	imx_pinctrl_desc->pmxops = &imx_pmx_ops;
+	imx_pinctrl_desc->pmxops = pm_ptr(&imx_pmx_ops);
 	imx_pinctrl_desc->confops = &imx_pinconf_ops;
 	imx_pinctrl_desc->owner = THIS_MODULE;
 

@@ -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);
Signature · 1 line
2.34.1