diff options
| author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2014-01-13 14:04:49 +0200 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2014-01-20 13:56:37 +0530 |
| commit | fc61f6b4f348f8ee9e798fb9f25c45398799d2e8 (patch) | |
| tree | e97fb4c5330fef1154c0d37eb1712ead6e888b30 /drivers | |
| parent | 1d566f11d02c8cfa65d803b847ded08febc18d2e (diff) | |
| download | linux-fc61f6b4f348f8ee9e798fb9f25c45398799d2e8.tar.bz2 | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/dma/dw/core.c | 9 |
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) &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); |