diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2018-08-29 09:34:32 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-08-29 09:34:34 +0200 |
| commit | c1b48bc21dbcfbb7d4539bef5ddc223051bc73fe (patch) | |
| tree | 02a8e21af37c7f822b60e082d516e244bd29fc4c /drivers/usb/core | |
| parent | dfed7570472031463f11489a762fdddbc5162aea (diff) | |
| download | barebox-c1b48bc21dbcfbb7d4539bef5ddc223051bc73fe.tar.gz barebox-c1b48bc21dbcfbb7d4539bef5ddc223051bc73fe.tar.xz | |
USB: host: hub: rename function argument
Rename struct usb_device *dev function argument to usb_port_reset()
to "hub" as the next patch will add another struct usb_device * argument
to that function.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/usb/core')
| -rw-r--r-- | drivers/usb/core/hub.c | 22 | ||||
| -rw-r--r-- | drivers/usb/core/hub.h | 2 |
2 files changed, 12 insertions, 12 deletions
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index 70f633ed8c..6c73bcf129 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -112,32 +112,32 @@ static inline char *portspeed(int portstatus) return "12 Mb/s"; } -int hub_port_reset(struct usb_device *dev, int port, +int hub_port_reset(struct usb_device *hub, int port, unsigned short *portstat) { int tries; struct usb_port_status portsts; unsigned short portstatus, portchange; - dev_dbg(&dev->dev, "hub_port_reset: resetting port %d...\n", port); + dev_dbg(&hub->dev, "hub_port_reset: resetting port %d...\n", port); for (tries = 0; tries < MAX_TRIES; tries++) { - usb_set_port_feature(dev, port + 1, USB_PORT_FEAT_RESET); + usb_set_port_feature(hub, port + 1, USB_PORT_FEAT_RESET); mdelay(200); - if (usb_get_port_status(dev, port + 1, &portsts) < 0) { - dev_dbg(&dev->dev, "get_port_status failed status %lX\n", - dev->status); + if (usb_get_port_status(hub, port + 1, &portsts) < 0) { + dev_dbg(&hub->dev, "get_port_status failed status %lX\n", + hub->status); return -1; } portstatus = le16_to_cpu(portsts.wPortStatus); portchange = le16_to_cpu(portsts.wPortChange); - dev_dbg(&dev->dev, "portstatus %x, change %x, %s\n", + dev_dbg(&hub->dev, "portstatus %x, change %x, %s\n", portstatus, portchange, portspeed(portstatus)); - dev_dbg(&dev->dev, "STAT_C_CONNECTION = %d STAT_CONNECTION = %d" \ + dev_dbg(&hub->dev, "STAT_C_CONNECTION = %d STAT_CONNECTION = %d" \ " USB_PORT_STAT_ENABLE %d\n", (portchange & USB_PORT_STAT_C_CONNECTION) ? 1 : 0, (portstatus & USB_PORT_STAT_CONNECTION) ? 1 : 0, @@ -154,13 +154,13 @@ int hub_port_reset(struct usb_device *dev, int port, } if (tries == MAX_TRIES) { - dev_dbg(&dev->dev, "Cannot enable port %i after %i retries, " \ + dev_dbg(&hub->dev, "Cannot enable port %i after %i retries, " \ "disabling port.\n", port + 1, MAX_TRIES); - dev_dbg(&dev->dev, "Maybe the USB cable is bad?\n"); + dev_dbg(&hub->dev, "Maybe the USB cable is bad?\n"); return -1; } - usb_clear_port_feature(dev, port + 1, USB_PORT_FEAT_C_RESET); + usb_clear_port_feature(hub, port + 1, USB_PORT_FEAT_C_RESET); *portstat = portstatus; return 0; } diff --git a/drivers/usb/core/hub.h b/drivers/usb/core/hub.h index fcf1f0c18a..41c7ff499b 100644 --- a/drivers/usb/core/hub.h +++ b/drivers/usb/core/hub.h @@ -1,7 +1,7 @@ #ifndef __CORE_HUB_H #define __CORE_HUB_H -int hub_port_reset(struct usb_device *dev, int port, +int hub_port_reset(struct usb_device *hub, int port, unsigned short *portstat); #endif /* __CORE_HUB_H */ |