2019-09-04 17:01:23 +00:00
|
|
|
From a9af5c3ba509ef688a9bb4b7527d2aa07dd58d9c Mon Sep 17 00:00:00 2001
|
2019-07-09 18:32:28 +00:00
|
|
|
From: Phil Elwell <phil@raspberrypi.org>
|
|
|
|
|
Date: Thu, 6 Jun 2019 09:35:08 +0100
|
2019-09-04 17:01:23 +00:00
|
|
|
Subject: [PATCH 645/782] SQUASH: bcm2835-dma: Remove debugging
|
2019-07-09 18:32:28 +00:00
|
|
|
|
|
|
|
|
Signed-off-by: Phil Elwell <phil@raspberrypi.org>
|
|
|
|
|
---
|
|
|
|
|
drivers/dma/bcm2835-dma.c | 5 -----
|
|
|
|
|
1 file changed, 5 deletions(-)
|
|
|
|
|
|
|
|
|
|
--- a/drivers/dma/bcm2835-dma.c
|
|
|
|
|
+++ b/drivers/dma/bcm2835-dma.c
|
|
|
|
|
@@ -584,8 +584,6 @@ static void bcm2835_dma_fill_cb_chain_wi
|
|
|
|
|
dma_addr_t addr;
|
|
|
|
|
struct scatterlist *sgent;
|
|
|
|
|
|
|
|
|
|
- pr_err("dma_fill_chain_with_sg(ch %d, dir %d):\n", c->ch, direction);
|
|
|
|
|
-
|
|
|
|
|
max_len = bcm2835_dma_max_frame_length(c);
|
|
|
|
|
for_each_sg(sgl, sgent, sg_len, i) {
|
|
|
|
|
if (c->is_40bit_channel) {
|
|
|
|
|
@@ -603,7 +601,6 @@ static void bcm2835_dma_fill_cb_chain_wi
|
|
|
|
|
scb->srci = upper_32_bits(addr) | BCM2838_DMA40_INC;
|
|
|
|
|
}
|
|
|
|
|
scb->len = min(len, max_len);
|
|
|
|
|
- pr_err(" %llx, %x\n", (u64)addr, scb->len);
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
for (addr = sg_dma_address(sgent),
|
|
|
|
|
@@ -616,7 +613,6 @@ static void bcm2835_dma_fill_cb_chain_wi
|
|
|
|
|
else
|
|
|
|
|
cb->cb->src = addr;
|
|
|
|
|
cb->cb->length = min(len, max_len);
|
|
|
|
|
- pr_err(" %llx, %x\n", (u64)addr, cb->cb->length);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
@@ -659,7 +655,6 @@ static void bcm2835_dma_start_desc(struc
|
|
|
|
|
struct virt_dma_desc *vd = vchan_next_desc(&c->vc);
|
|
|
|
|
struct bcm2835_desc *d;
|
|
|
|
|
|
|
|
|
|
- pr_err("dma_start_desc(%px)\n", vd);
|
|
|
|
|
if (!vd) {
|
|
|
|
|
c->desc = NULL;
|
|
|
|
|
return;
|
