From patchwork Tue Apr 29 09:23:32 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xia Kaixu X-Patchwork-Id: 29332 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f71.google.com (mail-oa0-f71.google.com [209.85.219.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C7283202DD for ; Tue, 29 Apr 2014 09:25:02 +0000 (UTC) Received: by mail-oa0-f71.google.com with SMTP id j17sf46661586oag.6 for ; Tue, 29 Apr 2014 02:25:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=im3r8jKxnZlvLIDMu6Pqiz/PZPU29WRqlGtrNU238TA=; b=BVL2B0S8tDyQKj8nkHxmIWjq8j2BJhSDehTpmzIo7EkOusfmfqbc0oQa3nUtDODSWW ikenjKJAShk5L0qcCLqygNPzUuKh9iKok5UWMTU4vOL2FIyAiBKnYHUgefhCKPBxLY8c n/Q8V/2Sd/QGiXFlm2c2qbpIBW5gMt4jSJor7QBUZ/uSh/hml1xPCl/F4L9vN0fQo3EQ hFZh9icasf52Rq+t2Z8oOIPImMPgDvGGNT5pPMCOQKgHcr2vyxOfAF4Z5/RlbMnXLwHN mCRtVCajm40eIJ22jDQDLDXqnGqTqTUg08bAjKKbL6XB3Kafd+3NBhvWC7wwHKql87Bt zMuw== X-Gm-Message-State: ALoCoQkeh3lVQP3g9b3fArTLbyoj8LPz8lltoU3WxZ9dh73JUvdR5f9OW2SCPCiuOGm0ZkmIZVZL X-Received: by 10.50.33.101 with SMTP id q5mr13736532igi.3.1398763502447; Tue, 29 Apr 2014 02:25:02 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.85.40 with SMTP id m37ls11829qgd.18.gmail; Tue, 29 Apr 2014 02:25:02 -0700 (PDT) X-Received: by 10.220.92.135 with SMTP id r7mr28664513vcm.11.1398763502201; Tue, 29 Apr 2014 02:25:02 -0700 (PDT) Received: from mail-vc0-f174.google.com (mail-vc0-f174.google.com [209.85.220.174]) by mx.google.com with ESMTPS id qd1si1569836vcb.69.2014.04.29.02.25.02 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 29 Apr 2014 02:25:02 -0700 (PDT) Received-SPF: none (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) client-ip=209.85.220.174; Received: by mail-vc0-f174.google.com with SMTP id ib6so3181628vcb.5 for ; Tue, 29 Apr 2014 02:25:02 -0700 (PDT) X-Received: by 10.58.187.78 with SMTP id fq14mr28165338vec.9.1398763502124; Tue, 29 Apr 2014 02:25:02 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.221.72 with SMTP id ib8csp181873vcb; Tue, 29 Apr 2014 02:25:01 -0700 (PDT) X-Received: by 10.68.139.71 with SMTP id qw7mr34899694pbb.68.1398763501392; Tue, 29 Apr 2014 02:25:01 -0700 (PDT) Received: from mail-pa0-f53.google.com (mail-pa0-f53.google.com [209.85.220.53]) by mx.google.com with ESMTPS id ek4si12257975pbc.339.2014.04.29.02.25.01 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 29 Apr 2014 02:25:01 -0700 (PDT) Received-SPF: none (google.com: kaixu.xia@linaro.org does not designate permitted sender hosts) client-ip=209.85.220.53; Received: by mail-pa0-f53.google.com with SMTP id ld10so6834350pab.40 for ; Tue, 29 Apr 2014 02:25:01 -0700 (PDT) X-Received: by 10.67.1.39 with SMTP id bd7mr31640983pad.15.1398763501022; Tue, 29 Apr 2014 02:25:01 -0700 (PDT) Received: from localhost.localdomain ([218.17.215.175]) by mx.google.com with ESMTPSA id ek2sm40447807pbd.30.2014.04.29.02.24.57 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 29 Apr 2014 02:25:00 -0700 (PDT) From: Xia Kaixu To: linaro-kernel@lists.linaro.org, arnd@arndb.de Cc: kaixu.xia@linaro.org, patches@linaro.org Subject: [PATCH v2 15/15] ASoC: pxa: remove mach header dependency Date: Tue, 29 Apr 2014 17:23:32 +0800 Message-Id: <1398763412-18928-16-git-send-email-kaixu.xia@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1398763412-18928-1-git-send-email-kaixu.xia@linaro.org> References: <1398763412-18928-1-git-send-email-kaixu.xia@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: kaixu.xia@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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