From patchwork Fri Oct 17 17:16:49 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Balbi X-Patchwork-Id: 38969 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ee0-f69.google.com (mail-ee0-f69.google.com [74.125.83.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 2C511202DB for ; Fri, 17 Oct 2014 17:19:32 +0000 (UTC) Received: by mail-ee0-f69.google.com with SMTP id b57sf802955eek.4 for ; Fri, 17 Oct 2014 10:19:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe:content-type; bh=xpd6gVqLz3huC40nCtMbIYMBywfgEudFsuTeIRbm5p8=; b=DZhaXCKg/lLiVQt0xVzV3ZR5CjzaTqjmJsb5hwNVtJh96Obq12PTyE7/3TNpzOysGL yfjyUP4vSPMstRby6ARggi726xAnmdu881OPXjXj7+pcxQFfOcV9tUMwlxQeZ7zpBgMP GmC6AsNH98BUtX4AkE3VK5WuNK/fhSpLrkuS9X2dCwddTgdI8NZqXhS6DTUj2jeQLEQO jmyPfS3OIjB2pL9Nw0mDLjBToen8dLVQgNRxzSCM6W7QnLjhSAC0E7dkblOymbGdcUWf qKCcZp5qE5kY6oZYZntt//lW4522HHhLp7UO2Q7PE6M+xChaLZRf0pML6/lxsFkEuQsi IrpQ== X-Gm-Message-State: ALoCoQkUSYgf3HPgVpFfThbcQ7j8SO+zt3/tJhKaiwrFSs6uLBdo75y7BDsrYaVdIqF54ut0Ptxq X-Received: by 10.152.9.37 with SMTP id w5mr12762laa.10.1413566371348; Fri, 17 Oct 2014 10:19:31 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.203.167 with SMTP id kr7ls268962lac.94.gmail; Fri, 17 Oct 2014 10:19:31 -0700 (PDT) X-Received: by 10.152.28.134 with SMTP id b6mr10601943lah.12.1413566371112; Fri, 17 Oct 2014 10:19:31 -0700 (PDT) Received: from mail-lb0-f179.google.com (mail-lb0-f179.google.com. [209.85.217.179]) by mx.google.com with ESMTPS id e4si3011695lbs.54.2014.10.17.10.19.31 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 17 Oct 2014 10:19:31 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.179 as permitted sender) client-ip=209.85.217.179; Received: by mail-lb0-f179.google.com with SMTP id l4so1033600lbv.24 for ; Fri, 17 Oct 2014 10:19:31 -0700 (PDT) X-Received: by 10.112.167.38 with SMTP id zl6mr10266447lbb.34.1413566371013; Fri, 17 Oct 2014 10:19:31 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.84.229 with SMTP id c5csp268325lbz; Fri, 17 Oct 2014 10:19:30 -0700 (PDT) X-Received: by 10.70.96.4 with SMTP id do4mr9759994pdb.133.1413566363648; Fri, 17 Oct 2014 10:19:23 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id tf2si376641pac.129.2014.10.17.10.19.23 for ; Fri, 17 Oct 2014 10:19:23 -0700 (PDT) Received-SPF: none (google.com: linux-usb-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753824AbaJQRTU (ORCPT + 3 others); Fri, 17 Oct 2014 13:19:20 -0400 Received: from devils.ext.ti.com ([198.47.26.153]:36444 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753657AbaJQRSS (ORCPT ); Fri, 17 Oct 2014 13:18:18 -0400 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id s9HHI9ER029038; Fri, 17 Oct 2014 12:18:09 -0500 Received: from DFLE72.ent.ti.com (dfle72.ent.ti.com [128.247.5.109]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id s9HHI93k001184; Fri, 17 Oct 2014 12:18:09 -0500 Received: from dflp33.itg.ti.com (10.64.6.16) by DFLE72.ent.ti.com (128.247.5.109) with Microsoft SMTP Server id 14.3.174.1; Fri, 17 Oct 2014 12:18:09 -0500 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp33.itg.ti.com (8.14.3/8.13.8) with ESMTP id s9HHI8Hp003323; Fri, 17 Oct 2014 12:18:09 -0500 From: Felipe Balbi To: Linux USB Mailing List CC: Greg KH , , Paul Zimmerman , , , , , , , Vinod Koul , Felipe Balbi Subject: [PATCH 42/67] usb: musb: ux500_dma: use dmaengine_xxx() APIs Date: Fri, 17 Oct 2014 12:16:49 -0500 Message-ID: <1413566234-13537-43-git-send-email-balbi@ti.com> X-Mailer: git-send-email 2.1.0.GIT In-Reply-To: <1413566234-13537-1-git-send-email-balbi@ti.com> References: <1413566234-13537-1-git-send-email-balbi@ti.com> MIME-Version: 1.0 Sender: linux-usb-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-usb@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: balbi@ti.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.179 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Vinod Koul The drivers should use dmaengine_terminate_all() or dmaengine_slave_config() API instead of accessing the device_control which will be deprecated soon Signed-off-by: Vinod Koul Signed-off-by: Felipe Balbi --- drivers/usb/musb/ux500_dma.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/usb/musb/ux500_dma.c b/drivers/usb/musb/ux500_dma.c index 221faed..734dc84 100644 --- a/drivers/usb/musb/ux500_dma.c +++ b/drivers/usb/musb/ux500_dma.c @@ -121,8 +121,7 @@ static bool ux500_configure_channel(struct dma_channel *channel, slave_conf.dst_maxburst = 16; slave_conf.device_fc = false; - dma_chan->device->device_control(dma_chan, DMA_SLAVE_CONFIG, - (unsigned long) &slave_conf); + dmaengine_slave_config(dma_chan, &slave_conf); dma_desc = dmaengine_prep_slave_sg(dma_chan, &sg, 1, direction, DMA_PREP_INTERRUPT | DMA_CTRL_ACK); @@ -246,9 +245,7 @@ static int ux500_dma_channel_abort(struct dma_channel *channel) musb_writew(epio, MUSB_RXCSR, csr); } - ux500_channel->dma_chan->device-> - device_control(ux500_channel->dma_chan, - DMA_TERMINATE_ALL, 0); + dmaengine_terminate_all(ux500_channel->dma_chan); channel->status = MUSB_DMA_STATUS_FREE; } return 0;