android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dma: mv_xor: Remove all callers of mv_xor_slot_cleanup()

Browse Source 
In order to simplify the code, remove all the calls to the locked
mv_xor_slot_cleanup() and instead use the unlocked version only,

It's less error prone to have just one function, and require the caller
to ensure proper locking.

Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
This commit is contained in:
Ezequiel Garcia 2014-03-07 16:46:46 -03:00 committed by Dan Williams
parent 890766d278
commit e43147acba
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/dma/mv_xor.c
View File

@ -379,7 +379,10 @@ mv_xor_slot_cleanup(struct mv_xor_chan *mv_chan)
static void mv_xor_tasklet(unsigned long data) static void mv_xor_tasklet(unsigned long data)
{ {
struct mv_xor_chan *chan = (struct mv_xor_chan *) data; struct mv_xor_chan *chan = (struct mv_xor_chan *) data;
mv_xor_slot_cleanup(chan);
spin_lock_bh(&chan->lock);
__mv_xor_slot_cleanup(chan);
spin_unlock_bh(&chan->lock);
} }
static struct mv_xor_desc_slot * static struct mv_xor_desc_slot *
@ -658,9 +661,10 @@ static void mv_xor_free_chan_resources(struct dma_chan *chan)
struct mv_xor_desc_slot *iter, *_iter; struct mv_xor_desc_slot *iter, *_iter;
int in_use_descs = 0; int in_use_descs = 0;
mv_xor_slot_cleanup(mv_chan);
spin_lock_bh(&mv_chan->lock); spin_lock_bh(&mv_chan->lock);
__mv_xor_slot_cleanup(mv_chan);
list_for_each_entry_safe(iter, _iter, &mv_chan->chain, list_for_each_entry_safe(iter, _iter, &mv_chan->chain,
chain_node) { chain_node) {
in_use_descs++; in_use_descs++;
@ -704,7 +708,10 @@ static enum dma_status mv_xor_status(struct dma_chan *chan,
ret = dma_cookie_status(chan, cookie, txstate); ret = dma_cookie_status(chan, cookie, txstate);
if (ret == DMA_COMPLETE) if (ret == DMA_COMPLETE)
return ret; return ret;
mv_xor_slot_cleanup(mv_chan);
spin_lock_bh(&mv_chan->lock);
__mv_xor_slot_cleanup(mv_chan);
spin_unlock_bh(&mv_chan->lock);
return dma_cookie_status(chan, cookie, txstate); return dma_cookie_status(chan, cookie, txstate);
} }