On Fri, 2011-09-02 at 09:44 +0900, Boojin Kim wrote: > Origianl code carries out the start operation after flush operation. Orignal > But start operation is not required for DMA_TERMINATE_ALL command. > So, This patch removes the unnecessary start operation and only carries out this should be all lowercase > the flush oeration for handling DMA_TERMINATE_ALL command. operation ^^^^^^^^ > > Signed-off-by: Boojin Kim <[email protected]> > Acked-by: Linus Walleij <[email protected]> > Acked-by: Vinod Koul <[email protected]> > Cc: Dan Williams <[email protected]> > Signed-off-by: Kukjin Kim <[email protected]> > --- > drivers/dma/pl330.c | 11 +++++++---- > 1 files changed, 7 insertions(+), 4 deletions(-) > > diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c > index e7f9d1d..59943ec 100644 > --- a/drivers/dma/pl330.c > +++ b/drivers/dma/pl330.c > @@ -262,10 +262,11 @@ static int pl330_alloc_chan_resources(struct dma_chan > *chan) > static int pl330_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd, > unsigned long arg) > { > struct dma_pl330_chan *pch = to_pchan(chan); > - struct dma_pl330_desc *desc; > + struct dma_pl330_desc *desc, *_dt; > unsigned long flags; > struct dma_pl330_dmac *pdmac = pch->dmac; > struct dma_slave_config *slave_config; > + LIST_HEAD(list); > > switch (cmd) { > case DMA_TERMINATE_ALL: > @@ -275,12 +276,14 @@ static int pl330_control(struct dma_chan *chan, enum > dma_ctrl_cmd cmd, unsigned > pl330_chan_ctrl(pch->pl330_chid, PL330_OP_FLUSH); > > /* Mark all desc done */ > - list_for_each_entry(desc, &pch->work_list, node) > + list_for_each_entry_safe(desc, _dt, &pch->work_list , node) { > desc->status = DONE; > + pch->completed = desc->txd.cookie; > + list_move_tail(&desc->node, &list); > + } > > + list_splice_tail_init(&list, &pdmac->desc_pool); > spin_unlock_irqrestore(&pch->lock, flags); > - > - pl330_tasklet((unsigned long) pch); > break; > case DMA_SLAVE_CONFIG: > slave_config = (struct dma_slave_config *)arg;
If this is the only fix required in entire series, I can fix this up while applying -- ~Vinod -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
