From patchwork Mon Jul 20 22:48:41 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Jiang X-Patchwork-Id: 6831251 Return-Path: X-Original-To: patchwork-dmaengine@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 8B8239F38B for ; Mon, 20 Jul 2015 22:48:52 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A9EEE2064B for ; Mon, 20 Jul 2015 22:48:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3706C20667 for ; Mon, 20 Jul 2015 22:48:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757128AbbGTWsn (ORCPT ); Mon, 20 Jul 2015 18:48:43 -0400 Received: from mga14.intel.com ([192.55.52.115]:57491 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757098AbbGTWsm (ORCPT ); Mon, 20 Jul 2015 18:48:42 -0400 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga103.fm.intel.com with ESMTP; 20 Jul 2015 15:48:43 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.15,510,1432623600"; d="scan'208";a="767947737" Received: from djiang5-desk3.ch.intel.com ([143.182.51.82]) by orsmga002.jf.intel.com with ESMTP; 20 Jul 2015 15:48:41 -0700 Subject: [PATCH] IOATDMA: Clean up IOAT_COMPLETION_PENDING flag From: Dave Jiang To: vinod.koul@intel.com Cc: dmaengine@vger.kernel.org, dan.j.williams@intel.com Date: Mon, 20 Jul 2015 15:48:41 -0700 Message-ID: <20150720224841.8066.14264.stgit@djiang5-desk3.ch.intel.com> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Sender: dmaengine-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org X-Spam-Status: No, score=-8.1 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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. Signed-off-by: Dave Jiang --- drivers/dma/ioat/dma_v2.c | 2 -- drivers/dma/ioat/dma_v3.c | 1 - 2 files changed, 3 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe dmaengine" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/dma/ioat/dma_v2.c b/drivers/dma/ioat/dma_v2.c index 69c7dfc..96ad2a0 100644 --- a/drivers/dma/ioat/dma_v2.c +++ b/drivers/dma/ioat/dma_v2.c @@ -163,7 +163,6 @@ static void __cleanup(struct ioat2_dma_chan *ioat, dma_addr_t phys_complete) if (active - i == 0) { dev_dbg(to_dev(chan), "%s: cancel completion timeout\n", __func__); - clear_bit(IOAT_COMPLETION_PENDING, &chan->state); mod_timer(&chan->timer, jiffies + IDLE_TIMEOUT); } } @@ -201,7 +200,6 @@ void __ioat2_restart_chan(struct ioat2_dma_chan *ioat) /* set the tail to be re-issued */ ioat->issued = ioat->tail; ioat->dmacount = 0; - set_bit(IOAT_COMPLETION_PENDING, &chan->state); mod_timer(&chan->timer, jiffies + COMPLETION_TIMEOUT); dev_dbg(to_dev(chan), diff --git a/drivers/dma/ioat/dma_v3.c b/drivers/dma/ioat/dma_v3.c index 64790a4..f448689 100644 --- a/drivers/dma/ioat/dma_v3.c +++ b/drivers/dma/ioat/dma_v3.c @@ -436,7 +436,6 @@ static void __cleanup(struct ioat2_dma_chan *ioat, dma_addr_t phys_complete) if (active - i == 0) { dev_dbg(to_dev(chan), "%s: cancel completion timeout\n", __func__); - clear_bit(IOAT_COMPLETION_PENDING, &chan->state); mod_timer(&chan->timer, jiffies + IDLE_TIMEOUT); } /* 5 microsecond delay per pending descriptor */