aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/dma
diff options
context:
space:
mode:
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>2012-06-19 06:34:05 -0400
committerVinod Koul <vinod.koul@linux.intel.com>2012-06-20 22:35:35 -0400
commit2e4c364e151ba9085c77836733af36d3bd0e8ffd (patch)
tree9913d90a0d98995fefcf2d59db33dca8baf281bc /drivers/dma
parent2ab3727634bf88583b40541ea32df6dadfb8cc6c (diff)
dw_dmac: use __func__ constant in the debug prints
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Acked-by: Viresh Kumar <viresh.linux@gmail.com> Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
Diffstat (limited to 'drivers/dma')
-rw-r--r--drivers/dma/dw_dmac.c27
1 files changed, 13 insertions, 14 deletions
diff --git a/drivers/dma/dw_dmac.c b/drivers/dma/dw_dmac.c
index a37608d02a2c..41f03f37df2a 100644
--- a/drivers/dma/dw_dmac.c
+++ b/drivers/dma/dw_dmac.c
@@ -344,7 +344,7 @@ static void dwc_scan_descriptors(struct dw_dma *dw, struct dw_dma_chan *dwc)
344 return; 344 return;
345 } 345 }
346 346
347 dev_vdbg(chan2dev(&dwc->chan), "scan_descriptors: llp=0x%llx\n", 347 dev_vdbg(chan2dev(&dwc->chan), "%s: llp=0x%llx\n", __func__,
348 (unsigned long long)llp); 348 (unsigned long long)llp);
349 349
350 list_for_each_entry_safe(desc, _desc, &dwc->active_list, desc_node) { 350 list_for_each_entry_safe(desc, _desc, &dwc->active_list, desc_node) {
@@ -531,7 +531,7 @@ static void dw_dma_tasklet(unsigned long data)
531 status_xfer = dma_readl(dw, RAW.XFER); 531 status_xfer = dma_readl(dw, RAW.XFER);
532 status_err = dma_readl(dw, RAW.ERROR); 532 status_err = dma_readl(dw, RAW.ERROR);
533 533
534 dev_vdbg(dw->dma.dev, "tasklet: status_err=%x\n", status_err); 534 dev_vdbg(dw->dma.dev, "%s: status_err=%x\n", __func__, status_err);
535 535
536 for (i = 0; i < dw->dma.chancnt; i++) { 536 for (i = 0; i < dw->dma.chancnt; i++) {
537 dwc = &dw->chan[i]; 537 dwc = &dw->chan[i];
@@ -555,7 +555,7 @@ static irqreturn_t dw_dma_interrupt(int irq, void *dev_id)
555 struct dw_dma *dw = dev_id; 555 struct dw_dma *dw = dev_id;
556 u32 status; 556 u32 status;
557 557
558 dev_vdbg(dw->dma.dev, "interrupt: status=0x%x\n", 558 dev_vdbg(dw->dma.dev, "%s: status=0x%x\n", __func__,
559 dma_readl(dw, STATUS_INT)); 559 dma_readl(dw, STATUS_INT));
560 560
561 /* 561 /*
@@ -601,12 +601,12 @@ static dma_cookie_t dwc_tx_submit(struct dma_async_tx_descriptor *tx)
601 * for DMA. But this is hard to do in a race-free manner. 601 * for DMA. But this is hard to do in a race-free manner.
602 */ 602 */
603 if (list_empty(&dwc->active_list)) { 603 if (list_empty(&dwc->active_list)) {
604 dev_vdbg(chan2dev(tx->chan), "tx_submit: started %u\n", 604 dev_vdbg(chan2dev(tx->chan), "%s: started %u\n", __func__,
605 desc->txd.cookie); 605 desc->txd.cookie);
606 list_add_tail(&desc->desc_node, &dwc->active_list); 606 list_add_tail(&desc->desc_node, &dwc->active_list);
607 dwc_dostart(dwc, dwc_first_active(dwc)); 607 dwc_dostart(dwc, dwc_first_active(dwc));
608 } else { 608 } else {
609 dev_vdbg(chan2dev(tx->chan), "tx_submit: queued %u\n", 609 dev_vdbg(chan2dev(tx->chan), "%s: queued %u\n", __func__,
610 desc->txd.cookie); 610 desc->txd.cookie);
611 611
612 list_add_tail(&desc->desc_node, &dwc->queue); 612 list_add_tail(&desc->desc_node, &dwc->queue);
@@ -632,12 +632,12 @@ dwc_prep_dma_memcpy(struct dma_chan *chan, dma_addr_t dest, dma_addr_t src,
632 u32 ctllo; 632 u32 ctllo;
633 633
634 dev_vdbg(chan2dev(chan), 634 dev_vdbg(chan2dev(chan),
635 "prep_dma_memcpy d0x%llx s0x%llx l0x%zx f0x%lx\n", 635 "%s: d0x%llx s0x%llx l0x%zx f0x%lx\n", __func__,
636 (unsigned long long)dest, (unsigned long long)src, 636 (unsigned long long)dest, (unsigned long long)src,
637 len, flags); 637 len, flags);
638 638
639 if (unlikely(!len)) { 639 if (unlikely(!len)) {
640 dev_dbg(chan2dev(chan), "prep_dma_memcpy: length is zero!\n"); 640 dev_dbg(chan2dev(chan), "%s: length is zero!\n", __func__);
641 return NULL; 641 return NULL;
642 } 642 }
643 643
@@ -726,7 +726,7 @@ dwc_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,
726 struct scatterlist *sg; 726 struct scatterlist *sg;
727 size_t total_len = 0; 727 size_t total_len = 0;
728 728
729 dev_vdbg(chan2dev(chan), "prep_dma_slave\n"); 729 dev_vdbg(chan2dev(chan), "%s\n", __func__);
730 730
731 if (unlikely(!dws || !sg_len)) 731 if (unlikely(!dws || !sg_len))
732 return NULL; 732 return NULL;
@@ -1020,7 +1020,7 @@ static int dwc_alloc_chan_resources(struct dma_chan *chan)
1020 int i; 1020 int i;
1021 unsigned long flags; 1021 unsigned long flags;
1022 1022
1023 dev_vdbg(chan2dev(chan), "alloc_chan_resources\n"); 1023 dev_vdbg(chan2dev(chan), "%s\n", __func__);
1024 1024
1025 /* ASSERT: channel is idle */ 1025 /* ASSERT: channel is idle */
1026 if (dma_readl(dw, CH_EN) & dwc->mask) { 1026 if (dma_readl(dw, CH_EN) & dwc->mask) {
@@ -1063,8 +1063,7 @@ static int dwc_alloc_chan_resources(struct dma_chan *chan)
1063 1063
1064 spin_unlock_irqrestore(&dwc->lock, flags); 1064 spin_unlock_irqrestore(&dwc->lock, flags);
1065 1065
1066 dev_dbg(chan2dev(chan), 1066 dev_dbg(chan2dev(chan), "%s: allocated %d descriptors\n", __func__, i);
1067 "alloc_chan_resources allocated %d descriptors\n", i);
1068 1067
1069 return i; 1068 return i;
1070} 1069}
@@ -1077,7 +1076,7 @@ static void dwc_free_chan_resources(struct dma_chan *chan)
1077 unsigned long flags; 1076 unsigned long flags;
1078 LIST_HEAD(list); 1077 LIST_HEAD(list);
1079 1078
1080 dev_dbg(chan2dev(chan), "free_chan_resources (descs allocated=%u)\n", 1079 dev_dbg(chan2dev(chan), "%s: descs allocated=%u\n", __func__,
1081 dwc->descs_allocated); 1080 dwc->descs_allocated);
1082 1081
1083 /* ASSERT: channel is idle */ 1082 /* ASSERT: channel is idle */
@@ -1103,7 +1102,7 @@ static void dwc_free_chan_resources(struct dma_chan *chan)
1103 kfree(desc); 1102 kfree(desc);
1104 } 1103 }
1105 1104
1106 dev_vdbg(chan2dev(chan), "free_chan_resources done\n"); 1105 dev_vdbg(chan2dev(chan), "%s: done\n", __func__);
1107} 1106}
1108 1107
1109/* --------------------- Cyclic DMA API extensions -------------------- */ 1108/* --------------------- Cyclic DMA API extensions -------------------- */
@@ -1340,7 +1339,7 @@ void dw_dma_cyclic_free(struct dma_chan *chan)
1340 int i; 1339 int i;
1341 unsigned long flags; 1340 unsigned long flags;
1342 1341
1343 dev_dbg(chan2dev(&dwc->chan), "cyclic free\n"); 1342 dev_dbg(chan2dev(&dwc->chan), "%s\n", __func__);
1344 1343
1345 if (!cdesc) 1344 if (!cdesc)
1346 return; 1345 return;