diff options
| author |   Andre Przywara <andre.przywara@linaro.org> | 2013-08-14 14:52:09 +0200 |
|---|---|---|
| committer |   Rob Herring <rob.herring@calxeda.com> | 2013-08-22 20:48:39 -0500 |
| commit | b90ca0636cdf16dfb763f1cd6f3d4bf7ce975fb5 (patch) | |
| tree | 404a8184d9a17874607b569b5e408bb000d7cf09 /drivers/dma/amba-pl08x.c | |
| parent | DMA: fix AMBA PL08x compilation issue with 64bit DMA address type (diff) | |
| download | linux-dev-b90ca0636cdf16dfb763f1cd6f3d4bf7ce975fb5.tar.xz linux-dev-b90ca0636cdf16dfb763f1cd6f3d4bf7ce975fb5.zip | |
DMA: fix printk warning in AMBA PL08x DMA driver
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>
Diffstat (limited to 'drivers/dma/amba-pl08x.c')
| -rw-r--r-- | drivers/dma/amba-pl08x.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/dma/amba-pl08x.c b/drivers/dma/amba-pl08x.c index fb3ce9eefca7..bff41d4848e5 100644 --- a/drivers/dma/amba-pl08x.c +++ b/drivers/dma/amba-pl08x.c @@ -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", |