Commit 20ef800b authored Nov 02, 2017 by Arnd Bergmann Committed by Greg Kroah-Hartman Nov 02, 2017

usb: mtu3: fix dma_addr_t printk output again

The support for 36-bit addresses originally came with an incorrect
printk format for dma addresses. Felipe changed the format string it
while applying, but the result was still incorrect, since we now have
to pass a pointer to the address instead of the integer value:

drivers/usb/mtu3/mtu3_qmu.c: In function 'mtu3_prepare_tx_gpd':
drivers/usb/mtu3/mtu3_qmu.c:261:25: error: format '%p' expects argument of type 'void *', but argument 7 has type 'dma_addr_t {aka unsigned int}' [-Werror=format=]
drivers/usb/mtu3/mtu3_qmu.c: In function 'mtu3_prepare_rx_gpd':
drivers/usb/mtu3/mtu3_qmu.c:300:25: error: format '%p' expects argument of type 'void *', but argument 7 has type 'dma_addr_t {aka unsigned int}' [-Werror=format=]

This fixes the printk argument accordingly.

Fixes: 1a46dfea ("usb: mtu3: support 36-bit DMA address")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Felipe Balbi <felipe.balbi@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 9506b146

drivers/usb/mtu3/mtu3_qmu.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -259,7 +259,7 @@ static int mtu3_prepare_tx_gpd(struct mtu3_ep mep, struct mtu3_request mreq)
		enq = advance_enq_gpd(ring);
		enq_dma = gpd_virt_to_dma(ring, enq);
		dev_dbg(mep->mtu->dev, "TX-EP%d queue gpd=%p, enq=%p, qdma=%pad\n",
		mep->epnum, gpd, enq, enq_dma);
		mep->epnum, gpd, enq, &enq_dma);

		enq->flag &= ~GPD_FLAGS_HWO;
		gpd->next_gpd = cpu_to_le32(lower_32_bits(enq_dma));
		@@ -298,7 +298,7 @@ static int mtu3_prepare_rx_gpd(struct mtu3_ep mep, struct mtu3_request mreq)
		enq = advance_enq_gpd(ring);
		enq_dma = gpd_virt_to_dma(ring, enq);
		dev_dbg(mep->mtu->dev, "RX-EP%d queue gpd=%p, enq=%p, qdma=%pad\n",
		mep->epnum, gpd, enq, enq_dma);
		mep->epnum, gpd, enq, &enq_dma);

		enq->flag &= ~GPD_FLAGS_HWO;
		gpd->next_gpd = cpu_to_le32(lower_32_bits(enq_dma));