diff options
| author | Dave Jiang <dave.jiang@intel.com> | 2015-08-11 08:49:11 -0700 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2015-08-17 13:37:31 +0530 |
| commit | 09659a5978e16a7f3676fd6cb41e21daa77ce9a6 (patch) | |
| tree | adfa26a3b364d657d90a56cf21e7ba22f2b83d67 | |
| parent | c7b0e8d7b5d1523ca3a85d3d3d9d113bb19a5668 (diff) | |
dmaengine: ioatdma: Clean up IOAT_COMPLETION_PENDING flag
IOAT_COMPLETION_PENDING flag was deprecated for v2 and v3 drivers but was
not cleaned up. Doing that now. The commit deprecated this flag was
4dec23d7 ioatdma: fix race between updating ioat->head and
IOAT_COMPLETION_PENDING.
Signed-off-by: Dave Jiang <dave.jiang@intel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
| -rw-r--r-- | drivers/dma/ioat/dma.c | 2 | ||||
| -rw-r--r-- | drivers/dma/ioat/dma.h | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/drivers/dma/ioat/dma.c b/drivers/dma/ioat/dma.c index 7435585dbbd6..50d0112b602a 100644 --- a/drivers/dma/ioat/dma.c +++ b/drivers/dma/ioat/dma.c @@ -206,7 +206,6 @@ static void __ioat_restart_chan(struct ioatdma_chan *ioat_chan) /* set the tail to be re-issued */ ioat_chan->issued = ioat_chan->tail; ioat_chan->dmacount = 0; - set_bit(IOAT_COMPLETION_PENDING, &ioat_chan->state); mod_timer(&ioat_chan->timer, jiffies + COMPLETION_TIMEOUT); dev_dbg(to_dev(ioat_chan), @@ -689,7 +688,6 @@ static void __cleanup(struct ioatdma_chan *ioat_chan, dma_addr_t phys_complete) if (active - i == 0) { dev_dbg(to_dev(ioat_chan), "%s: cancel completion timeout\n", __func__); - clear_bit(IOAT_COMPLETION_PENDING, &ioat_chan->state); mod_timer(&ioat_chan->timer, jiffies + IDLE_TIMEOUT); } diff --git a/drivers/dma/ioat/dma.h b/drivers/dma/ioat/dma.h index 9bc1395f23b3..1bc084986646 100644 --- a/drivers/dma/ioat/dma.h +++ b/drivers/dma/ioat/dma.h @@ -95,7 +95,6 @@ struct ioatdma_chan { dma_addr_t last_completion; spinlock_t cleanup_lock; unsigned long state; - #define IOAT_COMPLETION_PENDING 0 #define IOAT_COMPLETION_ACK 1 #define IOAT_RESET_PENDING 2 #define IOAT_KOBJ_INIT_FAIL 3 |