forked from luck/tmp_suning_uos_patched
usb/host: ehci-spear: Use pm_ptr() macro
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: Alan Stern <stern@rowland.harvard.edu> Link: https://lore.kernel.org/r/20200903112554.34263-3-paul@crapouillou.net Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
7456fe486a
commit
1874b630bd
|
@ -34,8 +34,7 @@ struct spear_ehci {
|
|||
|
||||
static struct hc_driver __read_mostly ehci_spear_hc_driver;
|
||||
|
||||
#ifdef CONFIG_PM_SLEEP
|
||||
static int ehci_spear_drv_suspend(struct device *dev)
|
||||
static int __maybe_unused ehci_spear_drv_suspend(struct device *dev)
|
||||
{
|
||||
struct usb_hcd *hcd = dev_get_drvdata(dev);
|
||||
bool do_wakeup = device_may_wakeup(dev);
|
||||
|
@ -43,14 +42,13 @@ static int ehci_spear_drv_suspend(struct device *dev)
|
|||
return ehci_suspend(hcd, do_wakeup);
|
||||
}
|
||||
|
||||
static int ehci_spear_drv_resume(struct device *dev)
|
||||
static int __maybe_unused ehci_spear_drv_resume(struct device *dev)
|
||||
{
|
||||
struct usb_hcd *hcd = dev_get_drvdata(dev);
|
||||
|
||||
ehci_resume(hcd, false);
|
||||
return 0;
|
||||
}
|
||||
#endif /* CONFIG_PM_SLEEP */
|
||||
|
||||
static SIMPLE_DEV_PM_OPS(ehci_spear_pm_ops, ehci_spear_drv_suspend,
|
||||
ehci_spear_drv_resume);
|
||||
|
@ -155,7 +153,7 @@ static struct platform_driver spear_ehci_hcd_driver = {
|
|||
.driver = {
|
||||
.name = "spear-ehci",
|
||||
.bus = &platform_bus_type,
|
||||
.pm = &ehci_spear_pm_ops,
|
||||
.pm = pm_ptr(&ehci_spear_pm_ops),
|
||||
.of_match_table = spear_ehci_id_table,
|
||||
}
|
||||
};
|
||||
|
|
Loading…
Reference in New Issue
Block a user