Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c88d4df2 authored Mar 02, 2016 by Arnd Bergmann Committed by Greg Kroah-Hartman Mar 03, 2016

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>

parent cf34be7a

drivers/usb/host/ehci.h

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -888,12 +888,10 @@ extern int ehci_handshake(struct ehci_hcd ehci, void __iomem ptr,
	u32 mask, u32 done, int usec);		u32 mask, u32 done, int usec);
	extern int ehci_reset(struct ehci_hcd *ehci);		extern int ehci_reset(struct ehci_hcd *ehci);

	#ifdef CONFIG_PM
	extern int ehci_suspend(struct usb_hcd *hcd, bool do_wakeup);		extern int ehci_suspend(struct usb_hcd *hcd, bool do_wakeup);
	extern int ehci_resume(struct usb_hcd *hcd, bool force_reset);		extern int ehci_resume(struct usb_hcd *hcd, bool force_reset);
	extern void ehci_adjust_port_wakeup_flags(struct ehci_hcd *ehci,		extern void ehci_adjust_port_wakeup_flags(struct ehci_hcd *ehci,
	bool suspending, bool do_wakeup);		bool suspending, bool do_wakeup);
	#endif /* CONFIG_PM */

	extern int ehci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,		extern int ehci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
	u16 wIndex, char *buf, u16 wLength);		u16 wIndex, char *buf, u16 wLength);

drivers/usb/host/ohci.h

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -735,10 +735,8 @@ extern void ohci_init_driver(struct hc_driver *drv,
	const struct ohci_driver_overrides *over);		const struct ohci_driver_overrides *over);
	extern int ohci_restart(struct ohci_hcd *ohci);		extern int ohci_restart(struct ohci_hcd *ohci);
	extern int ohci_setup(struct usb_hcd *hcd);		extern int ohci_setup(struct usb_hcd *hcd);
	#ifdef CONFIG_PM
	extern int ohci_suspend(struct usb_hcd *hcd, bool do_wakeup);		extern int ohci_suspend(struct usb_hcd *hcd, bool do_wakeup);
	extern int ohci_resume(struct usb_hcd *hcd, bool hibernated);		extern int ohci_resume(struct usb_hcd *hcd, bool hibernated);
	#endif
	extern int ohci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,		extern int ohci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
	u16 wIndex, char *buf, u16 wLength);		u16 wIndex, char *buf, u16 wLength);
	extern int ohci_hub_status_data(struct usb_hcd hcd, char buf);		extern int ohci_hub_status_data(struct usb_hcd hcd, char buf);