From patchwork Tue Apr 29 11:18:36 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xia Kaixu X-Patchwork-Id: 4087991 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E8CCB9F169 for ; Tue, 29 Apr 2014 14:40:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0AF25201FB for ; Tue, 29 Apr 2014 14:40:19 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 01A40201F5 for ; Tue, 29 Apr 2014 14:40:14 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 3F7C026564B; Tue, 29 Apr 2014 16:40:11 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00, RCVD_IN_SORBS_WEB, UNPARSEABLE_RELAY autolearn=no version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id D9DFF26519E; Tue, 29 Apr 2014 16:28:10 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 2FE6B26508D; Tue, 29 Apr 2014 13:20:57 +0200 (CEST) Received: from mail-pd0-f173.google.com (mail-pd0-f173.google.com [209.85.192.173]) by alsa0.perex.cz (Postfix) with ESMTP id 50847265071 for ; Tue, 29 Apr 2014 13:20:36 +0200 (CEST) Received: by mail-pd0-f173.google.com with SMTP id p10so44845pdj.32 for ; Tue, 29 Apr 2014 04:20:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=im3r8jKxnZlvLIDMu6Pqiz/PZPU29WRqlGtrNU238TA=; b=Rcx8XZnlS00s/PkC5nr5xKKPcfd1NS79Z9wBEpvimvZ1GGexZU3qL7/qTYxqbOiUaa iWVH31AWyZd2c3vp7hgwXiQiPluZ9Kxr+HzNvDBsTx8UVzw4ixjLllvWY4WS6Z7gNe0n bdObr6L+Epdg46YIwvA0zazVUG5UpR6Zs9/ZOai+zDPq9UEKbafxxanMB6k8KzbNsx4t fbHFfH6GVmw+/Z8uF6FWNVWruFN/LB/O3UY9VzXlTd04SGAqB2PM/6zsa9IoIf54TOCv +jSkuaouaxz0cBiGdK1cHTgaQfSMut9xyEsrEhTuDxLEA10XOfn5ms82Q3rT58dhBok7 fheA== X-Gm-Message-State: ALoCoQkkji1wqgKS9EOgZnbn+BaNNcuDWS92hE1we5SpLsmJLTUVXznbcxkXsnRq2osHVIXm4Vsj X-Received: by 10.66.171.206 with SMTP id aw14mr32607679pac.48.1398770433409; Tue, 29 Apr 2014 04:20:33 -0700 (PDT) Received: from localhost.localdomain ([218.17.215.175]) by mx.google.com with ESMTPSA id xo9sm108641006pab.18.2014.04.29.04.20.27 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 29 Apr 2014 04:20:32 -0700 (PDT) From: Xia Kaixu To: linux-kernel@vger.kernel.org Date: Tue, 29 Apr 2014 19:18:36 +0800 Message-Id: <1398770316-19715-16-git-send-email-kaixu.xia@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1398770316-19715-1-git-send-email-kaixu.xia@linaro.org> References: <1398770316-19715-1-git-send-email-kaixu.xia@linaro.org> X-Mailman-Approved-At: Tue, 29 Apr 2014 16:27:55 +0200 Cc: alsa-devel@alsa-project.org, linaro-kernel@lists.linaro.org, Russell King , arnd@arndb.de, Liam Girdwood , Haojian Zhuang , Eric Miao , linux-arm-kernel@lists.infradead.org, kaixu.xia@linaro.org Subject: [alsa-devel] [PATCH 15/15] ASoC: pxa: remove mach header dependency X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP From: Arnd Bergmann As we are moving the mmp platform towards multiplatform support, we have to stop including platform header files. This changes the pxa-ssp sound driver file to no longer depend on mach/hardware.h and mach/dma.h. The code using the definitions from those headers is actually gone already, the only thing that was still being used was the pxa_dma_desc typedef, which we can easily work around by using the normal 'struct pxa_dma_desc' name. The pxa2xx-dma driver still uses this header, so we include it explicitly there, which is ok because that is only used on pxa, not on mmp. Signed-off-by: Arnd Bergmann Signed-off-by: Xia Kaixu Cc: Mark Brown Cc: Liam Girdwood Cc: Eric Miao Cc: Russell King Cc: Haojian Zhuang Cc: linux-arm-kernel@lists.infradead.org Cc: alsa-devel@alsa-project.org --- sound/arm/pxa2xx-pcm.c | 2 ++ sound/arm/pxa2xx-pcm.h | 3 +-- sound/soc/pxa/pxa-ssp.c | 2 -- sound/soc/pxa/pxa2xx-pcm.c | 2 ++ 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/sound/arm/pxa2xx-pcm.c b/sound/arm/pxa2xx-pcm.c index e6c727b..83be8e3 100644 --- a/sound/arm/pxa2xx-pcm.c +++ b/sound/arm/pxa2xx-pcm.c @@ -14,6 +14,8 @@ #include #include +#include + #include #include #include diff --git a/sound/arm/pxa2xx-pcm.h b/sound/arm/pxa2xx-pcm.h index 2a8fc08..0033098 100644 --- a/sound/arm/pxa2xx-pcm.h +++ b/sound/arm/pxa2xx-pcm.h @@ -9,12 +9,11 @@ * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ -#include struct pxa2xx_runtime_data { int dma_ch; struct snd_dmaengine_dai_dma_data *params; - pxa_dma_desc *dma_desc_array; + struct pxa_dma_desc *dma_desc_array; dma_addr_t dma_desc_array_phys; }; diff --git a/sound/soc/pxa/pxa-ssp.c b/sound/soc/pxa/pxa-ssp.c index a3119a0..9b19ee7 100644 --- a/sound/soc/pxa/pxa-ssp.c +++ b/sound/soc/pxa/pxa-ssp.c @@ -34,8 +34,6 @@ #include #include -#include - #include "../../arm/pxa2xx-pcm.h" #include "pxa-ssp.h" diff --git a/sound/soc/pxa/pxa2xx-pcm.c b/sound/soc/pxa/pxa2xx-pcm.c index d58b09f..42f2f01 100644 --- a/sound/soc/pxa/pxa2xx-pcm.c +++ b/sound/soc/pxa/pxa2xx-pcm.c @@ -15,6 +15,8 @@ #include #include +#include + #include #include #include