| Message ID | 20200903112554.34263-5-paul@crapouillou.net (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | usb: Use new pm_ptr() macro | expand |
On Thu, Sep 03, 2020 at 01:25:38PM +0200, 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/host/ehci-platform.c | 8 +++----- > 1 file changed, 3 insertions(+), 5 deletions(-) > > diff --git a/drivers/usb/host/ehci-platform.c b/drivers/usb/host/ehci-platform.c > index 006c4f6188a5..4585a3a24678 100644 > --- a/drivers/usb/host/ehci-platform.c > +++ b/drivers/usb/host/ehci-platform.c > @@ -410,8 +410,7 @@ static int ehci_platform_remove(struct platform_device *dev) > return 0; > } > > -#ifdef CONFIG_PM_SLEEP > -static int ehci_platform_suspend(struct device *dev) > +static int __maybe_unused ehci_platform_suspend(struct device *dev) > { > struct usb_hcd *hcd = dev_get_drvdata(dev); > struct usb_ehci_pdata *pdata = dev_get_platdata(dev); > @@ -433,7 +432,7 @@ static int ehci_platform_suspend(struct device *dev) > return ret; > } > > -static int ehci_platform_resume(struct device *dev) > +static int __maybe_unused ehci_platform_resume(struct device *dev) > { > struct usb_hcd *hcd = dev_get_drvdata(dev); > struct usb_ehci_pdata *pdata = dev_get_platdata(dev); > @@ -464,7 +463,6 @@ static int ehci_platform_resume(struct device *dev) > > return 0; > } > -#endif /* CONFIG_PM_SLEEP */ > > static const struct of_device_id vt8500_ehci_ids[] = { > { .compatible = "via,vt8500-ehci", }, > @@ -499,7 +497,7 @@ static struct platform_driver ehci_platform_driver = { > .shutdown = usb_hcd_platform_shutdown, > .driver = { > .name = "ehci-platform", > - .pm = &ehci_platform_pm_ops, > + .pm = pm_ptr(&ehci_platform_pm_ops), > .of_match_table = vt8500_ehci_ids, > .acpi_match_table = ACPI_PTR(ehci_acpi_match), > } > -- > 2.28.0 For patches 2 - 4: Acked-by: Alan Stern <stern@rowland.harvard.edu>
diff --git a/drivers/usb/host/ehci-platform.c b/drivers/usb/host/ehci-platform.c index 006c4f6188a5..4585a3a24678 100644 --- a/drivers/usb/host/ehci-platform.c +++ b/drivers/usb/host/ehci-platform.c @@ -410,8 +410,7 @@ static int ehci_platform_remove(struct platform_device *dev) return 0; } -#ifdef CONFIG_PM_SLEEP -static int ehci_platform_suspend(struct device *dev) +static int __maybe_unused ehci_platform_suspend(struct device *dev) { struct usb_hcd *hcd = dev_get_drvdata(dev); struct usb_ehci_pdata *pdata = dev_get_platdata(dev); @@ -433,7 +432,7 @@ static int ehci_platform_suspend(struct device *dev) return ret; } -static int ehci_platform_resume(struct device *dev) +static int __maybe_unused ehci_platform_resume(struct device *dev) { struct usb_hcd *hcd = dev_get_drvdata(dev); struct usb_ehci_pdata *pdata = dev_get_platdata(dev); @@ -464,7 +463,6 @@ static int ehci_platform_resume(struct device *dev) return 0; } -#endif /* CONFIG_PM_SLEEP */ static const struct of_device_id vt8500_ehci_ids[] = { { .compatible = "via,vt8500-ehci", }, @@ -499,7 +497,7 @@ static struct platform_driver ehci_platform_driver = { .shutdown = usb_hcd_platform_shutdown, .driver = { .name = "ehci-platform", - .pm = &ehci_platform_pm_ops, + .pm = pm_ptr(&ehci_platform_pm_ops), .of_match_table = vt8500_ehci_ids, .acpi_match_table = ACPI_PTR(ehci_acpi_match), }
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/host/ehci-platform.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)