dma: dw: join split up messages
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Mon, 13 Jan 2014 12:04:49 +0000 (14:04 +0200)
committerVinod Koul <vinod.koul@intel.com>
Mon, 20 Jan 2014 08:26:37 +0000 (13:56 +0530)
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>
drivers/dma/dw/core.c

index 732b6bd..1e900b1 100644 (file)
@@ -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,9 +568,9 @@ 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",
-                               status_xfer ? "xfer" : "error");
+               dev_err(chan2dev(&dwc->chan),
+                       "cyclic DMA unexpected %s interrupt, stopping DMA transfer\n",
+                       status_xfer ? "xfer" : "error");
 
                spin_lock_irqsave(&dwc->lock, flags);