summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2015-06-17 21:33:46 +0200
committerSimon Glass <sjg@chromium.org>2015-07-21 17:39:35 -0600
commit9eb72dd1f4a7d4b6996a2b2ebf8d9a72ef78a998 (patch)
tree67d10c39c8d30895ae4c1a75089b277f7a3364e6 /common
parent6bfe80e754d7e2841316429f091ed3b68f6cf5a2 (diff)
downloadtalos-obmc-uboot-9eb72dd1f4a7d4b6996a2b2ebf8d9a72ef78a998.tar.gz
talos-obmc-uboot-9eb72dd1f4a7d4b6996a2b2ebf8d9a72ef78a998.zip
usb: usb_setup_device: Drop unneeded portnr function argument
Drop the unneeded portnr function argument, the portnr is part of the usb_device struct which is passed via the dev argument. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Acked-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'common')
-rw-r--r--common/usb.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/common/usb.c b/common/usb.c
index 4ddf98f8a7..d237478057 100644
--- a/common/usb.c
+++ b/common/usb.c
@@ -1030,7 +1030,7 @@ static int usb_setup_descriptor(struct usb_device *dev, bool do_read)
}
static int usb_prepare_device(struct usb_device *dev, int addr, bool do_read,
- struct usb_device *parent, int portnr)
+ struct usb_device *parent)
{
int err;
@@ -1048,7 +1048,7 @@ static int usb_prepare_device(struct usb_device *dev, int addr, bool do_read,
err = usb_setup_descriptor(dev, do_read);
if (err)
return err;
- err = usb_legacy_port_reset(parent, portnr);
+ err = usb_legacy_port_reset(parent, dev->portnr);
if (err)
return err;
@@ -1126,7 +1126,7 @@ int usb_select_config(struct usb_device *dev)
}
int usb_setup_device(struct usb_device *dev, bool do_read,
- struct usb_device *parent, int portnr)
+ struct usb_device *parent)
{
int addr;
int ret;
@@ -1135,7 +1135,7 @@ int usb_setup_device(struct usb_device *dev, bool do_read,
addr = dev->devnum;
dev->devnum = 0;
- ret = usb_prepare_device(dev, addr, do_read, parent, portnr);
+ ret = usb_prepare_device(dev, addr, do_read, parent);
if (ret)
return ret;
ret = usb_select_config(dev);
@@ -1165,7 +1165,7 @@ int usb_new_device(struct usb_device *dev)
#ifdef CONFIG_USB_XHCI
do_read = false;
#endif
- err = usb_setup_device(dev, do_read, dev->parent, dev->portnr);
+ err = usb_setup_device(dev, do_read, dev->parent);
if (err)
return err;
OpenPOWER on IntegriCloud