Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 09659a59 authored by Dave Jiang's avatar Dave Jiang Committed by Vinod Koul
Browse files

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: default avatarDave Jiang <dave.jiang@intel.com>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent c7b0e8d7

drivers/dma/ioat/dma.c

+0 −2
Original line number Diff line number Diff line
@@ -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);

	}

drivers/dma/ioat/dma.h

+0 −1
Original line number Diff line number Diff line
@@ -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