From patchwork Wed Jan 25 10:17:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Bailon X-Patchwork-Id: 9536683 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 62B2E601D7 for ; Wed, 25 Jan 2017 10:17:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 51F861FF28 for ; Wed, 25 Jan 2017 10:17:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4504D27DF9; Wed, 25 Jan 2017 10:17:48 +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=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 EC6351FF28 for ; Wed, 25 Jan 2017 10:17:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751832AbdAYKRp (ORCPT ); Wed, 25 Jan 2017 05:17:45 -0500 Received: from mail-wm0-f43.google.com ([74.125.82.43]:38495 "EHLO mail-wm0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751852AbdAYKR2 (ORCPT ); Wed, 25 Jan 2017 05:17:28 -0500 Received: by mail-wm0-f43.google.com with SMTP id r144so22071522wme.1 for ; Wed, 25 Jan 2017 02:17:27 -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=NK5aA3VtaOA9h5vHNwwnUh3sySIEybqq/zGfwqma2+w=; b=RZ94EH9ckFpwjXcG3JSYyaMWn7lXdcskxH5AbmPauBKe0Nt7EsQMRVcKUSHhUulZsd M7O0RCrMOvQRjxvuKl9p6oewuMR4TK6yUMqBACg4MABBQh2XBDUkwTCv4ovyGX7q2Jrp LGcd+uC2xNIVo0u4Ll1djNzLmFW07D+Zlck4erOnvt8mxEwASaGV384EyfJoDZA+Ffun 7x7hpPcSFCDCZWs7R1cGGFHxr3RQGVXbXQtz4jxyWezJY0AGpTI3GSpfH0jQFMDphnE/ 9RugUFxuKdy/jZvwWCazepj4ADAf8GabJLoHF5UaWSjWHrsAFm/wWvhDaVhyHaIWWDmN /yeg== 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=NK5aA3VtaOA9h5vHNwwnUh3sySIEybqq/zGfwqma2+w=; b=VzYn0z5TEOhmpx4FQ5jnl7SHFvOT3TRV9x4OTYlsocOA0Uvm82VASYzdE1Gf7gY69U jUfO5XlnVL2vePZ95heoSpIbap705K6izt6v9trGzJoiFGfT2yPcK9amvYHcsN58TfDk iMnwoKm5M8J0+TvDeQH6CwHrQeOMS9G+zfD7+5JBT4ozjFuVqVqe5xwnmqjyB0JDvJ/H aBQ3RjT9V0JGoxEa30UdBORHG0nnQYaN5dMeH4IHXz02evPq4Ojk9ez63fvSjoSEnGHE HBAoIPJAGZalx2WP3D7prJ8KSstWbPvX6smg2/Uf7AyPi6yOBHZBp6Ql6LKORKqFJb+c OFrQ== X-Gm-Message-State: AIkVDXJ+z6n9Mzxi3xux2spwRynfjP5nD+COL9T6PNLvUrGxnmyXlg8y6IA+VIaKzueAXI/0 X-Received: by 10.223.166.80 with SMTP id k74mr32255235wrc.171.1485339446303; Wed, 25 Jan 2017 02:17:26 -0800 (PST) Received: from localhost.localdomain ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id t123sm6483045wmt.8.2017.01.25.02.17.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 25 Jan 2017 02:17:25 -0800 (PST) From: Alexandre Bailon To: vinod.koul@intel.com, b-liu@ti.com 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, linux-usb@vger.kernel.org, Alexandre Bailon Subject: [PATCH v5 5/6] usb: musb: cppi_dma: Clean up tusb_omap_dma structure Date: Wed, 25 Jan 2017 11:17:08 +0100 Message-Id: <20170125101709.15696-6-abailon@baylibre.com> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20170125101709.15696-1-abailon@baylibre.com> References: <20170125101709.15696-1-abailon@baylibre.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP A pointer to musb is now present in the dma_controller structure. Remove the one present in tusb_omap_dma structure. Signed-off-by: Alexandre Bailon --- drivers/usb/musb/tusb6010_omap.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/usb/musb/tusb6010_omap.c b/drivers/usb/musb/tusb6010_omap.c index e6959cc..8b43c4b 100644 --- a/drivers/usb/musb/tusb6010_omap.c +++ b/drivers/usb/musb/tusb6010_omap.c @@ -56,7 +56,6 @@ struct tusb_omap_dma_ch { struct tusb_omap_dma { struct dma_controller controller; - struct musb *musb; void __iomem *tbase; int ch; @@ -497,7 +496,7 @@ tusb_omap_dma_allocate(struct dma_controller *c, u32 reg; tusb_dma = container_of(c, struct tusb_omap_dma, controller); - musb = tusb_dma->musb; + musb = tusb_dma->controller.musb; tbase = musb->ctrl_base; reg = musb_readl(tbase, TUSB_DMA_INT_MASK); @@ -534,7 +533,7 @@ tusb_omap_dma_allocate(struct dma_controller *c, dev_name = "TUSB receive"; } - chdat->musb = tusb_dma->musb; + chdat->musb = tusb_dma->controller.musb; chdat->tbase = tusb_dma->tbase; chdat->hw_ep = hw_ep; chdat->epnum = hw_ep->epnum; @@ -667,7 +666,7 @@ tusb_dma_controller_create(struct musb *musb, void __iomem *base) if (!tusb_dma) goto out; - tusb_dma->musb = musb; + tusb_dma->controller.musb = musb; tusb_dma->tbase = musb->ctrl_base; tusb_dma->ch = -1;