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

Commit 8f9cc83c authored by Alan Stern's avatar Alan Stern Committed by Greg Kroah-Hartman
Browse files

USB: xhci-hcd: Add get_resuming_ports method 



This patch adds support for the new get_resuming_ports HCD method to
the xhci-hcd driver.

Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Acked-by: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 00d423c8

drivers/usb/host/xhci-hub.c

+11 −0
Original line number Diff line number Diff line
@@ -1684,4 +1684,15 @@ int xhci_bus_resume(struct usb_hcd *hcd) 
	return 0;

}



unsigned long xhci_get_resuming_ports(struct usb_hcd *hcd)

{

	struct xhci_hcd	*xhci = hcd_to_xhci(hcd);

	struct xhci_bus_state *bus_state;



	bus_state = &xhci->bus_state[hcd_index(hcd)];



	/* USB3 port wakeups are reported via usb_wakeup_notification() */

	return bus_state->resuming_ports;	/* USB2 ports only */

}



#endif	/* CONFIG_PM */

drivers/usb/host/xhci.c

+1 −0
Original line number Diff line number Diff line
@@ -5081,6 +5081,7 @@ static const struct hc_driver xhci_hc_driver = { 
	.hub_status_data =	xhci_hub_status_data,

	.bus_suspend =		xhci_bus_suspend,

	.bus_resume =		xhci_bus_resume,

	.get_resuming_ports =	xhci_get_resuming_ports,



	/*

	 * call back when device connected and addressed

drivers/usb/host/xhci.h

+2 −0
Original line number Diff line number Diff line
@@ -2110,9 +2110,11 @@ void xhci_hc_died(struct xhci_hcd *xhci); 
#ifdef CONFIG_PM

int xhci_bus_suspend(struct usb_hcd *hcd);

int xhci_bus_resume(struct usb_hcd *hcd);

unsigned long xhci_get_resuming_ports(struct usb_hcd *hcd);

#else

#define	xhci_bus_suspend	NULL

#define	xhci_bus_resume		NULL

#define	xhci_get_resuming_ports	NULL

#endif	/* CONFIG_PM */



u32 xhci_port_state_to_neutral(u32 state);