summaryrefslogtreecommitdiffstats
path: root/common/usb.c
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2015-06-17 21:33:45 +0200
committerSimon Glass <sjg@chromium.org>2015-07-21 17:39:34 -0600
commit6bfe80e754d7e2841316429f091ed3b68f6cf5a2 (patch)
treed9c3c0c265e0393c005d1f24a96dbe69d8e21858 /common/usb.c
parent04c5ee41b2ff00d396033bcac676be83a4e51468 (diff)
downloadblackbird-obmc-uboot-6bfe80e754d7e2841316429f091ed3b68f6cf5a2.tar.gz
blackbird-obmc-uboot-6bfe80e754d7e2841316429f091ed3b68f6cf5a2.zip
usb: Drop device-model specific copy of usb_legacy_port_reset
The device-model usb_legacy_port_reset function calls the device-model usb_port_reset function which is a 1 on 1 copy of the non dm usb_legacy_port_reset and this is the only use of usb_port_reset in all of u-boot. Drop both, and alway use the usb_legacy_port_reset() version in common/usb.c . Also while at it make it static as it is only used in common/usb.c . Signed-off-by: Hans de Goede <hdegoede@redhat.com> Acked-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'common/usb.c')
-rw-r--r--common/usb.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/common/usb.c b/common/usb.c
index 7ff8ac5df3..4ddf98f8a7 100644
--- a/common/usb.c
+++ b/common/usb.c
@@ -911,8 +911,7 @@ __weak int usb_alloc_device(struct usb_device *udev)
}
#endif /* !CONFIG_DM_USB */
-#ifndef CONFIG_DM_USB
-int usb_legacy_port_reset(struct usb_device *hub, int portnr)
+static int usb_legacy_port_reset(struct usb_device *hub, int portnr)
{
if (hub) {
unsigned short portstatus;
@@ -930,7 +929,6 @@ int usb_legacy_port_reset(struct usb_device *hub, int portnr)
return 0;
}
-#endif
static int get_descriptor_len(struct usb_device *dev, int len, int expect_len)
{
OpenPOWER on IntegriCloud