From patchwork Thu Jan 19 10:37:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Bailon X-Patchwork-Id: 91852 Delivered-To: patch@linaro.org Received: by 10.140.20.99 with SMTP id 90csp210457qgi; Thu, 19 Jan 2017 02:38:00 -0800 (PST) X-Received: by 10.98.17.4 with SMTP id z4mr9282323pfi.43.1484822280828; Thu, 19 Jan 2017 02:38:00 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n8si3151340pgc.160.2017.01.19.02.38.00; Thu, 19 Jan 2017 02:38:00 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-usb-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@baylibre-com.20150623.gappssmtp.com; spf=pass (google.com: best guess record for domain of linux-usb-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-usb-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751815AbdASKh4 (ORCPT + 4 others); Thu, 19 Jan 2017 05:37:56 -0500 Received: from mail-wm0-f53.google.com ([74.125.82.53]:38551 "EHLO mail-wm0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751820AbdASKhs (ORCPT ); Thu, 19 Jan 2017 05:37:48 -0500 Received: by mail-wm0-f53.google.com with SMTP id r144so70315996wme.1 for ; Thu, 19 Jan 2017 02:37:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=O/DGMdK/5Y8PzIuJevIDeYXKGGJbB4t7bTHHMcahuqc=; b=EFTJebVCIFJv8GLbi1FpS1VFIO12Hk4SUfoALts/dK8LSbVKlWSI62EWy16OUBZOCr twGt2cb2kO1Bp89s7LjzlRH1LO3pJ219o/xkutIupuTzVFjPydjPAKAYwF4syYK8y2cb GtX2WcMN3p58Txs8qtBo57/cY9isMQNn/7AkOkNDAT8bsfdR847bcp1DyGnQjWrT0/2o EH5178XKb+3lZqnZN7T7xHeiwmlDGnvgC/emvWelOP/0W66ZBnrhlVio2Fe8m+3SSnQl KamfkBOazDkbQyvSmMaiDv2mA+OhDl8NCzglb97+ruevl3XI9JnfT4I4HD5CnV+Gj1Bc P8Fw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=O/DGMdK/5Y8PzIuJevIDeYXKGGJbB4t7bTHHMcahuqc=; b=Ioh7/w8OUDhHTsn/ubV/heovm/OsoW1ZXWMLktmFiviWDQZg4j4+I3zGDRC9To71hT W2wRujJt0sG9YdLZ6jjdyC+hKJp28lnpQ9WPMGcdFvJyk3ePguanyD9a0Sul2VgmpQ+W oz68HJpRFtcOAQrzK1sZwZB76bhK7UkidLJZh/KBAhsVecYga8rHGCFaQ+L3uLyjFfjj FlzjQYiYCxkYTScxFAl8xLrxj9RaJ08Zv2wZyM4JpDo0+xXNHJOpqpPnTpwgrdfK9nlT DMh91/jATqw5+uT+e0wzpYSVubRQB4oFGarH+vaM2l60XLxgC4nP3mYvBjrcCLpcCmWf yoNA== X-Gm-Message-State: AIkVDXKwMB6vVESm532C2PXm0OooL9un2GTVWaln+KS3uBtF8lPV/IFFzfW3Brt87jvQe5v7 X-Received: by 10.28.0.73 with SMTP id 70mr2422106wma.109.1484822231415; Thu, 19 Jan 2017 02:37:11 -0800 (PST) Received: from localhost.localdomain ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id c81sm11850470wmf.22.2017.01.19.02.37.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 19 Jan 2017 02:37:10 -0800 (PST) From: Alexandre Bailon To: vinod.koul@intel.com Cc: dmaengine@vger.kernel.org, nsekhar@ti.com, khilman@baylibre.com, ptitiano@baylibre.com, tony@atomide.com, linux-omap@vger.kernel.org, b-liu@ti.com, sergei.shtylyov@cogentembedded.com, grygorii.strashko@ti.com, linux-usb@vger.kernel.org, Alexandre Bailon Subject: [PATCH v3 2/4] dmaengine: cppi41: rename platform variables Date: Thu, 19 Jan 2017 11:37:03 +0100 Message-Id: <20170119103705.13532-3-abailon@baylibre.com> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20170119103705.13532-1-abailon@baylibre.com> References: <20170119103705.13532-1-abailon@baylibre.com> Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org Currently, only the AM335x is supported by the driver. Though the driver has a glue layer to support different platforms, some platform variable names are not prefixed with the platform name. To facilitate the addition of a new platform, rename some variables owned by the AM335x glue. Signed-off-by: Alexandre Bailon --- drivers/dma/cppi41.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) -- 2.10.2 -- To unsubscribe from this list: send the line "unsubscribe linux-usb" 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/cppi41.c b/drivers/dma/cppi41.c index 1743d3d..a6addc3 100644 --- a/drivers/dma/cppi41.c +++ b/drivers/dma/cppi41.c @@ -147,7 +147,7 @@ struct cppi41_dd { }; #define FIST_COMPLETION_QUEUE 93 -static struct chan_queues usb_queues_tx[] = { +static struct chan_queues am335x_usb_queues_tx[] = { /* USB0 ENDP 1 */ [ 0] = { .submit = 32, .complete = 93}, [ 1] = { .submit = 34, .complete = 94}, @@ -183,7 +183,7 @@ static struct chan_queues usb_queues_tx[] = { [29] = { .submit = 90, .complete = 139}, }; -static const struct chan_queues usb_queues_rx[] = { +static const struct chan_queues am335x_usb_queues_rx[] = { /* USB0 ENDP 1 */ [ 0] = { .submit = 1, .complete = 109}, [ 1] = { .submit = 2, .complete = 110}, @@ -910,8 +910,9 @@ static bool cpp41_dma_filter_fn(struct dma_chan *chan, void *param) else queues = cdd->queues_rx; - BUILD_BUG_ON(ARRAY_SIZE(usb_queues_rx) != ARRAY_SIZE(usb_queues_tx)); - if (WARN_ON(cchan->port_num > ARRAY_SIZE(usb_queues_rx))) + BUILD_BUG_ON(ARRAY_SIZE(am335x_usb_queues_rx) != + ARRAY_SIZE(am335x_usb_queues_tx)); + if (WARN_ON(cchan->port_num > ARRAY_SIZE(am335x_usb_queues_rx))) return false; cchan->q_num = queues[cchan->port_num].submit; @@ -939,15 +940,15 @@ static struct dma_chan *cppi41_dma_xlate(struct of_phandle_args *dma_spec, &dma_spec->args[0]); } -static const struct cppi_glue_infos usb_infos = { +static const struct cppi_glue_infos am335x_usb_infos = { .isr = cppi41_irq, - .queues_rx = usb_queues_rx, - .queues_tx = usb_queues_tx, + .queues_rx = am335x_usb_queues_rx, + .queues_tx = am335x_usb_queues_tx, .td_queue = { .submit = 31, .complete = 0 }, }; static const struct of_device_id cppi41_dma_ids[] = { - { .compatible = "ti,am3359-cppi41", .data = &usb_infos}, + { .compatible = "ti,am3359-cppi41", .data = &am335x_usb_infos}, {}, }; MODULE_DEVICE_TABLE(of, cppi41_dma_ids);