3 files changed, 5 insertions, 5 deletions

diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
index 9af9506352f3..232c8c93dd3a 100644
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
@@ -2237,7 +2237,7 @@ int usb_hcd_get_frame_number (struct usb_device *udev)
 
 int hcd_bus_suspend(struct usb_device *rhdev, pm_message_t msg)
 {
-        struct usb_hcd  *hcd = container_of(rhdev->bus, struct usb_hcd, self);
+        struct usb_hcd  *hcd = bus_to_hcd(rhdev->bus);
         int             status;
         int             old_state = hcd->state;
 
@@ -2286,7 +2286,7 @@ int hcd_bus_suspend(struct usb_device *rhdev, pm_message_t msg)
 
 int hcd_bus_resume(struct usb_device *rhdev, pm_message_t msg)
 {
-        struct usb_hcd  *hcd = container_of(rhdev->bus, struct usb_hcd, self);
+        struct usb_hcd  *hcd = bus_to_hcd(rhdev->bus);
         int             status;
         int             old_state = hcd->state;
 
@@ -2400,7 +2400,7 @@ int usb_bus_start_enum(struct usb_bus *bus, unsigned port_num)
          * boards with root hubs hooked up to internal devices (instead of
          * just the OTG port) may need more attention to resetting...
          */
-        hcd = container_of (bus, struct usb_hcd, self);
+        hcd = bus_to_hcd(bus);
         if (port_num && hcd->driver->start_port_reset)
                 status = hcd->driver->start_port_reset(hcd, port_num);
 
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 3c9b22eb78ca..9ec5733b62f4 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -2659,7 +2659,7 @@ static unsigned hub_is_wusb(struct usb_hub *hub)
         struct usb_hcd *hcd;
         if (hub->hdev->parent != NULL)  /* not a root hub? */
                 return 0;
-        hcd = container_of(hub->hdev->bus, struct usb_hcd, self);
+        hcd = bus_to_hcd(hub->hdev->bus);
         return hcd->wireless;
 }
 
diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
index 49b011f951b3..16ade41759cd 100644
--- a/drivers/usb/core/usb.c
+++ b/drivers/usb/core/usb.c
@@ -397,7 +397,7 @@ struct device_type usb_device_type = {
 /* Returns 1 if @usb_bus is WUSB, 0 otherwise */
 static unsigned usb_bus_is_wusb(struct usb_bus *bus)
 {
-        struct usb_hcd *hcd = container_of(bus, struct usb_hcd, self);
+        struct usb_hcd *hcd = bus_to_hcd(bus);
         return hcd->wireless;
 }