1 files changed, 8 insertions, 10 deletions

diff --git a/drivers/dma/dw/core.c b/drivers/dma/dw/core.c
index a8ad05291b27..1022c2e1a2b0 100644
--- a/drivers/dma/dw/core.c
+++ b/drivers/dma/dw/core.c
@@ -230,7 +230,8 @@ static void dwc_dostart(struct dw_dma_chan *dwc, struct dw_desc *first)
         /* ASSERT:  channel is idle */
         if (dma_readl(dw, CH_EN) & dwc->mask) {
                 dev_err(chan2dev(&dwc->chan),
-                        "BUG: Attempted to start non-idle channel\n");
+                        "%s: BUG: Attempted to start non-idle channel\n",
+                        __func__);
                 dwc_dump_chan_regs(dwc);
 
                 /* The tasklet will hopefully advance the queue... */
@@ -814,11 +815,8 @@ dwc_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,
 
 slave_sg_todev_fill_desc:
                         desc = dwc_desc_get(dwc);
-                        if (!desc) {
-                                dev_err(chan2dev(chan),
-                                        "not enough descriptors available\n");
+                        if (!desc)
                                 goto err_desc_get;
-                        }
 
                         desc->lli.sar = mem;
                         desc->lli.dar = reg;
@@ -874,11 +872,8 @@ slave_sg_todev_fill_desc:
 
 slave_sg_fromdev_fill_desc:
                         desc = dwc_desc_get(dwc);
-                        if (!desc) {
-                                dev_err(chan2dev(chan),
-                                                "not enough descriptors available\n");
+                        if (!desc)
                                 goto err_desc_get;
-                        }
 
                         desc->lli.sar = reg;
                         desc->lli.dar = mem;
@@ -922,6 +917,8 @@ slave_sg_fromdev_fill_desc:
         return &first->txd;
 
 err_desc_get:
+        dev_err(chan2dev(chan),
+                "not enough descriptors available. Direction %d\n", direction);
         dwc_desc_put(dwc, first);
         return NULL;
 }
@@ -1261,7 +1258,8 @@ int dw_dma_cyclic_start(struct dma_chan *chan)
         /* Assert channel is idle */
         if (dma_readl(dw, CH_EN) & dwc->mask) {
                 dev_err(chan2dev(&dwc->chan),
-                        "BUG: Attempted to start non-idle channel\n");
+                        "%s: BUG: Attempted to start non-idle channel\n",
+                        __func__);
                 dwc_dump_chan_regs(dwc);
                 spin_unlock_irqrestore(&dwc->lock, flags);
                 return -EBUSY;