From patchwork Tue Jan 17 13:45:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Bailon X-Patchwork-Id: 9521041 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 9AC03601C3 for ; Tue, 17 Jan 2017 13:54:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7BB4428564 for ; Tue, 17 Jan 2017 13:54:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 70A1128568; Tue, 17 Jan 2017 13:54:15 +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.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=unavailable 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 1C37528564 for ; Tue, 17 Jan 2017 13:54:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751103AbdAQNyO (ORCPT ); Tue, 17 Jan 2017 08:54:14 -0500 Received: from mail-wm0-f46.google.com ([74.125.82.46]:36932 "EHLO mail-wm0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751023AbdAQNyM (ORCPT ); Tue, 17 Jan 2017 08:54:12 -0500 Received: by mail-wm0-f46.google.com with SMTP id c206so223839242wme.0 for ; Tue, 17 Jan 2017 05:54: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=yTckkykYWR9l9vrA9ijZRalSBCzd9kFqI+jabePHdOk=; b=UIeeIntZ6xGgxlez8/HP30B9EjlMd8Noq+BrDFRU5/imw+BBFx+4s6SSDeOxTfkqgy Bh/F0/e+gNTiXlAhUw5166oynzDq39WEsJcljw1veaLRislxQxdI9fE7fPqjXWQWxR47 W9sTnql+1tWgOQA9mVng53xsOED7sRXUFekBDWImoLN5A8+N4e4h6VzGI+qnqm7qQHTy PZqqgB4j02mCpEp0IsWMa6Iq8G/ZjyXQnwLr5mnFY6ZUEZB9vXFgpw9tfmHJeBNMc9wy DKY9sbp3+uplPc7fPzbKislfnkHLQ6jOLJmth+MmyeyFrSdoxIlhQleei9bJ+mRRqhMI md8A== 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=yTckkykYWR9l9vrA9ijZRalSBCzd9kFqI+jabePHdOk=; b=mTCavbwzuH7+fC/EfAj6rH2w5UvPKNCM6++lO7oI+lcj9bHKQAg45HbznsS8A2Pe8D czyuEZopijog/FHXeoVoWChuKrILNYBENNKbQ2oMfKA4QLLhTda5ZBvVbJdvQ4W9paqM FEPghAcW1Z/dPz7ZcDKSXFSEjn3HTuezBCQaYB5bqqEs0kXdSuGlH6xTcpBH3j4XhNqP q6LbV38GWwP0pSrQ1jrB8t8ZL71dtcu/pQWTyUjlav92u5Cx6I2/6bIUMn+rN+Rao7QQ BpNVNBte6pgHZwlxuQGqBKRCoq3h8Fp4q49HyWY3l9cw9K3eY17sjsvvnbjp1gpybtls ThJQ== X-Gm-Message-State: AIkVDXIzR9vcUclK9pA6Dr2RnslFmKhNobFmu9RkzYLCNyOufxPV+WtgziHI8HAR9bL4/BoH X-Received: by 10.28.84.88 with SMTP id p24mr15445547wmi.52.1484660754132; Tue, 17 Jan 2017 05:45:54 -0800 (PST) Received: from localhost.localdomain ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id l187sm37064811wml.6.2017.01.17.05.45.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 17 Jan 2017 05:45:53 -0800 (PST) From: Alexandre Bailon To: vinod.koul@intel.com, b-liu@ti.com, robh+dt@kernel.org Cc: dmaengine@vger.kernel.org, nsekhar@ti.com, khilman@baylibre.com, ptitiano@baylibre.com, tony@atomide.com, linux-omap@vger.kernel.org, sergei.shtylyov@cogentembedded.com, devicetree@vger.kernel.org, Alexandre Bailon Subject: [PATCH v2 4/7] dmaengine: cppi41: rename platform variables Date: Tue, 17 Jan 2017 14:45:37 +0100 Message-Id: <20170117134540.9988-5-abailon@baylibre.com> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20170117134540.9988-1-abailon@baylibre.com> References: <20170117134540.9988-1-abailon@baylibre.com> Sender: dmaengine-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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(-) diff --git a/drivers/dma/cppi41.c b/drivers/dma/cppi41.c index ecccf7b..5527376 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);