提交 a4dcdd84 编写于 作者: M Martin Sperl 提交者: Vinod Koul

dmaengine: bcm2835: move cyclic member from bcm2835_chan into bcm2835_desc

In preparation to consolidating code we move the cyclic member
into the bcm_2835_desc structure.
Signed-off-by: NMartin Sperl <kernel@martin.sperl.org>
Reviewed-by: NEric Anholt <eric@anholt.net>
Signed-off-by: NEric Anholt <eric@anholt.net>
Signed-off-by: NVinod Koul <vinod.koul@intel.com>
上级 e42685d7
...@@ -73,7 +73,6 @@ struct bcm2835_chan { ...@@ -73,7 +73,6 @@ struct bcm2835_chan {
struct list_head node; struct list_head node;
struct dma_slave_config cfg; struct dma_slave_config cfg;
bool cyclic;
unsigned int dreq; unsigned int dreq;
int ch; int ch;
...@@ -93,6 +92,8 @@ struct bcm2835_desc { ...@@ -93,6 +92,8 @@ struct bcm2835_desc {
unsigned int frames; unsigned int frames;
size_t size; size_t size;
bool cyclic;
}; };
#define BCM2835_DMA_CS 0x00 #define BCM2835_DMA_CS 0x00
...@@ -377,8 +378,6 @@ static void bcm2835_dma_issue_pending(struct dma_chan *chan) ...@@ -377,8 +378,6 @@ static void bcm2835_dma_issue_pending(struct dma_chan *chan)
struct bcm2835_chan *c = to_bcm2835_dma_chan(chan); struct bcm2835_chan *c = to_bcm2835_dma_chan(chan);
unsigned long flags; unsigned long flags;
c->cyclic = true; /* Nothing else is implemented */
spin_lock_irqsave(&c->vc.lock, flags); spin_lock_irqsave(&c->vc.lock, flags);
if (vchan_issue_pending(&c->vc) && !c->desc) if (vchan_issue_pending(&c->vc) && !c->desc)
bcm2835_dma_start_desc(c); bcm2835_dma_start_desc(c);
...@@ -432,6 +431,7 @@ static struct dma_async_tx_descriptor *bcm2835_dma_prep_dma_cyclic( ...@@ -432,6 +431,7 @@ static struct dma_async_tx_descriptor *bcm2835_dma_prep_dma_cyclic(
d->c = c; d->c = c;
d->dir = direction; d->dir = direction;
d->frames = buf_len / period_len; d->frames = buf_len / period_len;
d->cyclic = true;
d->cb_list = kcalloc(d->frames, sizeof(*d->cb_list), GFP_KERNEL); d->cb_list = kcalloc(d->frames, sizeof(*d->cb_list), GFP_KERNEL);
if (!d->cb_list) { if (!d->cb_list) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册