Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dcea83ad authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[ARM] Hide ISA DMA API when ISA_DMA_API is unset 



When ISA_DMA_API is unset, we're not implementing the ISA DMA API,
so there's no point in publishing the prototypes via asm/dma.h, nor
including the machine dependent parts of that API.

This allows us to remove a lot of mach/dma.h files which don't contain
any useful code.  Unfortunately though, some platforms put their own
private non-ISA definitions into mach/dma.h, so we leave these behind
and fix the appropriate #include statments.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent c72e005b

arch/arm/include/asm/dma.h

+16 −7
Original line number Diff line number Diff line 
#ifndef __ASM_ARM_DMA_H

#define __ASM_ARM_DMA_H



typedef unsigned int dmach_t;



#include <linux/spinlock.h>

#include <asm/memory.h>

#include <asm/system.h>

#include <asm/scatterlist.h>

#include <mach/dma.h>



/*

 * This is the maximum virtual address which can be DMA'd from.
@@ -16,6 +10,19 @@ typedef unsigned int dmach_t; 
#define MAX_DMA_ADDRESS	0xffffffff

#endif



#ifdef CONFIG_ISA_DMA_API

/*

 * This is used to support drivers written for the x86 ISA DMA API.

 * It should not be re-used except for that purpose.

 */

#include <linux/spinlock.h>

#include <asm/system.h>

#include <asm/scatterlist.h>



typedef unsigned int dmach_t;



#include <mach/dma.h>



/*

 * DMA modes

 */
@@ -141,4 +148,6 @@ extern int isa_dma_bridge_buggy; 
#define isa_dma_bridge_buggy    (0)

#endif



#endif /* _ARM_DMA_H */
 
#endif /* CONFIG_ISA_DMA_API */



#endif /* __ASM_ARM_DMA_H */

arch/arm/mach-aaec2000/include/mach/dma.h

deleted100644 → 0
+0 −9
Original line number Diff line number Diff line 
/*

 *  arch/arm/mach-aaec2000/include/mach/dma.h

 *

 *  Copyright (c) 2005 Nicolas Bellido Y Ortega

 *

 *  This program is free software; you can redistribute it and/or modify

 *  it under the terms of the GNU General Public License version 2 as

 *  published by the Free Software Foundation.

 */

arch/arm/mach-at91/include/mach/dma.h

deleted100644 → 0
+0 −19
Original line number Diff line number Diff line 
/*

 * arch/arm/mach-at91/include/mach/dma.h

 *

 *  Copyright (C) 2003 SAN People

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

 */

arch/arm/mach-clps711x/include/mach/dma.h

deleted100644 → 0
+0 −19
Original line number Diff line number Diff line 
/*

 *  arch/arm/mach-clps711x/include/mach/dma.h

 *

 *  Copyright (C) 1997,1998 Russell King

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

 */

arch/arm/mach-davinci/include/mach/dma.h

deleted100644 → 0
+0 −10
Original line number Diff line number Diff line 
/*

 * DaVinci DMA definitions

 *

 * Author: Kevin Hilman, MontaVista Software, Inc. <source@mvista.com>

 *

 * 2007 (c) MontaVista Software, Inc. This file is licensed under

 * the terms of the GNU General Public License version 2. This program

 * is licensed "as is" without any warranty of any kind, whether express

 * or implied.

 */