Merge branch 'topic/print_fixes' into for-linus (5ddab696) · Commits · 戴 / test

drivers/dma/at_hdmac_regs.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);
		}

+3 −3

Original line number	Diff line number	Diff line
		@@ -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)