sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libpayload: Clean up USB build warnings

Browse Source 
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>
This commit is contained in:
Marc Jones
2014-12-29 22:07:04 -07:00
parent b4fbee9a41
commit 86127c7bfe
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
payloads/libpayload/drivers/usb/usbinit.c
View File

@@ -172,15 +172,15 @@ hci_t *usb_add_mmio_hc(hc_type type, void *bar)
switch (type) { switch (type) {
#ifdef CONFIG_LP_USB_OHCI #ifdef CONFIG_LP_USB_OHCI
case OHCI: case OHCI:
return ohci_init(bar); return ohci_init((unsigned long)bar);
#endif #endif
#ifdef CONFIG_LP_USB_EHCI #ifdef CONFIG_LP_USB_EHCI
case EHCI: case EHCI:
return ehci_init(bar); return ehci_init((unsigned long)bar);
#endif #endif
#ifdef CONFIG_LP_USB_XHCI #ifdef CONFIG_LP_USB_XHCI
case XHCI: case XHCI:
return xhci_init(bar); return xhci_init((unsigned long)bar);
#endif #endif
default: default:
usb_debug("HC type %d (at %p) is not supported!\n", type, bar); usb_debug("HC type %d (at %p) is not supported!\n", type, bar);

4
payloads/libpayload/drivers/usb/xhci.c
View File

@@ -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 */ /* On Panther Point: switch ports shared with EHCI to xHCI */
#ifdef CONFIG_LP_USB_PCI
static void static void
xhci_switch_ppt_ports(pcidev_t addr) 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); xhci_debug("Actually switched over: 0x%"PRIx32"\n", reg32);
} }
} }
#endif
/* On Panther Point: switch all ports back to EHCI */ /* On Panther Point: switch all ports back to EHCI */
static void static void
@@ -286,7 +288,7 @@ _free_xhci:
free(xhci->roothub); free(xhci->roothub);
free(xhci->dev); free(xhci->dev);
free(xhci); free(xhci);
_free_controller: /* _free_controller: */
detach_controller(controller); detach_controller(controller);
free(controller); free(controller);
return NULL; return NULL;