diff options
author | Arnd Bergmann <arnd@arndb.de> | 2016-03-02 10:24:03 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-03-03 23:37:41 -0500 |
commit | c88d4df217f9a32415d63c1259a45da7f50ac38e (patch) | |
tree | bdc10ad5e64f7e0dc03e9bdf0b034ad834422606 | |
parent | cf34be7a223b7702e61668e0e3e64ceab4fdd06e (diff) |
usb: host: unhide suspend/resume declarations
There is no need to hide function declarations, and making
these visible to the SoC specific host drivers lets us
use __maybe_unused and IS_ENABLED() checks to control
their use, rather than having to use #ifdef to hide all
callers.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/usb/host/ehci.h | 2 | ||||
-rw-r--r-- | drivers/usb/host/ohci.h | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/drivers/usb/host/ehci.h b/drivers/usb/host/ehci.h index 2ddf35203c05..3f3b74aeca97 100644 --- a/drivers/usb/host/ehci.h +++ b/drivers/usb/host/ehci.h | |||
@@ -888,12 +888,10 @@ extern int ehci_handshake(struct ehci_hcd *ehci, void __iomem *ptr, | |||
888 | u32 mask, u32 done, int usec); | 888 | u32 mask, u32 done, int usec); |
889 | extern int ehci_reset(struct ehci_hcd *ehci); | 889 | extern int ehci_reset(struct ehci_hcd *ehci); |
890 | 890 | ||
891 | #ifdef CONFIG_PM | ||
892 | extern int ehci_suspend(struct usb_hcd *hcd, bool do_wakeup); | 891 | extern int ehci_suspend(struct usb_hcd *hcd, bool do_wakeup); |
893 | extern int ehci_resume(struct usb_hcd *hcd, bool force_reset); | 892 | extern int ehci_resume(struct usb_hcd *hcd, bool force_reset); |
894 | extern void ehci_adjust_port_wakeup_flags(struct ehci_hcd *ehci, | 893 | extern void ehci_adjust_port_wakeup_flags(struct ehci_hcd *ehci, |
895 | bool suspending, bool do_wakeup); | 894 | bool suspending, bool do_wakeup); |
896 | #endif /* CONFIG_PM */ | ||
897 | 895 | ||
898 | extern int ehci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue, | 896 | extern int ehci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue, |
899 | u16 wIndex, char *buf, u16 wLength); | 897 | u16 wIndex, char *buf, u16 wLength); |
diff --git a/drivers/usb/host/ohci.h b/drivers/usb/host/ohci.h index bc462288cfb0..37f1725e7a46 100644 --- a/drivers/usb/host/ohci.h +++ b/drivers/usb/host/ohci.h | |||
@@ -735,10 +735,8 @@ extern void ohci_init_driver(struct hc_driver *drv, | |||
735 | const struct ohci_driver_overrides *over); | 735 | const struct ohci_driver_overrides *over); |
736 | extern int ohci_restart(struct ohci_hcd *ohci); | 736 | extern int ohci_restart(struct ohci_hcd *ohci); |
737 | extern int ohci_setup(struct usb_hcd *hcd); | 737 | extern int ohci_setup(struct usb_hcd *hcd); |
738 | #ifdef CONFIG_PM | ||
739 | extern int ohci_suspend(struct usb_hcd *hcd, bool do_wakeup); | 738 | extern int ohci_suspend(struct usb_hcd *hcd, bool do_wakeup); |
740 | extern int ohci_resume(struct usb_hcd *hcd, bool hibernated); | 739 | extern int ohci_resume(struct usb_hcd *hcd, bool hibernated); |
741 | #endif | ||
742 | extern int ohci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue, | 740 | extern int ohci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue, |
743 | u16 wIndex, char *buf, u16 wLength); | 741 | u16 wIndex, char *buf, u16 wLength); |
744 | extern int ohci_hub_status_data(struct usb_hcd *hcd, char *buf); | 742 | extern int ohci_hub_status_data(struct usb_hcd *hcd, char *buf); |