From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1946848AbcBRQRk (ORCPT ); Thu, 18 Feb 2016 11:17:40 -0500 Received: from mail-qg0-f46.google.com ([209.85.192.46]:36054 "EHLO mail-qg0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1946732AbcBRQRj (ORCPT ); Thu, 18 Feb 2016 11:17:39 -0500 Date: Thu, 18 Feb 2016 11:17:36 -0500 (EST) From: Nicolas Pitre To: Arnd Bergmann cc: Russell King , linux-arm-kernel@lists.infradead.org, Ard Biesheuvel , Jon Medhurst , Marc Zyngier , linux-kernel@vger.kernel.org Subject: Re: [PATCH 7/9] ARM: move NO_DMA definition to ecard.h In-Reply-To: <1455804123-2526139-8-git-send-email-arnd@arndb.de> Message-ID: References: <1455804123-2526139-1-git-send-email-arnd@arndb.de> <1455804123-2526139-8-git-send-email-arnd@arndb.de> User-Agent: Alpine 2.20 (LFD 67 2015-01-07) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 18 Feb 2016, Arnd Bergmann wrote: > 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 Acked-by: Nicolas Pitre > --- > arch/arm/include/asm/dma.h | 4 ---- > arch/arm/include/asm/ecard.h | 4 ++++ > 2 files changed, 4 insertions(+), 4 deletions(-) > > 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 */ > -- > 2.7.0 > >