| Message ID | 20240625231023.436403-1-festevam@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 26faae34a61a62b60cee947bf3c4195c85507028 |
| Headers | show |
| Series | [1/2] usb: chipidea: ci_hdrc_imx: Switch to RUNTIME/SYSTEM_SLEEP_PM_OPS() | expand |
On 24-06-25 20:10:22, Fabio Estevam wrote: > From: Fabio Estevam <festevam@denx.de> > > Replace SET_RUNTIME_PM_OPS()/SET SYSTEM_SLEEP_PM_OPS() with their modern > RUNTIME_PM_OPS() and SYSTEM_SLEEP_PM_OPS() alternatives. > > The combined usage of pm_ptr() and RUNTIME_PM_OPS/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> Acked-by: Peter Chen <peter.chen@kernel.org> > --- > drivers/usb/chipidea/ci_hdrc_imx.c | 19 +++++++++---------- > 1 file changed, 9 insertions(+), 10 deletions(-) > > diff --git a/drivers/usb/chipidea/ci_hdrc_imx.c b/drivers/usb/chipidea/ci_hdrc_imx.c > index a17b6d619305..bdc04ce919f7 100644 > --- a/drivers/usb/chipidea/ci_hdrc_imx.c > +++ b/drivers/usb/chipidea/ci_hdrc_imx.c > @@ -557,7 +557,7 @@ static void ci_hdrc_imx_shutdown(struct platform_device *pdev) > ci_hdrc_imx_remove(pdev); > } > > -static int __maybe_unused imx_controller_suspend(struct device *dev, > +static int imx_controller_suspend(struct device *dev, > pm_message_t msg) > { > struct ci_hdrc_imx_data *data = dev_get_drvdata(dev); > @@ -582,7 +582,7 @@ static int __maybe_unused imx_controller_suspend(struct device *dev, > return 0; > } > > -static int __maybe_unused imx_controller_resume(struct device *dev, > +static int imx_controller_resume(struct device *dev, > pm_message_t msg) > { > struct ci_hdrc_imx_data *data = dev_get_drvdata(dev); > @@ -618,7 +618,7 @@ static int __maybe_unused imx_controller_resume(struct device *dev, > return ret; > } > > -static int __maybe_unused ci_hdrc_imx_suspend(struct device *dev) > +static int ci_hdrc_imx_suspend(struct device *dev) > { > int ret; > > @@ -636,7 +636,7 @@ static int __maybe_unused ci_hdrc_imx_suspend(struct device *dev) > return ret; > } > > -static int __maybe_unused ci_hdrc_imx_resume(struct device *dev) > +static int ci_hdrc_imx_resume(struct device *dev) > { > struct ci_hdrc_imx_data *data = dev_get_drvdata(dev); > int ret; > @@ -652,7 +652,7 @@ static int __maybe_unused ci_hdrc_imx_resume(struct device *dev) > return ret; > } > > -static int __maybe_unused ci_hdrc_imx_runtime_suspend(struct device *dev) > +static int ci_hdrc_imx_runtime_suspend(struct device *dev) > { > struct ci_hdrc_imx_data *data = dev_get_drvdata(dev); > > @@ -664,15 +664,14 @@ static int __maybe_unused ci_hdrc_imx_runtime_suspend(struct device *dev) > return imx_controller_suspend(dev, PMSG_AUTO_SUSPEND); > } > > -static int __maybe_unused ci_hdrc_imx_runtime_resume(struct device *dev) > +static int ci_hdrc_imx_runtime_resume(struct device *dev) > { > return imx_controller_resume(dev, PMSG_AUTO_RESUME); > } > > static const struct dev_pm_ops ci_hdrc_imx_pm_ops = { > - SET_SYSTEM_SLEEP_PM_OPS(ci_hdrc_imx_suspend, ci_hdrc_imx_resume) > - SET_RUNTIME_PM_OPS(ci_hdrc_imx_runtime_suspend, > - ci_hdrc_imx_runtime_resume, NULL) > + SYSTEM_SLEEP_PM_OPS(ci_hdrc_imx_suspend, ci_hdrc_imx_resume) > + RUNTIME_PM_OPS(ci_hdrc_imx_runtime_suspend, ci_hdrc_imx_runtime_resume, NULL) > }; > static struct platform_driver ci_hdrc_imx_driver = { > .probe = ci_hdrc_imx_probe, > @@ -681,7 +680,7 @@ static struct platform_driver ci_hdrc_imx_driver = { > .driver = { > .name = "imx_usb", > .of_match_table = ci_hdrc_imx_dt_ids, > - .pm = &ci_hdrc_imx_pm_ops, > + .pm = pm_ptr(&ci_hdrc_imx_pm_ops), > }, > }; > > -- > 2.34.1 >
diff --git a/drivers/usb/chipidea/ci_hdrc_imx.c b/drivers/usb/chipidea/ci_hdrc_imx.c index a17b6d619305..bdc04ce919f7 100644 --- a/drivers/usb/chipidea/ci_hdrc_imx.c +++ b/drivers/usb/chipidea/ci_hdrc_imx.c @@ -557,7 +557,7 @@ static void ci_hdrc_imx_shutdown(struct platform_device *pdev) ci_hdrc_imx_remove(pdev); } -static int __maybe_unused imx_controller_suspend(struct device *dev, +static int imx_controller_suspend(struct device *dev, pm_message_t msg) { struct ci_hdrc_imx_data *data = dev_get_drvdata(dev); @@ -582,7 +582,7 @@ static int __maybe_unused imx_controller_suspend(struct device *dev, return 0; } -static int __maybe_unused imx_controller_resume(struct device *dev, +static int imx_controller_resume(struct device *dev, pm_message_t msg) { struct ci_hdrc_imx_data *data = dev_get_drvdata(dev); @@ -618,7 +618,7 @@ static int __maybe_unused imx_controller_resume(struct device *dev, return ret; } -static int __maybe_unused ci_hdrc_imx_suspend(struct device *dev) +static int ci_hdrc_imx_suspend(struct device *dev) { int ret; @@ -636,7 +636,7 @@ static int __maybe_unused ci_hdrc_imx_suspend(struct device *dev) return ret; } -static int __maybe_unused ci_hdrc_imx_resume(struct device *dev) +static int ci_hdrc_imx_resume(struct device *dev) { struct ci_hdrc_imx_data *data = dev_get_drvdata(dev); int ret; @@ -652,7 +652,7 @@ static int __maybe_unused ci_hdrc_imx_resume(struct device *dev) return ret; } -static int __maybe_unused ci_hdrc_imx_runtime_suspend(struct device *dev) +static int ci_hdrc_imx_runtime_suspend(struct device *dev) { struct ci_hdrc_imx_data *data = dev_get_drvdata(dev); @@ -664,15 +664,14 @@ static int __maybe_unused ci_hdrc_imx_runtime_suspend(struct device *dev) return imx_controller_suspend(dev, PMSG_AUTO_SUSPEND); } -static int __maybe_unused ci_hdrc_imx_runtime_resume(struct device *dev) +static int ci_hdrc_imx_runtime_resume(struct device *dev) { return imx_controller_resume(dev, PMSG_AUTO_RESUME); } static const struct dev_pm_ops ci_hdrc_imx_pm_ops = { - SET_SYSTEM_SLEEP_PM_OPS(ci_hdrc_imx_suspend, ci_hdrc_imx_resume) - SET_RUNTIME_PM_OPS(ci_hdrc_imx_runtime_suspend, - ci_hdrc_imx_runtime_resume, NULL) + SYSTEM_SLEEP_PM_OPS(ci_hdrc_imx_suspend, ci_hdrc_imx_resume) + RUNTIME_PM_OPS(ci_hdrc_imx_runtime_suspend, ci_hdrc_imx_runtime_resume, NULL) }; static struct platform_driver ci_hdrc_imx_driver = { .probe = ci_hdrc_imx_probe, @@ -681,7 +680,7 @@ static struct platform_driver ci_hdrc_imx_driver = { .driver = { .name = "imx_usb", .of_match_table = ci_hdrc_imx_dt_ids, - .pm = &ci_hdrc_imx_pm_ops, + .pm = pm_ptr(&ci_hdrc_imx_pm_ops), }, };