From patchwork Thu Jul 26 11:13:09 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hideki EIRAKU X-Patchwork-Id: 1241951 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id B8BCD3FC5A for ; Thu, 26 Jul 2012 11:46:40 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1SuMQi-0007dj-DH; Thu, 26 Jul 2012 11:40:33 +0000 Received: from mail-gh0-f177.google.com ([209.85.160.177]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1SuM0r-0001nF-3b for linux-arm-kernel@lists.infradead.org; Thu, 26 Jul 2012 11:14:19 +0000 Received: by ghbf11 with SMTP id f11so1898379ghb.36 for ; Thu, 26 Jul 2012 04:13:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=8LntR4WjFUFJWoJT1dM6/4XeqfEDzWg7PCTDQBuaGyk=; b=QZ17n+022pmc/wpJElSW3QZg0fmzlqvQShAkMz+rFV3ZXk2N/M8aV0rWc24umjzeG1 QDjiwldvD7mLtqedQ8/KNYUBGCdzkZHQroqsv8pATzDIFs7CdD9MtCZuo/OpwUD4QqgB RSKN/wU8HTEwcxlWdKRqT039Ig28PKZwu1LfOejq9Jz9iZTvGGS9NX15FoY2RXGW7v4y XK4SKNjFVpcBHdboZLaG0eXVDLigOFZd4pWE8InukfoRRs0LQfyarcRrrPTQDzTR7ydU H4A4/DOrIigcLPDSjWm2M6clwgnud+rwlz8N+3FiqF307BUHUZ9KF7PITZeNGCVSbDB+ tPsw== Received: by 10.66.75.168 with SMTP id d8mr19810361paw.63.1343301224417; Thu, 26 Jul 2012 04:13:44 -0700 (PDT) Received: from localhost.localdomain ([219.106.231.132]) by mx.google.com with ESMTPS id ru10sm16359210pbc.50.2012.07.26.04.13.40 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 26 Jul 2012 04:13:42 -0700 (PDT) From: Hideki EIRAKU To: Russell King , Pawel Osciak , Marek Szyprowski , Kyungmin Park , Mauro Carvalho Chehab , Florian Tobias Schandinat , Jaroslav Kysela , Takashi Iwai Subject: [PATCH v2 2/4] ALSA: pcm - Don't define ARCH_HAS_DMA_MMAP_COHERENT privately for ARM Date: Thu, 26 Jul 2012 20:13:09 +0900 Message-Id: <1343301191-26001-3-git-send-email-hdk@igel.co.jp> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1343301191-26001-1-git-send-email-hdk@igel.co.jp> References: <1343301191-26001-1-git-send-email-hdk@igel.co.jp> X-Gm-Message-State: ALoCoQm38R4ci9/TpV+wxM6dKK5ZfXGpDZBAOvO9xRvyCDm2MZNgevQnMD4TxwGL0LpprE6EsSbg X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.160.177 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Katsuya MATSUBARA , linux-fbdev@vger.kernel.org, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Laurent Pinchart , linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: Laurent Pinchart The ARM architecture now defines ARCH_HAS_DMA_MMAP_COHERENT, there's no need to define it privately anymore. Signed-off-by: Laurent Pinchart --- sound/core/pcm_native.c | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c index 53b5ada..84ead60 100644 --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c @@ -3156,13 +3156,6 @@ static const struct vm_operations_struct snd_pcm_vm_ops_data_fault = { .fault = snd_pcm_mmap_data_fault, }; -#ifndef ARCH_HAS_DMA_MMAP_COHERENT -/* This should be defined / handled globally! */ -#ifdef CONFIG_ARM -#define ARCH_HAS_DMA_MMAP_COHERENT -#endif -#endif - /* * mmap the DMA buffer on RAM */