[PATCH 2/4] USB: core, wusbcore: use bus_to_hcd

[Geliang Tang]

Use bus_to_hcd() instead of open-coding it.

Signed-off-by: Geliang Tang <geliangt...@163.com>
---
 drivers/usb/core/hcd.c        | 6 +++---
 drivers/usb/core/hub.c        | 2 +-
 drivers/usb/core/usb.c        | 2 +-
 drivers/usb/wusbcore/wusbhc.h | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
index df0e3b9..e96eddb 100644
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
@@ -2208,7 +2208,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;
 
@@ -2257,7 +2257,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;
 
@@ -2371,7 +2371,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 51b43691..7c4b392 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -2619,7 +2619,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 f25de6c..e0c6382 100644
--- a/drivers/usb/core/usb.c
+++ b/drivers/usb/core/usb.c
@@ -391,7 +391,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;
 }
 
diff --git a/drivers/usb/wusbcore/wusbhc.h b/drivers/usb/wusbcore/wusbhc.h
index 41838db..8c5bd00 100644
--- a/drivers/usb/wusbcore/wusbhc.h
+++ b/drivers/usb/wusbcore/wusbhc.h
@@ -336,7 +336,7 @@ static inline
 struct usb_hcd *usb_hcd_get_by_usb_dev(struct usb_device *usb_dev)
 {
        struct usb_hcd *usb_hcd;
-       usb_hcd = container_of(usb_dev->bus, struct usb_hcd, self);
+       usb_hcd = bus_to_hcd(usb_dev->bus);
        return usb_get_hcd(usb_hcd);
 }
 
-- 
2.5.0


--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html