From 1fe77d9d2d5a872768e3c7ab34ccfa95a7a25ccc Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Wed, 3 Mar 2010 11:47:42 -0700 Subject: [PATCH] --- yaml --- r: 185763 b: refs/heads/master c: b372ec2d900a5b50e47ef9e9624536ad146236be h: refs/heads/master i: 185761: 6ab8233ccbe01b8c78680c617dfef6ff29574abf 185759: c6761b308e2a279f353ecdbd6da856a3cd9fd467 v: v3 --- [refs] | 2 +- trunk/drivers/dma/ioat/dma_v3.c | 10 +--------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 7ce5e81241ec..3c2a4b9c79c7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 773d9e2d8dbf02cfaf65786cf9100eef02c9fda4 +refs/heads/master: b372ec2d900a5b50e47ef9e9624536ad146236be diff --git a/trunk/drivers/dma/ioat/dma_v3.c b/trunk/drivers/dma/ioat/dma_v3.c index f270fa11275b..bff48e8cffc4 100644 --- a/trunk/drivers/dma/ioat/dma_v3.c +++ b/trunk/drivers/dma/ioat/dma_v3.c @@ -341,16 +341,8 @@ static void ioat3_restart_channel(struct ioat2_dma_chan *ioat) { struct ioat_chan_common *chan = &ioat->base; unsigned long phys_complete; - u32 status; - - status = ioat_chansts(chan); - if (is_ioat_active(status) || is_ioat_idle(status)) - ioat_suspend(chan); - while (is_ioat_active(status) || is_ioat_idle(status)) { - status = ioat_chansts(chan); - cpu_relax(); - } + ioat2_quiesce(chan, 0); if (ioat_cleanup_preamble(chan, &phys_complete)) __cleanup(ioat, phys_complete);