dmaengine: ioatdma: Clean up IOAT_COMPLETION_PENDING flag
authorDave Jiang <dave.jiang@intel.com>
Tue, 11 Aug 2015 15:49:11 +0000 (08:49 -0700)
committerVinod Koul <vinod.koul@intel.com>
Mon, 17 Aug 2015 08:07:31 +0000 (13:37 +0530)
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>
drivers/dma/ioat/dma.c
drivers/dma/ioat/dma.h

index 7435585..50d0112 100644 (file)
@@ -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);
        }
 
Simple merge