From patchwork Thu Jul 14 21:57:37 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Jiang X-Patchwork-Id: 9230721 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 84C4A60572 for ; Thu, 14 Jul 2016 21:57:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 749E42819A for ; Thu, 14 Jul 2016 21:57:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 68DD42830A; Thu, 14 Jul 2016 21:57:59 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E24082819A for ; Thu, 14 Jul 2016 21:57:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751347AbcGNV56 (ORCPT ); Thu, 14 Jul 2016 17:57:58 -0400 Received: from mga03.intel.com ([134.134.136.65]:43890 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751262AbcGNV56 (ORCPT ); Thu, 14 Jul 2016 17:57:58 -0400 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga103.jf.intel.com with ESMTP; 14 Jul 2016 14:57:57 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.28,364,1464678000"; d="scan'208";a="995500566" Received: from djiang5-desk3.ch.intel.com ([143.182.137.38]) by orsmga001.jf.intel.com with ESMTP; 14 Jul 2016 14:57:57 -0700 Subject: [PATCH 09/40] dmaengine: fsldma: convert callback to helper function From: Dave Jiang To: vinod.koul@intel.com, lars@metafoo.de Cc: dmaengine@vger.kernel.org, dan.j.williams@intel.com, Li Yang , laurent.pinchart@ideasonboard.com Date: Thu, 14 Jul 2016 14:57:37 -0700 Message-ID: <146853345740.12248.5525263487800635124.stgit@djiang5-desk3.ch.intel.com> In-Reply-To: <146853287568.12248.6774252283397125297.stgit@djiang5-desk3.ch.intel.com> References: <146853287568.12248.6774252283397125297.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-Virus-Scanned: ClamAV using ClamSMTP Convert driver to use the new helper function for callback Signed-off-by: Dave Jiang Cc: Li Yang --- drivers/dma/fsldma.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 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/fsldma.c b/drivers/dma/fsldma.c index a8828ed..1251e00 100644 --- a/drivers/dma/fsldma.c +++ b/drivers/dma/fsldma.c @@ -514,12 +514,15 @@ static dma_cookie_t fsldma_run_tx_complete_actions(struct fsldma_chan *chan, BUG_ON(txd->cookie < 0); if (txd->cookie > 0) { + struct dma_desc_callback cb; + ret = txd->cookie; /* Run the link descriptor callback function */ - if (txd->callback) { + dmaengine_desc_get_callback(txd, &cb); + if (desc->callback) { chan_dbg(chan, "LD %p callback\n", desc); - txd->callback(txd->callback_param); + dmaengine_desc_callback_invoke(&cb, NULL); } dma_descriptor_unmap(txd);