aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>2014-01-13 07:04:49 -0500
committerVinod Koul <vinod.koul@intel.com>2014-01-20 03:26:37 -0500
commitfc61f6b4f348f8ee9e798fb9f25c45398799d2e8 (patch)
treee97fb4c5330fef1154c0d37eb1712ead6e888b30
parent1d566f11d02c8cfa65d803b847ded08febc18d2e (diff)
dma: dw: join split up messages
The joined messages are better to grep when debugging. There is no functional change. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: Vinod Koul <vinod.koul@intel.com>
-rw-r--r--drivers/dma/dw/core.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/dma/dw/core.c b/drivers/dma/dw/core.c
index 732b6bd398d9..1e900b1de913 100644
--- a/drivers/dma/dw/core.c
+++ b/drivers/dma/dw/core.c
@@ -255,8 +255,7 @@ static void dwc_dostart(struct dw_dma_chan *dwc, struct dw_desc *first)
255 &dwc->flags); 255 &dwc->flags);
256 if (was_soft_llp) { 256 if (was_soft_llp) {
257 dev_err(chan2dev(&dwc->chan), 257 dev_err(chan2dev(&dwc->chan),
258 "BUG: Attempted to start new LLP transfer " 258 "BUG: Attempted to start new LLP transfer inside ongoing one\n");
259 "inside ongoing one\n");
260 return; 259 return;
261 } 260 }
262 261
@@ -569,9 +568,9 @@ static void dwc_handle_cyclic(struct dw_dma *dw, struct dw_dma_chan *dwc,
569 unlikely(status_xfer & dwc->mask)) { 568 unlikely(status_xfer & dwc->mask)) {
570 int i; 569 int i;
571 570
572 dev_err(chan2dev(&dwc->chan), "cyclic DMA unexpected %s " 571 dev_err(chan2dev(&dwc->chan),
573 "interrupt, stopping DMA transfer\n", 572 "cyclic DMA unexpected %s interrupt, stopping DMA transfer\n",
574 status_xfer ? "xfer" : "error"); 573 status_xfer ? "xfer" : "error");
575 574
576 spin_lock_irqsave(&dwc->lock, flags); 575 spin_lock_irqsave(&dwc->lock, flags);
577 576