Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc61f6b4 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Vinod Koul
Browse files

dma: dw: join split up messages 



The joined messages are better to grep when debugging.

There is no functional change.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent 1d566f11

drivers/dma/dw/core.c

+4 −5
Original line number Diff line number Diff line
@@ -255,8 +255,7 @@ static void dwc_dostart(struct dw_dma_chan *dwc, struct dw_desc *first) 
						&dwc->flags);

		if (was_soft_llp) {

			dev_err(chan2dev(&dwc->chan),

				"BUG: Attempted to start new LLP transfer "

				"inside ongoing one\n");

				"BUG: Attempted to start new LLP transfer inside ongoing one\n");

			return;

		}
@@ -569,8 +568,8 @@ static void dwc_handle_cyclic(struct dw_dma *dw, struct dw_dma_chan *dwc, 
			unlikely(status_xfer & dwc->mask)) {

		int i;



		dev_err(chan2dev(&dwc->chan), "cyclic DMA unexpected %s "

				"interrupt, stopping DMA transfer\n",

		dev_err(chan2dev(&dwc->chan),

			"cyclic DMA unexpected %s interrupt, stopping DMA transfer\n",

			status_xfer ? "xfer" : "error");



		spin_lock_irqsave(&dwc->lock, flags);