| Message ID | 20240807181033.77848-1-festevam@gmail.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v2] pinctrl: imx: Switch to LATE_SYSTEM_SLEEP_PM_OPS() | expand |
> Subject: [PATCH v2] pinctrl: imx: Switch to > LATE_SYSTEM_SLEEP_PM_OPS() > > From: Fabio Estevam <festevam@denx.de> > > 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 <festevam@denx.de> > --- > Changes since v1: > - Pass pm_ptr() to the correct ops structure. > > drivers/pinctrl/freescale/pinctrl-imx.c | 7 +++---- > drivers/pinctrl/freescale/pinctrl-imx8mq.c | 2 +- > 2 files changed, 4 insertions(+), 5 deletions(-) > > diff --git a/drivers/pinctrl/freescale/pinctrl-imx.c > b/drivers/pinctrl/freescale/pinctrl-imx.c > index 9c2680df082c..d05c2c478e79 100644 > --- a/drivers/pinctrl/freescale/pinctrl-imx.c > +++ b/drivers/pinctrl/freescale/pinctrl-imx.c > @@ -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); > > diff --git a/drivers/pinctrl/freescale/pinctrl-imx8mq.c > b/drivers/pinctrl/freescale/pinctrl-imx8mq.c > index 529eebe46298..316469e72a17 100644 > --- a/drivers/pinctrl/freescale/pinctrl-imx8mq.c > +++ b/drivers/pinctrl/freescale/pinctrl-imx8mq.c > @@ -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_ptr(&imx_pinctrl_pm_ops), I see other pinctrl drivers are using pm_sleep_ptr, pm_sleep_ptr is better here? Thanks, Peng. > .suppress_bind_attrs = true, > }, > .probe = imx8mq_pinctrl_probe, > -- > 2.34.1 >
diff --git a/drivers/pinctrl/freescale/pinctrl-imx.c b/drivers/pinctrl/freescale/pinctrl-imx.c index 9c2680df082c..d05c2c478e79 100644 --- a/drivers/pinctrl/freescale/pinctrl-imx.c +++ b/drivers/pinctrl/freescale/pinctrl-imx.c @@ -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); diff --git a/drivers/pinctrl/freescale/pinctrl-imx8mq.c b/drivers/pinctrl/freescale/pinctrl-imx8mq.c index 529eebe46298..316469e72a17 100644 --- a/drivers/pinctrl/freescale/pinctrl-imx8mq.c +++ b/drivers/pinctrl/freescale/pinctrl-imx8mq.c @@ -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_ptr(&imx_pinctrl_pm_ops), .suppress_bind_attrs = true, }, .probe = imx8mq_pinctrl_probe,