]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
DMA: fix printk warning in AMBA PL08x DMA driver
authorAndre Przywara <andre.przywara@linaro.org>
Wed, 14 Aug 2013 12:52:09 +0000 (14:52 +0200)
committerRob Herring <rob.herring@calxeda.com>
Fri, 23 Aug 2013 01:48:39 +0000 (20:48 -0500)
In Rob's recent pull request the patch
ARM: highbank: select ARCH_DMA_ADDR_T_64BIT for LPAE
promotes dma_addr_t to 64bit, so printk generates a warning about
an incorrect type. Fix this by casting it to u64 and using %llx.
Fixing long lines on the way.

Signed-off-by: Andre Przywara <andre.przywara@linaro.org>
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
drivers/dma/amba-pl08x.c

index fb3ce9eefca75b2c868f5b81f09b380410f496a2..bff41d4848e53e35891bb0ef34ae5194d3a597e5 100644 (file)
@@ -847,10 +847,13 @@ static int pl08x_fill_llis_for_desc(struct pl08x_driver_data *pl08x,
 
                pl08x_choose_master_bus(&bd, &mbus, &sbus, cctl);
 
-               dev_vdbg(&pl08x->adev->dev, "src=0x%08x%s/%u dst=0x%08x%s/%u len=%zu\n",
-                       bd.srcbus.addr, cctl & PL080_CONTROL_SRC_INCR ? "+" : "",
+               dev_vdbg(&pl08x->adev->dev,
+                       "src=0x%08llx%s/%u dst=0x%08llx%s/%u len=%zu\n",
+                       (u64)bd.srcbus.addr,
+                       cctl & PL080_CONTROL_SRC_INCR ? "+" : "",
                        bd.srcbus.buswidth,
-                       bd.dstbus.addr, cctl & PL080_CONTROL_DST_INCR ? "+" : "",
+                       (u64)bd.dstbus.addr,
+                       cctl & PL080_CONTROL_DST_INCR ? "+" : "",
                        bd.dstbus.buswidth,
                        bd.remainder);
                dev_vdbg(&pl08x->adev->dev, "mbus=%s sbus=%s\n",