diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/dma/iop-adma.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/dma/iop-adma.c b/drivers/dma/iop-adma.c index 2aa3df50c842..93252294f32b 100644 --- a/drivers/dma/iop-adma.c +++ b/drivers/dma/iop-adma.c | |||
@@ -255,8 +255,6 @@ static void __iop_adma_slot_cleanup(struct iop_adma_chan *iop_chan) | |||
255 | 255 | ||
256 | BUG_ON(!seen_current); | 256 | BUG_ON(!seen_current); |
257 | 257 | ||
258 | iop_chan_idle(busy, iop_chan); | ||
259 | |||
260 | if (cookie > 0) { | 258 | if (cookie > 0) { |
261 | iop_chan->completed_cookie = cookie; | 259 | iop_chan->completed_cookie = cookie; |
262 | pr_debug("\tcompleted cookie %d\n", cookie); | 260 | pr_debug("\tcompleted cookie %d\n", cookie); |
@@ -1226,9 +1224,6 @@ static int __devinit iop_adma_probe(struct platform_device *pdev) | |||
1226 | } | 1224 | } |
1227 | 1225 | ||
1228 | spin_lock_init(&iop_chan->lock); | 1226 | spin_lock_init(&iop_chan->lock); |
1229 | init_timer(&iop_chan->cleanup_watchdog); | ||
1230 | iop_chan->cleanup_watchdog.data = (unsigned long) iop_chan; | ||
1231 | iop_chan->cleanup_watchdog.function = iop_adma_tasklet; | ||
1232 | INIT_LIST_HEAD(&iop_chan->chain); | 1227 | INIT_LIST_HEAD(&iop_chan->chain); |
1233 | INIT_LIST_HEAD(&iop_chan->all_slots); | 1228 | INIT_LIST_HEAD(&iop_chan->all_slots); |
1234 | INIT_RCU_HEAD(&iop_chan->common.rcu); | 1229 | INIT_RCU_HEAD(&iop_chan->common.rcu); |