From patchwork Mon Jan 23 16:48:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Bailon X-Patchwork-Id: 9533105 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 1A990604A0 for ; Mon, 23 Jan 2017 16:48:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0FCED28375 for ; Mon, 23 Jan 2017 16:48:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 04BC1283F3; Mon, 23 Jan 2017 16:48:28 +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 ABD3F2837F for ; Mon, 23 Jan 2017 16:48:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751355AbdAWQsY (ORCPT ); Mon, 23 Jan 2017 11:48:24 -0500 Received: from mail-wm0-f51.google.com ([74.125.82.51]:38363 "EHLO mail-wm0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751348AbdAWQsX (ORCPT ); Mon, 23 Jan 2017 11:48:23 -0500 Received: by mail-wm0-f51.google.com with SMTP id r144so164862889wme.1 for ; Mon, 23 Jan 2017 08:48:23 -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=oDSGNd+a9/HoTTrGh2uJEgAn+wKm0larrLi2/oQ3VdLYrbCB+FcgBFooSt9m9MB8RM 4jDDhuCVSYomWwdUYVoNfNtd7IKYsjhlfrgi6hhgPF7MiMe1JHnIkZROPjXo5Qg7htt4 vwZ5x0/T3gzXw5jVzNQJQJ5giTzxao0cBvaoWpquQIRANvi+ER+AExXrTFZt8RPidwgi 8by/O3JHOxY+KStNMkSlV4v32HUtUmQ/OttZZiBMjOtv6XHl6/+ExOZXRqvlLtHP+kNZ hBpGAKTO+mFolhB4pzVnnasPlS/ZNIETi8cSwUifgV5igY+EagZaEjj1jvta5OBT3Wp9 mOEg== 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=AqjvT78yQ6u66luZwHmxCwnuXNs3K1JjPTwhpD8P2R7KDFqznjtUwxu/Gpukh6mEUl GDVDQzcsGa6ccXGsSh8z40xmz/HZrBqSQAtZ0bBaev972WTrnW+2LORCaTeqcrmMLHKJ JeABrkZIfXh4/X04Wrlx/1Una7Wdigtne/xBq+bBpzseoG7oiTJqUx+JaIK0SiYJOHmx hXEklljcvqPeYEV3kBJyUF6x+mzbmYeGCNChUka2Ihol7jTfIW6K6bQ8ZZY0L2aHl/YJ gtbA2FsKrxvtiTLoMAB1ms8GDdwcMoBYhLvYmHVAaReCVmQrph19cRKdlF9Yy2BtUczA OIMw== X-Gm-Message-State: AIkVDXI17WGqtiqJSblwOB7rx6dcbhjCTPCfn/bNiQhscQCxjmz7bZzW8wxVCdshePGHu8dx X-Received: by 10.28.41.135 with SMTP id p129mr15714588wmp.59.1485190102341; Mon, 23 Jan 2017 08:48:22 -0800 (PST) Received: from localhost.localdomain ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id y127sm21907054wmg.12.2017.01.23.08.48.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 23 Jan 2017 08:48:21 -0800 (PST) From: Alexandre Bailon To: b-liu@ti.com Cc: vinod.koul@intel.com, 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, Alexandre Bailon Subject: [PATCH v4 5/6] usb: musb: cppi_dma: Clean up tusb_omap_dma structure Date: Mon, 23 Jan 2017 17:48:07 +0100 Message-Id: <20170123164808.27936-6-abailon@baylibre.com> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20170123164808.27936-1-abailon@baylibre.com> References: <20170123164808.27936-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;