From patchwork Sun May 4 03:25:21 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xia Kaixu X-Patchwork-Id: 29608 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 EF17A203F3 for ; Sun, 4 May 2014 03:24:38 +0000 (UTC) Received: by mail-oa0-f71.google.com with SMTP id m1sf23465636oag.10 for ; Sat, 03 May 2014 20:24:38 -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:sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=FxFHACYO4ryS5sM6ZAT2D4yanYBr/95mrcVdVMGHqag=; b=ZfLEaFPb6g4upBu4T5g8aBtYo8wvMY1DqTtPqXNygKjbNmRrvp2svfBYh0aypaGScZ Y6hTpflrFsaO+ljonWboHESU2qHFTMkC4f20Ailqmcd7fUioAf0EKxF/NOwiZ7v0gRbu 2+imbFz5PWzQYlHDvzoDuFt42HQctxmcH2aOJMwq8/q9rAPQ/TYP+OIdE1BH+ygcNv9/ wKqwNusZqeFz646AfiAm1cGVLPEn3O5sA0fnIH1MvjtZ45J9J/j/i3OX4rU1VGhuwqEE L17wm0bsAKfDIuJcT60vjDTLzIxQKKxJ4yfuMWamK4E7MxLCSlQvHQ7Yz25jo/w0gfGe eQAQ== X-Gm-Message-State: ALoCoQkOzpRNGvOiwx9gLD3XhjjdQHorfASHSU461DsoO3dedGMf0eIBpMcHxlTuGYGF85PJCXia X-Received: by 10.182.230.132 with SMTP id sy4mr95459obc.48.1399173878203; Sat, 03 May 2014 20:24:38 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.105.54 with SMTP id b51ls2176785qgf.48.gmail; Sat, 03 May 2014 20:24:38 -0700 (PDT) X-Received: by 10.52.173.165 with SMTP id bl5mr17574692vdc.13.1399173878100; Sat, 03 May 2014 20:24:38 -0700 (PDT) Received: from mail-vc0-f180.google.com (mail-vc0-f180.google.com [209.85.220.180]) by mx.google.com with ESMTPS id ck5si832089vdd.37.2014.05.03.20.24.38 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 03 May 2014 20:24:38 -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.180; Received: by mail-vc0-f180.google.com with SMTP id hq16so6937397vcb.25 for ; Sat, 03 May 2014 20:24:38 -0700 (PDT) X-Received: by 10.58.96.36 with SMTP id dp4mr21266628veb.21.1399173878016; Sat, 03 May 2014 20:24:38 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.221.72 with SMTP id ib8csp52237vcb; Sat, 3 May 2014 20:24:37 -0700 (PDT) X-Received: by 10.66.177.168 with SMTP id cr8mr54903147pac.128.1399173877094; Sat, 03 May 2014 20:24:37 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id yb4si4159787pab.144.2014.05.03.20.24.35; Sat, 03 May 2014 20:24:35 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753477AbaEDDYV (ORCPT + 27 others); Sat, 3 May 2014 23:24:21 -0400 Received: from mail-pd0-f176.google.com ([209.85.192.176]:55470 "EHLO mail-pd0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753210AbaEDDYT (ORCPT ); Sat, 3 May 2014 23:24:19 -0400 Received: by mail-pd0-f176.google.com with SMTP id y13so4438212pdi.7 for ; Sat, 03 May 2014 20:24:19 -0700 (PDT) X-Received: by 10.66.219.6 with SMTP id pk6mr55330056pac.9.1399173859083; Sat, 03 May 2014 20:24:19 -0700 (PDT) Received: from localhost.localdomain ([218.17.215.175]) by mx.google.com with ESMTPSA id pb7sm33403790pac.10.2014.05.03.20.24.13 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 03 May 2014 20:24:18 -0700 (PDT) From: Xia Kaixu To: linux-kernel@vger.kernel.org Cc: kaixu.xia@linaro.org, linaro-kernel@lists.linaro.org, Arnd Bergmann , Liam Girdwood , Mark Brown , Eric Miao , Russell King , Haojian Zhuang , linux-arm-kernel@lists.infradead.org, alsa-devel@alsa-project.org Subject: [PATCH 15/15] ASoC: pxa: remove mach header dependency Date: Sun, 4 May 2014 11:25:21 +0800 Message-Id: <1399173921-3766-1-git-send-email-kaixu.xia@linaro.org> X-Mailer: git-send-email 1.7.9.5 Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.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 Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org 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: Liam Girdwood Cc: Mark Brown 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