| Message ID | 20200903112554.34263-15-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:48, 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. > > Signed-off-by: Paul Cercueil <paul@crapouillou.net> > --- > drivers/usb/phy/phy-mxs-usb.c | 11 +++++------ > 1 file changed, 5 insertions(+), 6 deletions(-) > > diff --git a/drivers/usb/phy/phy-mxs-usb.c b/drivers/usb/phy/phy-mxs-usb.c > index 67b39dc62b37..c5e32d51563f 100644 > --- a/drivers/usb/phy/phy-mxs-usb.c > +++ b/drivers/usb/phy/phy-mxs-usb.c > @@ -815,8 +815,8 @@ static int mxs_phy_remove(struct platform_device *pdev) > return 0; > } > > -#ifdef CONFIG_PM_SLEEP > -static void mxs_phy_enable_ldo_in_suspend(struct mxs_phy *mxs_phy, bool on) > +static void __maybe_unused > +mxs_phy_enable_ldo_in_suspend(struct mxs_phy *mxs_phy, bool on) > { > unsigned int reg = on ? ANADIG_ANA_MISC0_SET : ANADIG_ANA_MISC0_CLR; > > @@ -832,7 +832,7 @@ static void mxs_phy_enable_ldo_in_suspend(struct mxs_phy *mxs_phy, bool on) > reg, BM_ANADIG_ANA_MISC0_STOP_MODE_CONFIG_SL); > } > > -static int mxs_phy_system_suspend(struct device *dev) > +static int __maybe_unused mxs_phy_system_suspend(struct device *dev) > { > struct mxs_phy *mxs_phy = dev_get_drvdata(dev); > > @@ -842,7 +842,7 @@ static int mxs_phy_system_suspend(struct device *dev) > return 0; > } > > -static int mxs_phy_system_resume(struct device *dev) > +static int __maybe_unused mxs_phy_system_resume(struct device *dev) > { > struct mxs_phy *mxs_phy = dev_get_drvdata(dev); > > @@ -851,7 +851,6 @@ static int mxs_phy_system_resume(struct device *dev) > > return 0; > } > -#endif /* CONFIG_PM_SLEEP */ > > static SIMPLE_DEV_PM_OPS(mxs_phy_pm, mxs_phy_system_suspend, > mxs_phy_system_resume); > @@ -862,7 +861,7 @@ static struct platform_driver mxs_phy_driver = { > .driver = { > .name = DRIVER_NAME, > .of_match_table = mxs_phy_dt_ids, > - .pm = &mxs_phy_pm, > + .pm = pm_ptr(&mxs_phy_pm), > }, > }; > > -- Acked-by: Peter Chen <peter.chen@nxp.com>
Paul Cercueil <paul@crapouillou.net> writes: > 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> > --- Acked-by: Felipe Balbi <balbi@kernel.org>
diff --git a/drivers/usb/phy/phy-mxs-usb.c b/drivers/usb/phy/phy-mxs-usb.c index 67b39dc62b37..c5e32d51563f 100644 --- a/drivers/usb/phy/phy-mxs-usb.c +++ b/drivers/usb/phy/phy-mxs-usb.c @@ -815,8 +815,8 @@ static int mxs_phy_remove(struct platform_device *pdev) return 0; } -#ifdef CONFIG_PM_SLEEP -static void mxs_phy_enable_ldo_in_suspend(struct mxs_phy *mxs_phy, bool on) +static void __maybe_unused +mxs_phy_enable_ldo_in_suspend(struct mxs_phy *mxs_phy, bool on) { unsigned int reg = on ? ANADIG_ANA_MISC0_SET : ANADIG_ANA_MISC0_CLR; @@ -832,7 +832,7 @@ static void mxs_phy_enable_ldo_in_suspend(struct mxs_phy *mxs_phy, bool on) reg, BM_ANADIG_ANA_MISC0_STOP_MODE_CONFIG_SL); } -static int mxs_phy_system_suspend(struct device *dev) +static int __maybe_unused mxs_phy_system_suspend(struct device *dev) { struct mxs_phy *mxs_phy = dev_get_drvdata(dev); @@ -842,7 +842,7 @@ static int mxs_phy_system_suspend(struct device *dev) return 0; } -static int mxs_phy_system_resume(struct device *dev) +static int __maybe_unused mxs_phy_system_resume(struct device *dev) { struct mxs_phy *mxs_phy = dev_get_drvdata(dev); @@ -851,7 +851,6 @@ static int mxs_phy_system_resume(struct device *dev) return 0; } -#endif /* CONFIG_PM_SLEEP */ static SIMPLE_DEV_PM_OPS(mxs_phy_pm, mxs_phy_system_suspend, mxs_phy_system_resume); @@ -862,7 +861,7 @@ static struct platform_driver mxs_phy_driver = { .driver = { .name = DRIVER_NAME, .of_match_table = mxs_phy_dt_ids, - .pm = &mxs_phy_pm, + .pm = pm_ptr(&mxs_phy_pm), }, };
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/phy/phy-mxs-usb.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)