[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>

1 files changed, 8 insertions, 8 deletions

diff --git a/drivers/usb/host/sl811-hcd.c b/drivers/usb/host/sl811-hcd.c
index b5e7a478bc01..1e47c1f86e70 100644
--- a/drivers/usb/host/sl811-hcd.c
+++ b/drivers/usb/host/sl811-hcd.c
@@ -1363,7 +1363,7 @@ error:
 #ifdef  CONFIG_PM
 
 static int
-sl811h_hub_suspend(struct usb_hcd *hcd)
+sl811h_bus_suspend(struct usb_hcd *hcd)
 {
         // SOFs off
         DBG("%s\n", __FUNCTION__);
@@ -1371,7 +1371,7 @@ sl811h_hub_suspend(struct usb_hcd *hcd)
 }
 
 static int
-sl811h_hub_resume(struct usb_hcd *hcd)
+sl811h_bus_resume(struct usb_hcd *hcd)
 {
         // SOFs on
         DBG("%s\n", __FUNCTION__);
@@ -1380,8 +1380,8 @@ sl811h_hub_resume(struct usb_hcd *hcd)
 
 #else
 
-#define sl811h_hub_suspend      NULL
-#define sl811h_hub_resume       NULL
+#define sl811h_bus_suspend      NULL
+#define sl811h_bus_resume       NULL
 
 #endif
 
@@ -1623,8 +1623,8 @@ static struct hc_driver sl811h_hc_driver = {
          */
         .hub_status_data =      sl811h_hub_status_data,
         .hub_control =          sl811h_hub_control,
-        .hub_suspend =          sl811h_hub_suspend,
-        .hub_resume =           sl811h_hub_resume,
+        .bus_suspend =          sl811h_bus_suspend,
+        .bus_resume =           sl811h_bus_resume,
 };
 
 /*-------------------------------------------------------------------------*/
@@ -1791,7 +1791,7 @@ sl811h_suspend(struct device *dev, pm_message_t state)
         int             retval = 0;
 
         if (state.event == PM_EVENT_FREEZE)
-                retval = sl811h_hub_suspend(hcd);
+                retval = sl811h_bus_suspend(hcd);
         else if (state.event == PM_EVENT_SUSPEND)
                 port_power(sl811, 0);
         if (retval == 0)
@@ -1816,7 +1816,7 @@ sl811h_resume(struct device *dev)
         }
 
         dev->power.power_state = PMSG_ON;
-        return sl811h_hub_resume(hcd);
+        return sl811h_bus_resume(hcd);
 }
 
 #else