diff options
| author | Marc Jones <marc.jones@se-eng.com> | 2014-12-29 22:07:04 -0700 |
|---|---|---|
| committer | Marc Jones <marc.jones@se-eng.com> | 2014-12-30 19:07:47 +0100 |
| commit | 86127c7bfe14e8b3f9e45de66d503102eafa654f (patch) | |
| tree | 712dcf34e1305e300db83e192013090277bca387 | |
| parent | b4fbee9a415296b706c9f4f4dcb3e4d1e3ea3110 (diff) | |
| download | coreboot-86127c7bfe14e8b3f9e45de66d503102eafa654f.tar.xz | |
libpayload: Clean up USB build warnings
There were a few build warnings in the USB driver to clean
up before -Werror may be enabled.
Change-Id: I220cfcf0ee926912a184a91d3ced3ba61259130e
Signed-off-by: Marc Jones <marc.jones@se-eng.com>
Reviewed-on: http://review.coreboot.org/7921
Tested-by: build bot (Jenkins)
Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
| -rw-r--r-- | payloads/libpayload/drivers/usb/usbinit.c | 6 | ||||
| -rw-r--r-- | payloads/libpayload/drivers/usb/xhci.c | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/payloads/libpayload/drivers/usb/usbinit.c b/payloads/libpayload/drivers/usb/usbinit.c index 1710760c87..6fb7d4b117 100644 --- a/payloads/libpayload/drivers/usb/usbinit.c +++ b/payloads/libpayload/drivers/usb/usbinit.c @@ -172,15 +172,15 @@ hci_t *usb_add_mmio_hc(hc_type type, void *bar) switch (type) { #ifdef CONFIG_LP_USB_OHCI case OHCI: - return ohci_init(bar); + return ohci_init((unsigned long)bar); #endif #ifdef CONFIG_LP_USB_EHCI case EHCI: - return ehci_init(bar); + return ehci_init((unsigned long)bar); #endif #ifdef CONFIG_LP_USB_XHCI case XHCI: - return xhci_init(bar); + return xhci_init((unsigned long)bar); #endif default: usb_debug("HC type %d (at %p) is not supported!\n", type, bar); diff --git a/payloads/libpayload/drivers/usb/xhci.c b/payloads/libpayload/drivers/usb/xhci.c index c60a967607..5fdc68e266 100644 --- a/payloads/libpayload/drivers/usb/xhci.c +++ b/payloads/libpayload/drivers/usb/xhci.c @@ -88,6 +88,7 @@ xhci_init_cycle_ring(transfer_ring_t *const tr, const size_t ring_size) } /* On Panther Point: switch ports shared with EHCI to xHCI */ +#ifdef CONFIG_LP_USB_PCI static void xhci_switch_ppt_ports(pcidev_t addr) { @@ -109,6 +110,7 @@ xhci_switch_ppt_ports(pcidev_t addr) xhci_debug("Actually switched over: 0x%"PRIx32"\n", reg32); } } +#endif /* On Panther Point: switch all ports back to EHCI */ static void @@ -286,7 +288,7 @@ _free_xhci: free(xhci->roothub); free(xhci->dev); free(xhci); -_free_controller: +/* _free_controller: */ detach_controller(controller); free(controller); return NULL; |