Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e910b440 authored by Sarah Sharp's avatar Sarah Sharp
Browse files

xhci: Clean up 32-bit build warnings. 



Randy Dunlap points out that commit 9258c0b2 "xhci: Better debugging for
critical host errors." introduces some new build warnings on 32-bit
builds:

drivers/usb/host/xhci-ring.c:1936:3: warning: format '%016llx' expects type 'long long unsigned int', but argument 3 has type 'dma_addr_t'
drivers/usb/host/xhci-ring.c:1958:3: warning: format '%016llx' expects type 'long long unsigned int', but argument 3 has type 'dma_addr_t'

Cast the results of xhci_trb_virt_to_dma() from a dma_addr_t to an
unsigned long long.

Signed-off-by: default avatarSarah Sharp <sarah.a.sharp@linux.intel.com>
Reported-by: default avatarRandy Dunlap <rdunlap@xenotime.net>
parent 71d85724

drivers/usb/host/xhci-ring.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -1934,7 +1934,8 @@ static int handle_tx_event(struct xhci_hcd *xhci, 
	if (!xdev) {

	if (!xdev) {

		xhci_err(xhci, "ERROR Transfer event pointed to bad slot\n");

		xhci_err(xhci, "ERROR Transfer event pointed to bad slot\n");

		xhci_err(xhci, "@%016llx %08x %08x %08x %08x\n",

		xhci_err(xhci, "@%016llx %08x %08x %08x %08x\n",

			 xhci_trb_virt_to_dma(xhci->event_ring->deq_seg,

			 (unsigned long long) xhci_trb_virt_to_dma(

				 xhci->event_ring->deq_seg,

				 xhci->event_ring->dequeue),

				 xhci->event_ring->dequeue),

			 lower_32_bits(le64_to_cpu(event->buffer)),

			 lower_32_bits(le64_to_cpu(event->buffer)),

			 upper_32_bits(le64_to_cpu(event->buffer)),

			 upper_32_bits(le64_to_cpu(event->buffer)),
@@ -1956,7 +1957,8 @@ static int handle_tx_event(struct xhci_hcd *xhci, 
		xhci_err(xhci, "ERROR Transfer event for disabled endpoint "

		xhci_err(xhci, "ERROR Transfer event for disabled endpoint "

				"or incorrect stream ring\n");

				"or incorrect stream ring\n");

		xhci_err(xhci, "@%016llx %08x %08x %08x %08x\n",

		xhci_err(xhci, "@%016llx %08x %08x %08x %08x\n",

			 xhci_trb_virt_to_dma(xhci->event_ring->deq_seg,

			 (unsigned long long) xhci_trb_virt_to_dma(

				 xhci->event_ring->deq_seg,

				 xhci->event_ring->dequeue),

				 xhci->event_ring->dequeue),

			 lower_32_bits(le64_to_cpu(event->buffer)),

			 lower_32_bits(le64_to_cpu(event->buffer)),

			 upper_32_bits(le64_to_cpu(event->buffer)),

			 upper_32_bits(le64_to_cpu(event->buffer)),