Skip to content

Commit

Permalink
dw_dmac: remove unnecessary tx_list field in dw_dma_chan
Browse files Browse the repository at this point in the history
The soft LLP mode is working for active descriptor only. So, we do not need to
have a copy of its pointer.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
  • Loading branch information
Andy Shevchenko authored and Vinod Koul committed Jan 28, 2013
1 parent 985a6c7 commit fdf475f
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 6 deletions.
20 changes: 15 additions & 5 deletions drivers/dma/dw_dmac.c
Original file line number Diff line number Diff line change
Expand Up @@ -282,9 +282,9 @@ static void dwc_dostart(struct dw_dma_chan *dwc, struct dw_desc *first)

dwc_initialize(dwc);

dwc->tx_list = &first->tx_list;
dwc->tx_node_active = &first->tx_list;

/* Submit first block */
dwc_do_single_block(dwc, first);

return;
Expand Down Expand Up @@ -402,15 +402,25 @@ static void dwc_scan_descriptors(struct dw_dma *dw, struct dw_dma_chan *dwc)
dma_writel(dw, CLEAR.XFER, dwc->mask);

if (test_bit(DW_DMA_IS_SOFT_LLP, &dwc->flags)) {
if (dwc->tx_node_active != dwc->tx_list) {
desc = to_dw_desc(dwc->tx_node_active);
struct list_head *head, *active = dwc->tx_node_active;

/*
* We are inside first active descriptor.
* Otherwise something is really wrong.
*/
desc = dwc_first_active(dwc);

head = &desc->tx_list;
if (active != head) {
child = to_dw_desc(active);

/* Submit next block */
dwc_do_single_block(dwc, desc);
spin_unlock_irqrestore(&dwc->lock, flags);
dwc_do_single_block(dwc, child);

spin_unlock_irqrestore(&dwc->lock, flags);
return;
}

/* We are done here */
clear_bit(DW_DMA_IS_SOFT_LLP, &dwc->flags);
}
Expand Down
1 change: 0 additions & 1 deletion drivers/dma/dw_dmac_regs.h
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,6 @@ struct dw_dma_chan {
bool initialized;

/* software emulation of the LLP transfers */
struct list_head *tx_list;
struct list_head *tx_node_active;

spinlock_t lock;
Expand Down

0 comments on commit fdf475f

Please sign in to comment.