summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNico Huber <nico.huber@secunet.com>2012-11-23 11:52:18 +0100
committerPatrick Georgi <patrick@georgi-clan.de>2012-11-23 18:17:37 +0100
commite8a71d34cd78207814623c0690f1941e3b296818 (patch)
treef61c4b36b122901b864bb923056bab11522cb11d
parent4f83d1b0c6a2e1632d6ff60b1d8bce7fa16b7f24 (diff)
downloadcoreboot-e8a71d34cd78207814623c0690f1941e3b296818.tar.xz
libpayload: Fix random warnings
dump_td() is orphaned but looks useful => commented out. The delay identifier shadowed the global one => renamed to total_delay. Change-Id: I4f3766a07db9194b2552ebf9302bd7ef8a66371f Signed-off-by: Nico Huber <nico.huber@secunet.com> Reviewed-on: http://review.coreboot.org/1895 Reviewed-by: Patrick Georgi <patrick@georgi-clan.de> Tested-by: build bot (Jenkins)
-rw-r--r--payloads/libpayload/drivers/usb/ohci.c2
-rw-r--r--payloads/libpayload/drivers/usb/ohci_rh.c6
2 files changed, 5 insertions, 3 deletions
diff --git a/payloads/libpayload/drivers/usb/ohci.c b/payloads/libpayload/drivers/usb/ohci.c
index b128029751..ad5638c5dd 100644
--- a/payloads/libpayload/drivers/usb/ohci.c
+++ b/payloads/libpayload/drivers/usb/ohci.c
@@ -205,6 +205,7 @@ ohci_stop (hci_t *controller)
// TODO: turn off all operation of OHCI
}
+#if 0
static void
dump_td(td_t *cur, int level)
{
@@ -216,6 +217,7 @@ dump_td(td_t *cur, int level)
usb_debug("%s toggle: %x\n", spc, !!(cur->config & TD_TOGGLE_DATA1));
#endif
}
+#endif
static int
wait_for_ed(usbdev_t *dev, ed_t *head, int pages)
diff --git a/payloads/libpayload/drivers/usb/ohci_rh.c b/payloads/libpayload/drivers/usb/ohci_rh.c
index eb3e10b26c..9de2b981f8 100644
--- a/payloads/libpayload/drivers/usb/ohci_rh.c
+++ b/payloads/libpayload/drivers/usb/ohci_rh.c
@@ -48,8 +48,8 @@ ohci_rh_enable_port (usbdev_t *dev, int port)
* After reset, the port will be enabled automatically (ohci spec
* 7.4.4).
*/
- int delay = 100; /* 100 * 500us == 50ms */
- while (delay > 0) {
+ int total_delay = 100; /* 100 * 500us == 50ms */
+ while (total_delay > 0) {
if (!(OHCI_INST(dev->controller)->opreg->HcRhPortStatus[port]
& CurrentConnectStatus))
return;
@@ -61,7 +61,7 @@ ohci_rh_enable_port (usbdev_t *dev, int port)
while ((OHCI_INST (dev->controller)->opreg->HcRhPortStatus[port]
& PortResetStatus)
&& timeout--) {
- udelay(500); delay--;
+ udelay(500); total_delay--;
}
if (OHCI_INST (dev->controller)->opreg->HcRhPortStatus[port]
& PortResetStatus) {