Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

dmaengine: at_hdmac: use %pad format string for dma_addr_t

dma_addr_t may be defined as 32 or 64 bit depending on configuration,
so it cannot be printed using the normal format strings, as
gcc correctly warns:

drivers/dma/at_hdmac.c: In function 'atc_prep_dma_interleaved':
drivers/dma/at_hdmac.c:731:28: warning: format '%x' expects argument of type 'unsigned int', but argument 4 has type 'dma_addr_t {aka long long unsigned int}' [-Wformat=]

This changes the format strings to use the special "%pad" format
string that prints a dma_addr_t, and changes the arguments so we
pass the address by reference as required.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>

authored by

Arnd Bergmann and committed by
Vinod Koul
2c5d7407 268914f4

+13 -13
+10 -10
drivers/dma/at_hdmac.c
··· 729 729 return NULL; 730 730 731 731 dev_info(chan2dev(chan), 732 - "%s: src=0x%08x, dest=0x%08x, numf=%d, frame_size=%d, flags=0x%lx\n", 733 - __func__, xt->src_start, xt->dst_start, xt->numf, 732 + "%s: src=%pad, dest=%pad, numf=%d, frame_size=%d, flags=0x%lx\n", 733 + __func__, &xt->src_start, &xt->dst_start, xt->numf, 734 734 xt->frame_size, flags); 735 735 736 736 /* ··· 824 824 u32 ctrla; 825 825 u32 ctrlb; 826 826 827 - dev_vdbg(chan2dev(chan), "prep_dma_memcpy: d0x%x s0x%x l0x%zx f0x%lx\n", 828 - dest, src, len, flags); 827 + dev_vdbg(chan2dev(chan), "prep_dma_memcpy: d%pad s%pad l0x%zx f0x%lx\n", 828 + &dest, &src, len, flags); 829 829 830 830 if (unlikely(!len)) { 831 831 dev_dbg(chan2dev(chan), "prep_dma_memcpy: length is zero!\n"); ··· 938 938 void __iomem *vaddr; 939 939 dma_addr_t paddr; 940 940 941 - dev_vdbg(chan2dev(chan), "%s: d0x%x v0x%x l0x%zx f0x%lx\n", __func__, 942 - dest, value, len, flags); 941 + dev_vdbg(chan2dev(chan), "%s: d%pad v0x%x l0x%zx f0x%lx\n", __func__, 942 + &dest, value, len, flags); 943 943 944 944 if (unlikely(!len)) { 945 945 dev_dbg(chan2dev(chan), "%s: length is zero!\n", __func__); ··· 1022 1022 dma_addr_t dest = sg_dma_address(sg); 1023 1023 size_t len = sg_dma_len(sg); 1024 1024 1025 - dev_vdbg(chan2dev(chan), "%s: d0x%08x, l0x%zx\n", 1026 - __func__, dest, len); 1025 + dev_vdbg(chan2dev(chan), "%s: d%pad, l0x%zx\n", 1026 + __func__, &dest, len); 1027 1027 1028 1028 if (!is_dma_fill_aligned(chan->device, dest, 0, len)) { 1029 1029 dev_err(chan2dev(chan), "%s: buffer is not aligned\n", ··· 1439 1439 unsigned int periods = buf_len / period_len; 1440 1440 unsigned int i; 1441 1441 1442 - dev_vdbg(chan2dev(chan), "prep_dma_cyclic: %s buf@0x%08x - %d (%d/%d)\n", 1442 + dev_vdbg(chan2dev(chan), "prep_dma_cyclic: %s buf@%pad - %d (%d/%d)\n", 1443 1443 direction == DMA_MEM_TO_DEV ? "TO DEVICE" : "FROM DEVICE", 1444 - buf_addr, 1444 + &buf_addr, 1445 1445 periods, buf_len, period_len); 1446 1446 1447 1447 if (unlikely(!atslave || !buf_len || !period_len)) {
+3 -3
drivers/dma/at_hdmac_regs.h
··· 385 385 static void atc_dump_lli(struct at_dma_chan *atchan, struct at_lli *lli) 386 386 { 387 387 dev_crit(chan2dev(&atchan->chan_common), 388 - " desc: s0x%x d0x%x ctrl0x%x:0x%x l0x%x\n", 389 - lli->saddr, lli->daddr, 390 - lli->ctrla, lli->ctrlb, lli->dscr); 388 + " desc: s%pad d%pad ctrl0x%x:0x%x l0x%pad\n", 389 + &lli->saddr, &lli->daddr, 390 + lli->ctrla, lli->ctrlb, &lli->dscr); 391 391 } 392 392 393 393