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: 29345 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yh0-f71.google.com (mail-yh0-f71.google.com [209.85.213.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 49D8B202FE for ; Tue, 29 Apr 2014 11:21:18 +0000 (UTC) Received: by mail-yh0-f71.google.com with SMTP id i57sf191498yha.2 for ; Tue, 29 Apr 2014 04:21:18 -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:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=nOt9prMNVjz2o+FiTLRoolsDCLNkEoC2v0msLk1A7l8=; b=C6qw8lEo0mKBROEnlPcizKn5pUoYy3rbj93UfJveUsvb4nBG8mF++gG8tIjacOFYuV K36CVx6yj96INojKMpc3L7T1IBZUIcnuPQLbMHQMxt42ZNMZzBqgHrHSDLdlcJ4aACmm P7WF6actDGPLBnAhSvmfTyZJR7FGq/OTX/KGbe87FLiR/Jpe4uIwoHg+2eVUaWAoc5cG cLkjjIoIdzShBB5vaUEDQNMPxRK5hlBu+bc6L0pRe3SrsB85uJ4a3hZvyoKgarWMpH3I qDo3d1CvlJ9SyJAofUDjE0Ma4EMbTDw2DYvR36FwPP5ABocYlA02U3tM60RXcAEplkXW 5a1w== X-Gm-Message-State: ALoCoQkn9d7U7chmOGaO8BVMmS45o/3ob4wYi1BqnGcho92ihAm6xOA/Ibu7prIIfE7IppIyksFY X-Received: by 10.236.199.108 with SMTP id w72mr13167656yhn.10.1398770478021; Tue, 29 Apr 2014 04:21:18 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.40.209 with SMTP id x75ls44658qgx.46.gmail; Tue, 29 Apr 2014 04:21:17 -0700 (PDT) X-Received: by 10.52.252.43 with SMTP id zp11mr53557vdc.44.1398770477922; Tue, 29 Apr 2014 04:21:17 -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 m10si2213741vcf.47.2014.04.29.04.21.17 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 29 Apr 2014 04:21:17 -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 ib6so53119vcb.33 for ; Tue, 29 Apr 2014 04:21:17 -0700 (PDT) X-Received: by 10.58.230.103 with SMTP id sx7mr1590006vec.28.1398770477828; Tue, 29 Apr 2014 04:21:17 -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 ib8csp188794vcb; Tue, 29 Apr 2014 04:21:17 -0700 (PDT) X-Received: by 10.66.149.7 with SMTP id tw7mr32510227pab.72.1398770477014; Tue, 29 Apr 2014 04:21:17 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id fd9si12588502pad.183.2014.04.29.04.21.15 for ; Tue, 29 Apr 2014 04:21:15 -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 S933794AbaD2LUk (ORCPT + 28 others); Tue, 29 Apr 2014 07:20:40 -0400 Received: from mail-pd0-f176.google.com ([209.85.192.176]:52974 "EHLO mail-pd0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933717AbaD2LUe (ORCPT ); Tue, 29 Apr 2014 07:20:34 -0400 Received: by mail-pd0-f176.google.com with SMTP id y10so48139pdj.21 for ; Tue, 29 Apr 2014 04:20:34 -0700 (PDT) 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 Cc: linaro-kernel@lists.linaro.org, arnd@arndb.de, kaixu.xia@linaro.org, Liam Girdwood , 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: 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> 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: 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