| Message ID | 20200903112554.34263-7-paul@crapouillou.net (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | usb: Use new pm_ptr() macro | expand |
On 20-09-03 13:25:40, Paul Cercueil wrote: > 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. For using __maybe_unused or using MACRO, it depends. The chipidea core has many functions are only used for power management, you need to add __maybe_unused for everyone of them, I still prefer using MACRO. Peter > > Signed-off-by: Paul Cercueil <paul@crapouillou.net> > --- > drivers/usb/chipidea/core.c | 26 +++++++++++--------------- > 1 file changed, 11 insertions(+), 15 deletions(-) > > diff --git a/drivers/usb/chipidea/core.c b/drivers/usb/chipidea/core.c > index aa40e510b806..af64ab98fb56 100644 > --- a/drivers/usb/chipidea/core.c > +++ b/drivers/usb/chipidea/core.c > @@ -1231,9 +1231,8 @@ static int ci_hdrc_remove(struct platform_device *pdev) > return 0; > } > > -#ifdef CONFIG_PM > /* Prepare wakeup by SRP before suspend */ > -static void ci_otg_fsm_suspend_for_srp(struct ci_hdrc *ci) > +static void __maybe_unused ci_otg_fsm_suspend_for_srp(struct ci_hdrc *ci) > { > if ((ci->fsm.otg->state == OTG_STATE_A_IDLE) && > !hw_read_otgsc(ci, OTGSC_ID)) { > @@ -1245,7 +1244,7 @@ static void ci_otg_fsm_suspend_for_srp(struct ci_hdrc *ci) > } > > /* Handle SRP when wakeup by data pulse */ > -static void ci_otg_fsm_wakeup_by_srp(struct ci_hdrc *ci) > +static void __maybe_unused ci_otg_fsm_wakeup_by_srp(struct ci_hdrc *ci) > { > if ((ci->fsm.otg->state == OTG_STATE_A_IDLE) && > (ci->fsm.a_bus_drop == 1) && (ci->fsm.a_bus_req == 0)) { > @@ -1259,7 +1258,7 @@ static void ci_otg_fsm_wakeup_by_srp(struct ci_hdrc *ci) > } > } > > -static void ci_controller_suspend(struct ci_hdrc *ci) > +static void __maybe_unused ci_controller_suspend(struct ci_hdrc *ci) > { > disable_irq(ci->irq); > ci_hdrc_enter_lpm(ci, true); > @@ -1277,7 +1276,7 @@ static void ci_controller_suspend(struct ci_hdrc *ci) > * interrupt (wakeup int) only let the controller be out of > * low power mode, but not handle any interrupts. > */ > -static void ci_extcon_wakeup_int(struct ci_hdrc *ci) > +static void __maybe_unused ci_extcon_wakeup_int(struct ci_hdrc *ci) > { > struct ci_hdrc_cable *cable_id, *cable_vbus; > u32 otgsc = hw_read_otgsc(ci, ~0); > @@ -1294,7 +1293,7 @@ static void ci_extcon_wakeup_int(struct ci_hdrc *ci) > ci_irq(ci->irq, ci); > } > > -static int ci_controller_resume(struct device *dev) > +static int __maybe_unused ci_controller_resume(struct device *dev) > { > struct ci_hdrc *ci = dev_get_drvdata(dev); > int ret; > @@ -1332,8 +1331,7 @@ static int ci_controller_resume(struct device *dev) > return 0; > } > > -#ifdef CONFIG_PM_SLEEP > -static int ci_suspend(struct device *dev) > +static int __maybe_unused ci_suspend(struct device *dev) > { > struct ci_hdrc *ci = dev_get_drvdata(dev); > > @@ -1366,7 +1364,7 @@ static int ci_suspend(struct device *dev) > return 0; > } > > -static int ci_resume(struct device *dev) > +static int __maybe_unused ci_resume(struct device *dev) > { > struct ci_hdrc *ci = dev_get_drvdata(dev); > int ret; > @@ -1386,9 +1384,8 @@ static int ci_resume(struct device *dev) > > return ret; > } > -#endif /* CONFIG_PM_SLEEP */ > > -static int ci_runtime_suspend(struct device *dev) > +static int __maybe_unused ci_runtime_suspend(struct device *dev) > { > struct ci_hdrc *ci = dev_get_drvdata(dev); > > @@ -1408,13 +1405,12 @@ static int ci_runtime_suspend(struct device *dev) > return 0; > } > > -static int ci_runtime_resume(struct device *dev) > +static int __maybe_unused ci_runtime_resume(struct device *dev) > { > return ci_controller_resume(dev); > } > > -#endif /* CONFIG_PM */ > -static const struct dev_pm_ops ci_pm_ops = { > +static const struct dev_pm_ops __maybe_unused ci_pm_ops = { > SET_SYSTEM_SLEEP_PM_OPS(ci_suspend, ci_resume) > SET_RUNTIME_PM_OPS(ci_runtime_suspend, ci_runtime_resume, NULL) > }; > @@ -1424,7 +1420,7 @@ static struct platform_driver ci_hdrc_driver = { > .remove = ci_hdrc_remove, > .driver = { > .name = "ci_hdrc", > - .pm = &ci_pm_ops, > + .pm = pm_ptr(&ci_pm_ops), > .dev_groups = ci_groups, > }, > }; > -- > 2.28.0 >
diff --git a/drivers/usb/chipidea/core.c b/drivers/usb/chipidea/core.c index aa40e510b806..af64ab98fb56 100644 --- a/drivers/usb/chipidea/core.c +++ b/drivers/usb/chipidea/core.c @@ -1231,9 +1231,8 @@ static int ci_hdrc_remove(struct platform_device *pdev) return 0; } -#ifdef CONFIG_PM /* Prepare wakeup by SRP before suspend */ -static void ci_otg_fsm_suspend_for_srp(struct ci_hdrc *ci) +static void __maybe_unused ci_otg_fsm_suspend_for_srp(struct ci_hdrc *ci) { if ((ci->fsm.otg->state == OTG_STATE_A_IDLE) && !hw_read_otgsc(ci, OTGSC_ID)) { @@ -1245,7 +1244,7 @@ static void ci_otg_fsm_suspend_for_srp(struct ci_hdrc *ci) } /* Handle SRP when wakeup by data pulse */ -static void ci_otg_fsm_wakeup_by_srp(struct ci_hdrc *ci) +static void __maybe_unused ci_otg_fsm_wakeup_by_srp(struct ci_hdrc *ci) { if ((ci->fsm.otg->state == OTG_STATE_A_IDLE) && (ci->fsm.a_bus_drop == 1) && (ci->fsm.a_bus_req == 0)) { @@ -1259,7 +1258,7 @@ static void ci_otg_fsm_wakeup_by_srp(struct ci_hdrc *ci) } } -static void ci_controller_suspend(struct ci_hdrc *ci) +static void __maybe_unused ci_controller_suspend(struct ci_hdrc *ci) { disable_irq(ci->irq); ci_hdrc_enter_lpm(ci, true); @@ -1277,7 +1276,7 @@ static void ci_controller_suspend(struct ci_hdrc *ci) * interrupt (wakeup int) only let the controller be out of * low power mode, but not handle any interrupts. */ -static void ci_extcon_wakeup_int(struct ci_hdrc *ci) +static void __maybe_unused ci_extcon_wakeup_int(struct ci_hdrc *ci) { struct ci_hdrc_cable *cable_id, *cable_vbus; u32 otgsc = hw_read_otgsc(ci, ~0); @@ -1294,7 +1293,7 @@ static void ci_extcon_wakeup_int(struct ci_hdrc *ci) ci_irq(ci->irq, ci); } -static int ci_controller_resume(struct device *dev) +static int __maybe_unused ci_controller_resume(struct device *dev) { struct ci_hdrc *ci = dev_get_drvdata(dev); int ret; @@ -1332,8 +1331,7 @@ static int ci_controller_resume(struct device *dev) return 0; } -#ifdef CONFIG_PM_SLEEP -static int ci_suspend(struct device *dev) +static int __maybe_unused ci_suspend(struct device *dev) { struct ci_hdrc *ci = dev_get_drvdata(dev); @@ -1366,7 +1364,7 @@ static int ci_suspend(struct device *dev) return 0; } -static int ci_resume(struct device *dev) +static int __maybe_unused ci_resume(struct device *dev) { struct ci_hdrc *ci = dev_get_drvdata(dev); int ret; @@ -1386,9 +1384,8 @@ static int ci_resume(struct device *dev) return ret; } -#endif /* CONFIG_PM_SLEEP */ -static int ci_runtime_suspend(struct device *dev) +static int __maybe_unused ci_runtime_suspend(struct device *dev) { struct ci_hdrc *ci = dev_get_drvdata(dev); @@ -1408,13 +1405,12 @@ static int ci_runtime_suspend(struct device *dev) return 0; } -static int ci_runtime_resume(struct device *dev) +static int __maybe_unused ci_runtime_resume(struct device *dev) { return ci_controller_resume(dev); } -#endif /* CONFIG_PM */ -static const struct dev_pm_ops ci_pm_ops = { +static const struct dev_pm_ops __maybe_unused ci_pm_ops = { SET_SYSTEM_SLEEP_PM_OPS(ci_suspend, ci_resume) SET_RUNTIME_PM_OPS(ci_runtime_suspend, ci_runtime_resume, NULL) }; @@ -1424,7 +1420,7 @@ static struct platform_driver ci_hdrc_driver = { .remove = ci_hdrc_remove, .driver = { .name = "ci_hdrc", - .pm = &ci_pm_ops, + .pm = pm_ptr(&ci_pm_ops), .dev_groups = ci_groups, }, };
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@crapouillou.net> --- drivers/usb/chipidea/core.c | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-)