From patchwork Wed Feb 15 13:56:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Bailon X-Patchwork-Id: 9574127 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 865DC60586 for ; Wed, 15 Feb 2017 13:57:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7F19E28451 for ; Wed, 15 Feb 2017 13:57:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 73F8328466; Wed, 15 Feb 2017 13:57:03 +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 02FBF28454 for ; Wed, 15 Feb 2017 13:57:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751315AbdBON5C (ORCPT ); Wed, 15 Feb 2017 08:57:02 -0500 Received: from mail-wm0-f48.google.com ([74.125.82.48]:36150 "EHLO mail-wm0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751387AbdBON4y (ORCPT ); Wed, 15 Feb 2017 08:56:54 -0500 Received: by mail-wm0-f48.google.com with SMTP id c85so42508458wmi.1 for ; Wed, 15 Feb 2017 05:56:48 -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=HZPfYTePYZgRK5FNOhJ+43HZAGTHmk5/P03WIvfiYKQ=; b=XIAUvmWUvgeLfvvdA91RsBKvRc12bcrHoIupuR+YhB0yUrKW0DcEZ8CzE41dOSD0X0 C2S6SVJYz3TDPzKHJDSGEfMNaaRrQdPt4mnngYPOBQJ0LDW7i+BgMq91LHY2sVrMRQqC dRaO0Sg7IbmjifHkm8qN9/vnDrhyYHFl8NfLGIw0XuzF0NWs19BD5Bzu+UXPd9JIq98l Zf+6O6WP8FLJNLb7Ylm1yNeRI36zp7ErxsEmJVUqW7ATJacAuA8NQv0NYE4DHbrJvW3Y 8XhEX2Pb9/HJvSsYa0gXfpZOwi17cSrdG9+CBqxaHpbKWRg4eSHuhwsFRJBeO31VFhG7 QAbQ== 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=HZPfYTePYZgRK5FNOhJ+43HZAGTHmk5/P03WIvfiYKQ=; b=RxHDf9MW08jyrq/czB+lJqUIg8ebTVCcLfEXPvxnROiWL3oH4S/G2o0u2Nt++Swoxf Z1KmCRHdQZJ7SpDg+gQCwyXwLRNBWdkpnWpEAdpTdriYv7UM9atLtUxuV7is8tXOKSLp 5c8t0YjX8RsSOEZbVBqtjgFOpv0gqg1oXOqei7reltPQwyokzxH3HxXvRJCOGDMH4nWo +uT4SGvCnyOfm0ndYXGWZA+OKuvWkYt0TJdqoSF0L77jq7+GL+rQdgpP9Xhu6t+nX9zj 4Ox/ycN6xW/EKI0JbWnoY/aA9BqMQ6eJ3dDVHoZiJxCY/h41RgsBOBqh44T87oApcoyd 9snQ== X-Gm-Message-State: AMke39no0qM0coRdBXRf3vUsfdpPr3uXauQV6jV7ZOouX97A2xaJAba43v/bbcveKcOwtvTq X-Received: by 10.28.69.202 with SMTP id l71mr8297816wmi.68.1487167002674; Wed, 15 Feb 2017 05:56:42 -0800 (PST) Received: from localhost.localdomain ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id a35sm5023174wra.21.2017.02.15.05.56.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 15 Feb 2017 05:56:42 -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, linux-usb@vger.kernel.org, Alexandre Bailon Subject: [PATCH v5 2/5] dmaengine: cppi41: rename platform variables Date: Wed, 15 Feb 2017 14:56:33 +0100 Message-Id: <20170215135636.31427-3-abailon@baylibre.com> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20170215135636.31427-1-abailon@baylibre.com> References: <20170215135636.31427-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 34a8156..d1b5569 100644 --- a/drivers/dma/cppi41.c +++ b/drivers/dma/cppi41.c @@ -149,7 +149,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}, @@ -185,7 +185,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}, @@ -932,8 +932,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; @@ -961,15 +962,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);