From patchwork Mon Aug 6 09:55:22 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hideki EIRAKU X-Patchwork-Id: 1277881 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 AD08BDFFED for ; Mon, 6 Aug 2012 09:57:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755778Ab2HFJ4f (ORCPT ); Mon, 6 Aug 2012 05:56:35 -0400 Received: from mail-pb0-f46.google.com ([209.85.160.46]:39532 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755689Ab2HFJ4R (ORCPT ); Mon, 6 Aug 2012 05:56:17 -0400 Received: by mail-pb0-f46.google.com with SMTP id rr13so2350020pbb.19 for ; Mon, 06 Aug 2012 02:56:17 -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=oNTvdervh8Je0NWZwTmUshmD52blgNcHZFZTsFLXmAWQHLN7sg0N+V9iSk65r1lv7n QEgNx8v6E83lp4IsPOx817O4T7mBx4B0UQ1mciMZ2SMTMdhbHS5WQpMZQ+nQ64z/ISJQ 3Ns1xVZPTQMzqAIAokv9RCmSkyGCzLTgjVLrviGgX3a6RxKk2LZD/gzGM0JhtiJZ7gSi q/GavorqNHRH3u5xvKPWTw0oOoljF5hrPO2zjPcSzGY4sZ9I5S8B+Q8xYlJVBgy5D1jW NammZV28PMKhLBk7cIL+jXkmUtwJmRF6ZAI55S1UcivVdI3845mDya5cQK9LoloXqunj XhWA== Received: by 10.68.213.5 with SMTP id no5mr17888381pbc.24.1344246977502; Mon, 06 Aug 2012 02:56:17 -0700 (PDT) Received: from localhost.localdomain ([219.106.231.132]) by mx.google.com with ESMTPS id qd10sm8650359pbb.38.2012.08.06.02.56.14 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 06 Aug 2012 02:56:16 -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 v3 2/4] ALSA: pcm - Don't define ARCH_HAS_DMA_MMAP_COHERENT privately for ARM Date: Mon, 6 Aug 2012 18:55:22 +0900 Message-Id: <1344246924-32620-3-git-send-email-hdk@igel.co.jp> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1344246924-32620-1-git-send-email-hdk@igel.co.jp> References: <1344246924-32620-1-git-send-email-hdk@igel.co.jp> X-Gm-Message-State: ALoCoQlo4/DWtrhZDLiN1iC6szWpBpPeXyWvGyrDVlIgcC7NZpMt9er7kupmoklSUzxiYlVHZX8b 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 */