diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2017-11-14 08:01:59 +0300 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2017-11-14 08:01:59 +0300 |
| commit | 5ddab696e75b58a772b0bdad55fcd0c9c214b689 (patch) | |
| tree | dc0fa139aeb44225a8a0174419b4713c6c753b8f /drivers/dma | |
| parent | f855e3844af09fcdc40ed2c8ccf88d51da95ef2c (diff) | |
| parent | 77ea824c6d5430b887b00cda923397f43274d6e7 (diff) | |
| download | linux-5ddab696e75b58a772b0bdad55fcd0c9c214b689.tar.xz | |
Merge branch 'topic/print_fixes' into for-linus
Diffstat (limited to 'drivers/dma')
| -rw-r--r-- | drivers/dma/at_hdmac_regs.h | 2 | ||||
| -rw-r--r-- | drivers/dma/coh901318.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/dma/at_hdmac_regs.h b/drivers/dma/at_hdmac_regs.h index 7f58f06157f6..ef3f227ce3e6 100644 --- a/drivers/dma/at_hdmac_regs.h +++ b/drivers/dma/at_hdmac_regs.h @@ -385,7 +385,7 @@ static void vdbg_dump_regs(struct at_dma_chan *atchan) {} static void atc_dump_lli(struct at_dma_chan *atchan, struct at_lli *lli) { dev_crit(chan2dev(&atchan->chan_common), - " desc: s%pad d%pad ctrl0x%x:0x%x l0x%pad\n", + "desc: s%pad d%pad ctrl0x%x:0x%x l%pad\n", &lli->saddr, &lli->daddr, lli->ctrla, lli->ctrlb, &lli->dscr); } diff --git a/drivers/dma/coh901318.c b/drivers/dma/coh901318.c index 74794c9859f6..da74fd74636b 100644 --- a/drivers/dma/coh901318.c +++ b/drivers/dma/coh901318.c @@ -1319,8 +1319,8 @@ static void coh901318_list_print(struct coh901318_chan *cohc, int i = 0; while (l) { - dev_vdbg(COHC_2_DEV(cohc), "i %d, lli %p, ctrl 0x%x, src 0x%pad" - ", dst 0x%pad, link 0x%pad virt_link_addr 0x%p\n", + dev_vdbg(COHC_2_DEV(cohc), "i %d, lli %p, ctrl 0x%x, src %pad" + ", dst %pad, link %pad virt_link_addr 0x%p\n", i, l, l->control, &l->src_addr, &l->dst_addr, &l->link_addr, l->virt_link_addr); i++; @@ -2231,7 +2231,7 @@ coh901318_prep_memcpy(struct dma_chan *chan, dma_addr_t dest, dma_addr_t src, spin_lock_irqsave(&cohc->lock, flg); dev_vdbg(COHC_2_DEV(cohc), - "[%s] channel %d src 0x%pad dest 0x%pad size %zu\n", + "[%s] channel %d src %pad dest %pad size %zu\n", __func__, cohc->id, &src, &dest, size); if (flags & DMA_PREP_INTERRUPT) |