提交 f5c6a7df 编写于 作者: A Andy Shevchenko 提交者: Vinod Koul

dw_dmac: update tx_node_active in dwc_do_single_block

The "else" keyword in the dw_dma_tasklet is removed as well. All together
simplifies the logic of the code and understanding of what is happening there.
Signed-off-by: NAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: NViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: NVinod Koul <vinod.koul@intel.com>
上级 21e93c1e
...@@ -247,6 +247,9 @@ static inline void dwc_do_single_block(struct dw_dma_chan *dwc, ...@@ -247,6 +247,9 @@ static inline void dwc_do_single_block(struct dw_dma_chan *dwc,
channel_writel(dwc, CTL_LO, ctllo); channel_writel(dwc, CTL_LO, ctllo);
channel_writel(dwc, CTL_HI, desc->lli.ctlhi); channel_writel(dwc, CTL_HI, desc->lli.ctlhi);
channel_set_bit(dw, CH_EN, dwc->mask); channel_set_bit(dw, CH_EN, dwc->mask);
/* Move pointer to next descriptor */
dwc->tx_node_active = dwc->tx_node_active->next;
} }
/* Called with dwc->lock held and bh disabled */ /* Called with dwc->lock held and bh disabled */
...@@ -278,7 +281,7 @@ static void dwc_dostart(struct dw_dma_chan *dwc, struct dw_desc *first) ...@@ -278,7 +281,7 @@ static void dwc_dostart(struct dw_dma_chan *dwc, struct dw_desc *first)
dwc_initialize(dwc); dwc_initialize(dwc);
dwc->tx_list = &first->tx_list; dwc->tx_list = &first->tx_list;
dwc->tx_node_active = first->tx_list.next; dwc->tx_node_active = &first->tx_list;
dwc_do_single_block(dwc, first); dwc_do_single_block(dwc, first);
...@@ -604,18 +607,13 @@ static void dw_dma_tasklet(unsigned long data) ...@@ -604,18 +607,13 @@ static void dw_dma_tasklet(unsigned long data)
dma_writel(dw, CLEAR.XFER, dwc->mask); dma_writel(dw, CLEAR.XFER, dwc->mask);
/* move pointer to next descriptor */
dwc->tx_node_active =
dwc->tx_node_active->next;
dwc_do_single_block(dwc, desc); dwc_do_single_block(dwc, desc);
spin_unlock_irqrestore(&dwc->lock, flags); spin_unlock_irqrestore(&dwc->lock, flags);
continue; continue;
} else {
/* we are done here */
clear_bit(DW_DMA_IS_SOFT_LLP, &dwc->flags);
} }
/* we are done here */
clear_bit(DW_DMA_IS_SOFT_LLP, &dwc->flags);
} }
spin_unlock_irqrestore(&dwc->lock, flags); spin_unlock_irqrestore(&dwc->lock, flags);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册