USB: core, wusbcore: use bus_to_hcd

Use bus_to_hcd() instead of open-coding it.

Signed-off-by: Geliang Tang <geliangtang@163.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Geliang Tang 2015-12-23 21:26:51 +08:00 committed by Greg Kroah-Hartman
parent 69ab55d7be
commit 6ae706aeaf
4 changed files with 6 additions and 6 deletions

View File

@ -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) 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 status;
int old_state = hcd->state; 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) 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 status;
int old_state = hcd->state; 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 * boards with root hubs hooked up to internal devices (instead of
* just the OTG port) may need more attention to resetting... * 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) if (port_num && hcd->driver->start_port_reset)
status = hcd->driver->start_port_reset(hcd, port_num); status = hcd->driver->start_port_reset(hcd, port_num);

View File

@ -2659,7 +2659,7 @@ static unsigned hub_is_wusb(struct usb_hub *hub)
struct usb_hcd *hcd; struct usb_hcd *hcd;
if (hub->hdev->parent != NULL) /* not a root hub? */ if (hub->hdev->parent != NULL) /* not a root hub? */
return 0; return 0;
hcd = container_of(hub->hdev->bus, struct usb_hcd, self); hcd = bus_to_hcd(hub->hdev->bus);
return hcd->wireless; return hcd->wireless;
} }

View File

@ -397,7 +397,7 @@ struct device_type usb_device_type = {
/* Returns 1 if @usb_bus is WUSB, 0 otherwise */ /* Returns 1 if @usb_bus is WUSB, 0 otherwise */
static unsigned usb_bus_is_wusb(struct usb_bus *bus) 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; return hcd->wireless;
} }

View File

@ -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_get_by_usb_dev(struct usb_device *usb_dev)
{ {
struct usb_hcd *usb_hcd; 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); return usb_get_hcd(usb_hcd);
} }