[PATCH] USB: Rename hcd->hub_suspend to hcd->bus_suspend
This patch (as580) is perhaps the only result from the long discussion I had with David about his changes to the root-hub suspend/resume code. It renames the hub_suspend and hub_resume methods in struct usb_hcd to bus_suspend and bus_resume. These are more descriptive names, since the methods really do suspend or resume an entire USB bus, and less likely to be confused with the hub_suspend and hub_resume routines in hub.c. It also takes David's advice about removing the layer of bus glue, where those methods are called. And it implements a related change that David made to the other HCDs but forgot to put into dummy_hcd. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
bb200f6eac
commit
0c0382e32d
@@ -30,7 +30,7 @@
|
||||
|
||||
#ifdef CONFIG_PM
|
||||
|
||||
static int ehci_hub_suspend (struct usb_hcd *hcd)
|
||||
static int ehci_bus_suspend (struct usb_hcd *hcd)
|
||||
{
|
||||
struct ehci_hcd *ehci = hcd_to_ehci (hcd);
|
||||
int port;
|
||||
@@ -83,7 +83,7 @@ static int ehci_hub_suspend (struct usb_hcd *hcd)
|
||||
|
||||
|
||||
/* caller has locked the root hub, and should reset/reinit on error */
|
||||
static int ehci_hub_resume (struct usb_hcd *hcd)
|
||||
static int ehci_bus_resume (struct usb_hcd *hcd)
|
||||
{
|
||||
struct ehci_hcd *ehci = hcd_to_ehci (hcd);
|
||||
u32 temp;
|
||||
@@ -159,8 +159,8 @@ static int ehci_hub_resume (struct usb_hcd *hcd)
|
||||
|
||||
#else
|
||||
|
||||
#define ehci_hub_suspend NULL
|
||||
#define ehci_hub_resume NULL
|
||||
#define ehci_bus_suspend NULL
|
||||
#define ehci_bus_resume NULL
|
||||
|
||||
#endif /* CONFIG_PM */
|
||||
|
||||
|
Reference in New Issue
Block a user