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: 1241721 Return-Path: X-Original-To: patchwork-linux-fbdev@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 44A4DDFFC0 for ; Thu, 26 Jul 2012 11:14:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752189Ab2GZLNr (ORCPT ); Thu, 26 Jul 2012 07:13:47 -0400 Received: from mail-yx0-f174.google.com ([209.85.213.174]:39140 "EHLO mail-yx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752466Ab2GZLNp (ORCPT ); Thu, 26 Jul 2012 07:13:45 -0400 Received: by yenl2 with SMTP id l2so1791756yen.19 for ; Thu, 26 Jul 2012 04:13:44 -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=Z3Q6Bwccpor3GvBbYsAwgFTNytU6xIpGvI7U/WTuZx9eEM1oa44absGKuxtBaXimiG 5c0hcI5oYpw/2qF6algMHw5bCf178TtZebTTquMuQs/+zvi9jHBHiPKqR20jbTAYt3sF nqZvME1a7TOMys9WWLd5YhNfQUgEjKuBMMrmGYTnv9jOVRZEYF9LP9EwnPX9OHf9Aqmd 2VUGtUmhnrz5n3DYFU9e/FGvLdppKfli3VdqL8gOWc5yg+xvxSZKBD6cQ/tYd537tNU8 FuCkSwDXsipxhYGb37SuzWaEoenuXWneYeF9Y/OicUgnRc2Sxj4+vJLm7nLFiPPNQ/Cb oMBA== 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 Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-fbdev@vger.kernel.org, alsa-devel@alsa-project.org, Katsuya MATSUBARA , Laurent Pinchart 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: ALoCoQmZCb4Rr/FZjV7QI6ewpSA3OBs748GhMhqnH6IrMY3Mepjdgu5t3XlK/ll/MhsLyMYdTYw9 Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.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 */