From patchwork Thu Feb 18 14:01:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 102743 Delivered-To: patch@linaro.org Received: by 10.112.43.199 with SMTP id y7csp605574lbl; Thu, 18 Feb 2016 06:05:09 -0800 (PST) X-Received: by 10.98.16.12 with SMTP id y12mr10405631pfi.6.1455804309389; Thu, 18 Feb 2016 06:05:09 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x9si9625250pas.72.2016.02.18.06.05.08; Thu, 18 Feb 2016 06:05:09 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1946381AbcBROFF (ORCPT + 30 others); Thu, 18 Feb 2016 09:05:05 -0500 Received: from mout.kundenserver.de ([212.227.17.24]:53897 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1425501AbcBROE7 (ORCPT ); Thu, 18 Feb 2016 09:04:59 -0500 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue101) with ESMTPA (Nemesis) id 0MINTj-1aXlR33jxf-0049lQ; Thu, 18 Feb 2016 15:04:31 +0100 From: Arnd Bergmann To: Russell King Cc: linux-arm-kernel@lists.infradead.org, Arnd Bergmann , Ard Biesheuvel , Nicolas Pitre , Jon Medhurst , Marc Zyngier , linux-kernel@vger.kernel.org Subject: [PATCH 7/9] ARM: move NO_DMA definition to ecard.h Date: Thu, 18 Feb 2016 15:01:59 +0100 Message-Id: <1455804123-2526139-8-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1455804123-2526139-1-git-send-email-arnd@arndb.de> References: <1455804123-2526139-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:xjzITam8+y5jXUHhplFcv7nBpg4QY2wt5rzrZcoWPDYkTQEK5iG ZeMgxJRHOydUhtbEAWLKheDRJPC9QG9MJVbiHzewRBOa/SbICc00RX+nadmflTAgzi7uinS bIwTgqGnTU2j66/jx46I8wySFvGQKAFAOuhZ0nQF1nugRVAoKkKerA7US0nFiRuYARagTeW RvsR0Jc4fbHr5sY/Wkqyw== X-UI-Out-Filterresults: notjunk:1; V01:K0:3RMOYUMtglE=:NBsuQDIHfR0pepLsfMcBlo iqmop1Z5d2nu2IVVjaIBnuVl5HcTcarH421wHmqpBDYItB+a9TskX/SP7VRwbfPt85P1gHhKL 3cqkzRHXXAfZHqGrwgg9cEtdi4mQPqPV/oz7rccF0We114xAauztr5Petz7/g3hIw7MzyqvFY jkJKrsy+DXhYbIymoCY7WarBhzgYTDkjsFbVkDPNROJG1hvp3Dks5AtlxRdGOGYTuFd2eWnnR rddHFQ7f/DQ34t8AP4awrRkucHiZXp35oVOmyP4OQFEEOxDoB9hqGSoeWPTCjOm98NZ7uinpV dXPbc2fGwCB2z4V1TrYP2hAkpf3WdH9kBBT/cTqVMp4cbQ68C5sUOdU789LK98sAm5/TZ21Gj PqjoQ2uu+EGXNjUK3ENEN2y+JCnhcmYm37RBi03FA5IO6ESQYWKrM8tBTpt/rz1+3499Qfn0M 7mPf4zE1puF/EwFKcZkCNKdvrBa87qbPiBXvm7+iOQh/yAWnyi04PEmeSrsWeccSugDikxiCj 9alsUjgRw6olQ2GErU63VYrxH/cWHmSV2qH9+eugZ1FR8MiXu4FgXrMhaPoD8nhKtEYI3EivQ N8sggmM3mTwW+kIAoq9YnmNqyzIOMBAqYxOc/0Ed1c+V81qGlD1JR68FHoJSKMrj2Qg0rOqDu B1PwYK50ccGdFk5jKFscFlZeP4F500RmHvh6GDjZwHasVjOLQTIXbCOxbc6vWuceUjBQ= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The NO_DMA macro is only used on the RiscPC ecard bus, and conflicts with a couple of driver specific macros with the same name: drivers/scsi/eata.c:571:0: warning: "NO_DMA" redefined #define NO_DMA 0xff In file included from ../drivers/scsi/eata.c:495:0: arch/arm/include/asm/dma.h:140:0: note: this is the location of the previous definition #define NO_DMA 255 This moves the definition out of the asm/dma.h header that is used by all ISA DMA API users and into the ecard header. Signed-off-by: Arnd Bergmann --- arch/arm/include/asm/dma.h | 4 ---- arch/arm/include/asm/ecard.h | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) -- 2.7.0 diff --git a/arch/arm/include/asm/dma.h b/arch/arm/include/asm/dma.h index bb4fa67da541..573128481fc4 100644 --- a/arch/arm/include/asm/dma.h +++ b/arch/arm/include/asm/dma.h @@ -136,10 +136,6 @@ extern void set_dma_speed(unsigned int chan, int cycle_ns); */ extern int get_dma_residue(unsigned int chan); -#ifndef NO_DMA -#define NO_DMA 255 -#endif - #endif /* CONFIG_ISA_DMA_API */ #ifdef CONFIG_PCI diff --git a/arch/arm/include/asm/ecard.h b/arch/arm/include/asm/ecard.h index eaea14676d57..d3e16628c792 100644 --- a/arch/arm/include/asm/ecard.h +++ b/arch/arm/include/asm/ecard.h @@ -83,6 +83,10 @@ #define CONST const #endif +#ifndef NO_DMA +#define NO_DMA 255 +#endif + #define MAX_ECARDS 9 struct ecard_id { /* Card ID structure */