Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[ARM] Remove definition of MAX_DMA_CHANNELS to zero

Since we now only build arch/arm/kernel/dma.c on machine types
which set ISA_DMA_API, we don't need to define MAX_DMA_CHANNELS
to 0 to indicate this - this definition becomes superfluous.
Remove it.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

authored by

Russell King and committed by
Russell King
95ba9fb0 065909b9

-122
-28
arch/arm/kernel/dma.c
··· 22 22 23 23 DEFINE_SPINLOCK(dma_spin_lock); 24 24 25 - #if MAX_DMA_CHANNELS > 0 26 - 27 25 static dma_t dma_chan[MAX_DMA_CHANNELS]; 28 26 29 27 /* ··· 253 255 } 254 256 255 257 core_initcall(init_dma); 256 - 257 - #else 258 - 259 - int request_dma(dmach_t channel, const char *device_id) 260 - { 261 - return -EINVAL; 262 - } 263 - 264 - int get_dma_residue(dmach_t channel) 265 - { 266 - return 0; 267 - } 268 - 269 - #define GLOBAL_ALIAS(_a,_b) asm (".set " #_a "," #_b "; .globl " #_a) 270 - GLOBAL_ALIAS(disable_dma, get_dma_residue); 271 - GLOBAL_ALIAS(enable_dma, get_dma_residue); 272 - GLOBAL_ALIAS(free_dma, get_dma_residue); 273 - GLOBAL_ALIAS(get_dma_list, get_dma_residue); 274 - GLOBAL_ALIAS(set_dma_mode, get_dma_residue); 275 - GLOBAL_ALIAS(set_dma_page, get_dma_residue); 276 - GLOBAL_ALIAS(set_dma_count, get_dma_residue); 277 - GLOBAL_ALIAS(__set_dma_addr, get_dma_residue); 278 - GLOBAL_ALIAS(set_dma_sg, get_dma_residue); 279 - GLOBAL_ALIAS(set_dma_speed, get_dma_residue); 280 - 281 - #endif 282 258 283 259 EXPORT_SYMBOL(request_dma); 284 260 EXPORT_SYMBOL(free_dma);
-7
include/asm-arm/arch-aaec2000/dma.h
··· 7 7 * it under the terms of the GNU General Public License version 2 as 8 8 * published by the Free Software Foundation. 9 9 */ 10 - 11 - #ifndef __ASM_ARCH_DMA_H 12 - #define __ASM_ARCH_DMA_H 13 - 14 - #define MAX_DMA_CHANNELS 0 15 - 16 - #endif
-1
include/asm-arm/arch-cl7500/dma.h
··· 15 15 * bytes of RAM. 16 16 */ 17 17 #define MAX_DMA_ADDRESS 0xd0000000 18 - #define MAX_DMA_CHANNELS 0 19 18 20 19 #define DMA_S0 0 21 20
-7
include/asm-arm/arch-clps711x/dma.h
··· 17 17 * along with this program; if not, write to the Free Software 18 18 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 19 19 */ 20 - #ifndef __ASM_ARCH_DMA_H 21 - #define __ASM_ARCH_DMA_H 22 - 23 - #define MAX_DMA_CHANNELS 0 24 - 25 - #endif /* _ASM_ARCH_DMA_H */ 26 -
-7
include/asm-arm/arch-ebsa110/dma.h
··· 9 9 * 10 10 * EBSA110 DMA definitions 11 11 */ 12 - #ifndef __ASM_ARCH_DMA_H 13 - #define __ASM_ARCH_DMA_H 14 - 15 - #define MAX_DMA_CHANNELS 0 16 - 17 - #endif /* _ASM_ARCH_DMA_H */ 18 -
-7
include/asm-arm/arch-epxa10db/dma.h
··· 17 17 * along with this program; if not, write to the Free Software 18 18 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 19 19 */ 20 - #ifndef __ASM_ARCH_DMA_H 21 - #define __ASM_ARCH_DMA_H 22 - 23 - #define MAX_DMA_CHANNELS 0 24 - 25 - #endif /* _ASM_ARCH_DMA_H */ 26 -
-2
include/asm-arm/arch-imx/dma.h
··· 20 20 #ifndef __ASM_ARCH_DMA_H 21 21 #define __ASM_ARCH_DMA_H 22 22 23 - #define MAX_DMA_CHANNELS 0 24 - 25 23 /* 26 24 * DMA registration 27 25 */
-7
include/asm-arm/arch-integrator/dma.h
··· 17 17 * along with this program; if not, write to the Free Software 18 18 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 19 19 */ 20 - #ifndef __ASM_ARCH_DMA_H 21 - #define __ASM_ARCH_DMA_H 22 - 23 - #define MAX_DMA_CHANNELS 0 24 - 25 - #endif /* _ASM_ARCH_DMA_H */ 26 -
-5
include/asm-arm/arch-iop3xx/dma.h
··· 7 7 * it under the terms of the GNU General Public License version 2 as 8 8 * published by the Free Software Foundation. 9 9 */ 10 - 11 - #ifndef _IOP3XX_DMA_H_P 12 - #define _IOP3XX_DMA_H_P 13 - 14 - #endif /* _ASM_ARCH_DMA_H_P */
-7
include/asm-arm/arch-ixp2000/dma.h
··· 7 7 * it under the terms of the GNU General Public License version 2 as 8 8 * published by the Free Software Foundation. 9 9 */ 10 - #ifndef __ASM_ARCH_DMA_H 11 - #define __ASM_ARCH_DMA_H 12 - 13 - /* No DMA */ 14 - #define MAX_DMA_CHANNELS 0 15 - 16 - #endif /* _ASM_ARCH_DMA_H */
-3
include/asm-arm/arch-ixp4xx/dma.h
··· 20 20 21 21 #define MAX_DMA_ADDRESS (PAGE_OFFSET + SZ_64M) 22 22 23 - /* No DMA */ 24 - #define MAX_DMA_CHANNELS 0 25 - 26 23 #endif /* _ASM_ARCH_DMA_H */
-1
include/asm-arm/arch-l7200/dma.h
··· 17 17 * bytes of RAM. 18 18 */ 19 19 #define MAX_DMA_ADDRESS 0xd0000000 20 - #define MAX_DMA_CHANNELS 0 21 20 22 21 #define DMA_S0 0 23 22
-7
include/asm-arm/arch-lh7a40x/dma.h
··· 7 7 * version 2 as published by the Free Software Foundation. 8 8 * 9 9 */ 10 - 11 - #ifndef __ASM_ARCH_DMA_H 12 - #define __ASM_ARCH_DMA_H 13 - 14 - #define MAX_DMA_CHANNELS 0 /* All DMA is internal to CPU */ 15 - 16 - #endif /* _ASM_ARCH_DMA_H */
-2
include/asm-arm/arch-omap/dma.h
··· 21 21 #ifndef __ASM_ARCH_DMA_H 22 22 #define __ASM_ARCH_DMA_H 23 23 24 - #define MAX_DMA_CHANNELS 0 25 - 26 24 /* Hardware registers for omap1 */ 27 25 #define OMAP_DMA_BASE (0xfffed800) 28 26 #define OMAP_DMA_GCR (OMAP_DMA_BASE + 0x400)
-3
include/asm-arm/arch-pxa/dma.h
··· 12 12 #ifndef __ASM_ARCH_DMA_H 13 13 #define __ASM_ARCH_DMA_H 14 14 15 - /* No DMA as the rest of the world see it */ 16 - #define MAX_DMA_CHANNELS 0 17 - 18 15 /* 19 16 * Descriptor structure for PXA's DMA engine 20 17 * Note: this structure must always be aligned to a 16-byte boundary.
-6
include/asm-arm/arch-realview/dma.h
··· 18 18 * along with this program; if not, write to the Free Software 19 19 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 20 20 */ 21 - #ifndef __ASM_ARCH_DMA_H 22 - #define __ASM_ARCH_DMA_H 23 - 24 - #define MAX_DMA_CHANNELS 0 25 - 26 - #endif /* _ASM_ARCH_DMA_H */
-8
include/asm-arm/arch-s3c2410/dma.h
··· 31 31 #define MAX_DMA_TRANSFER_SIZE 0x100000 /* Data Unit is half word */ 32 32 33 33 34 - /* according to the samsung port, we cannot use the regular 35 - * dma channels... we must therefore provide our own interface 36 - * for DMA, and allow our drivers to use that. 37 - */ 38 - 39 - #define MAX_DMA_CHANNELS 0 40 - 41 - 42 34 /* we have 4 dma channels */ 43 35 #define S3C2410_DMA_CHANNELS (4) 44 36
-8
include/asm-arm/arch-sa1100/dma.h
··· 15 15 16 16 17 17 /* 18 - * The regular generic DMA interface is inappropriate for the 19 - * SA1100 DMA model. None of the SA1100 specific drivers using 20 - * DMA are portable anyway so it's pointless to try to twist the 21 - * regular DMA API to accommodate them. 22 - */ 23 - #define MAX_DMA_CHANNELS 0 24 - 25 - /* 26 18 * The SA1100 has six internal DMA channels. 27 19 */ 28 20 #define SA1100_DMA_CHANNELS 6
-6
include/asm-arm/arch-versatile/dma.h
··· 18 18 * along with this program; if not, write to the Free Software 19 19 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 20 20 */ 21 - #ifndef __ASM_ARCH_DMA_H 22 - #define __ASM_ARCH_DMA_H 23 - 24 - #define MAX_DMA_CHANNELS 0 25 - 26 - #endif /* _ASM_ARCH_DMA_H */