diff options
| author | Sarah Sharp <sarah.a.sharp@linux.intel.com> | 2012-01-04 19:54:12 -0500 |
|---|---|---|
| committer | Sarah Sharp <sarah.a.sharp@linux.intel.com> | 2012-01-04 20:06:00 -0500 |
| commit | e910b440da9f766f2623479be721032fecff98c3 (patch) | |
| tree | a5eabe278dc261b3f7361424f58afaa1755237a5 /drivers/usb/host | |
| parent | 71d85724bdd947a3b42a88d08af79f290a1a767b (diff) | |
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: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Reported-by: Randy Dunlap <rdunlap@xenotime.net>
Diffstat (limited to 'drivers/usb/host')
| -rw-r--r-- | drivers/usb/host/xhci-ring.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c index b0a85459652e..b90e1386418b 100644 --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c | |||
| @@ -1934,7 +1934,8 @@ static int handle_tx_event(struct xhci_hcd *xhci, | |||
| 1934 | if (!xdev) { | 1934 | if (!xdev) { |
| 1935 | xhci_err(xhci, "ERROR Transfer event pointed to bad slot\n"); | 1935 | xhci_err(xhci, "ERROR Transfer event pointed to bad slot\n"); |
| 1936 | xhci_err(xhci, "@%016llx %08x %08x %08x %08x\n", | 1936 | xhci_err(xhci, "@%016llx %08x %08x %08x %08x\n", |
| 1937 | xhci_trb_virt_to_dma(xhci->event_ring->deq_seg, | 1937 | (unsigned long long) xhci_trb_virt_to_dma( |
| 1938 | xhci->event_ring->deq_seg, | ||
| 1938 | xhci->event_ring->dequeue), | 1939 | xhci->event_ring->dequeue), |
| 1939 | lower_32_bits(le64_to_cpu(event->buffer)), | 1940 | lower_32_bits(le64_to_cpu(event->buffer)), |
| 1940 | upper_32_bits(le64_to_cpu(event->buffer)), | 1941 | upper_32_bits(le64_to_cpu(event->buffer)), |
| @@ -1956,7 +1957,8 @@ static int handle_tx_event(struct xhci_hcd *xhci, | |||
| 1956 | xhci_err(xhci, "ERROR Transfer event for disabled endpoint " | 1957 | xhci_err(xhci, "ERROR Transfer event for disabled endpoint " |
| 1957 | "or incorrect stream ring\n"); | 1958 | "or incorrect stream ring\n"); |
| 1958 | xhci_err(xhci, "@%016llx %08x %08x %08x %08x\n", | 1959 | xhci_err(xhci, "@%016llx %08x %08x %08x %08x\n", |
| 1959 | xhci_trb_virt_to_dma(xhci->event_ring->deq_seg, | 1960 | (unsigned long long) xhci_trb_virt_to_dma( |
| 1961 | xhci->event_ring->deq_seg, | ||
| 1960 | xhci->event_ring->dequeue), | 1962 | xhci->event_ring->dequeue), |
| 1961 | lower_32_bits(le64_to_cpu(event->buffer)), | 1963 | lower_32_bits(le64_to_cpu(event->buffer)), |
| 1962 | upper_32_bits(le64_to_cpu(event->buffer)), | 1964 | upper_32_bits(le64_to_cpu(event->buffer)), |