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;