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>

diff --git a/drivers/dma/ioat/dma.c b/drivers/dma/ioat/dma.c
index 7435585dbbd6148da0fdf054d9eadb5dfe165649..50d0112b602a12363c47516d986f014ae7c9cca7 100644 (file)
--- 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 9bc1395f23b3579f60d1ce8142b06c0f854fd7ae..1bc084986646d415385d0ca3358b2d2966a3a666 100644 (file)
--- 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