[ARM] Remove definition of MAX_DMA_CHANNELS to zero
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Wed, 4 Jan 2006 15:51:51 +0000 (15:51 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 4 Jan 2006 15:51:51 +0000 (15:51 +0000)
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>
19 files changed:
arch/arm/kernel/dma.c
include/asm-arm/arch-aaec2000/dma.h
include/asm-arm/arch-cl7500/dma.h
include/asm-arm/arch-clps711x/dma.h
include/asm-arm/arch-ebsa110/dma.h
include/asm-arm/arch-epxa10db/dma.h
include/asm-arm/arch-imx/dma.h
include/asm-arm/arch-integrator/dma.h
include/asm-arm/arch-iop3xx/dma.h
include/asm-arm/arch-ixp2000/dma.h
include/asm-arm/arch-ixp4xx/dma.h
include/asm-arm/arch-l7200/dma.h
include/asm-arm/arch-lh7a40x/dma.h
include/asm-arm/arch-omap/dma.h
include/asm-arm/arch-pxa/dma.h
include/asm-arm/arch-realview/dma.h
include/asm-arm/arch-s3c2410/dma.h
include/asm-arm/arch-sa1100/dma.h
include/asm-arm/arch-versatile/dma.h

index 3b325ef55a28e9cd3b2a9a4fc5e32a7badc4671e..62c8966a8b77c8705e50ed603c1fcc45ba35959b 100644 (file)
@@ -22,8 +22,6 @@
 
 DEFINE_SPINLOCK(dma_spin_lock);
 
-#if MAX_DMA_CHANNELS > 0
-
 static dma_t dma_chan[MAX_DMA_CHANNELS];
 
 /*
@@ -256,32 +254,6 @@ static int __init init_dma(void)
 
 core_initcall(init_dma);
 
-#else
-
-int request_dma(dmach_t channel, const char *device_id)
-{
-       return -EINVAL;
-}
-
-int get_dma_residue(dmach_t channel)
-{
-       return 0;
-}
-
-#define GLOBAL_ALIAS(_a,_b) asm (".set " #_a "," #_b "; .globl " #_a)
-GLOBAL_ALIAS(disable_dma, get_dma_residue);
-GLOBAL_ALIAS(enable_dma, get_dma_residue);
-GLOBAL_ALIAS(free_dma, get_dma_residue);
-GLOBAL_ALIAS(get_dma_list, get_dma_residue);
-GLOBAL_ALIAS(set_dma_mode, get_dma_residue);
-GLOBAL_ALIAS(set_dma_page, get_dma_residue);
-GLOBAL_ALIAS(set_dma_count, get_dma_residue);
-GLOBAL_ALIAS(__set_dma_addr, get_dma_residue);
-GLOBAL_ALIAS(set_dma_sg, get_dma_residue);
-GLOBAL_ALIAS(set_dma_speed, get_dma_residue);
-
-#endif
-
 EXPORT_SYMBOL(request_dma);
 EXPORT_SYMBOL(free_dma);
 EXPORT_SYMBOL(enable_dma);
index c42212c9ea79b89db2bddace6d6f2f14990459ae..e100b1e526fe972e0a8fa9f9721bf2bc5d685d2a 100644 (file)
@@ -7,10 +7,3 @@
  *  it under the terms of the GNU General Public License version 2 as
  *  published by the Free Software Foundation.
  */
-
-#ifndef __ASM_ARCH_DMA_H
-#define __ASM_ARCH_DMA_H
-
-#define MAX_DMA_CHANNELS        0
-
-#endif
index 1d6a8829d3271ca2954fdc0398f20423c2a8de94..591ed25518929d9cc46cf6307ee600ce7473b15c 100644 (file)
@@ -15,7 +15,6 @@
  * bytes of RAM.
  */
 #define MAX_DMA_ADDRESS                0xd0000000
-#define MAX_DMA_CHANNELS       0
 
 #define DMA_S0                 0
 
index c35f87d0bf7a705dcf42706b488d5a4a92539e35..61099793842301804ba51622de5a5eba45dd9165 100644 (file)
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-#ifndef __ASM_ARCH_DMA_H
-#define __ASM_ARCH_DMA_H
-
-#define MAX_DMA_CHANNELS       0
-
-#endif /* _ASM_ARCH_DMA_H */
-
index f1add1343edc012251ca24f9dc52b5cc936aaee4..c52f9e2ab0bb53f9dd0a316e19b02e3b39edb8c6 100644 (file)
@@ -9,10 +9,3 @@
  *
  *  EBSA110 DMA definitions
  */
-#ifndef __ASM_ARCH_DMA_H
-#define __ASM_ARCH_DMA_H
-
-#define MAX_DMA_CHANNELS       0
-
-#endif /* _ASM_ARCH_DMA_H */
-
index 6e13e6bb8b1ddf49ad78da34f636c2b1ce3794d0..de20ec8e74b1ca9909c4f61a2d1c80903db10a34 100644 (file)
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-#ifndef __ASM_ARCH_DMA_H
-#define __ASM_ARCH_DMA_H
-
-#define MAX_DMA_CHANNELS       0
-
-#endif /* _ASM_ARCH_DMA_H */
-
index 0b8f39adc9a707ce0dddf71960f016d184d55603..b45fa367d71e4a3180c0569a3a699c18178e6963 100644 (file)
@@ -20,8 +20,6 @@
 #ifndef __ASM_ARCH_DMA_H
 #define __ASM_ARCH_DMA_H
 
-#define MAX_DMA_CHANNELS       0
-
 /*
  * DMA registration
  */
index 6f934f6d838ab0601c1d66001da8bcded62e5fca..83fd6bbaf9d3f959c4db886170c507a6f659757e 100644 (file)
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-#ifndef __ASM_ARCH_DMA_H
-#define __ASM_ARCH_DMA_H
-
-#define MAX_DMA_CHANNELS       0
-
-#endif /* _ASM_ARCH_DMA_H */
-
index 58ec24db415dce25ec0aa16ba66a1a4c7b9e16f8..1e808db8af2a5a2f19493c9169d9621dca3922a5 100644 (file)
@@ -7,8 +7,3 @@
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
-
-#ifndef _IOP3XX_DMA_H_P
-#define _IOP3XX_DMA_H_P
-
-#endif /* _ASM_ARCH_DMA_H_P */
index 3af382551cda6d844500298673e15706da582086..548d8dc507eb6d6e03f2a4de200d0aa1a36f0922 100644 (file)
@@ -7,10 +7,3 @@
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
-#ifndef __ASM_ARCH_DMA_H
-#define __ASM_ARCH_DMA_H
-
-/* No DMA */
-#define MAX_DMA_CHANNELS       0
-
-#endif /* _ASM_ARCH_DMA_H */
index 312065dc0e7abdb962db140be874b2376d3c498c..b1a071ecebc8a26c3aebd5632228036806c57f88 100644 (file)
@@ -20,7 +20,4 @@
 
 #define MAX_DMA_ADDRESS                (PAGE_OFFSET + SZ_64M)
 
-/* No DMA */
-#define MAX_DMA_CHANNELS       0
-
 #endif /* _ASM_ARCH_DMA_H */
index 6595b386cfc9e1816e21a4a1aa8db4387cb70100..4c7eca63f03533d5b5a7a93cb3286acdb2db08e2 100644 (file)
@@ -17,7 +17,6 @@
  * bytes of RAM.
  */
 #define MAX_DMA_ADDRESS         0xd0000000
-#define MAX_DMA_CHANNELS        0
 
 #define DMA_S0                  0
 
index 18f13689a405c605587eb153f18a9801dba0b6a0..15492e3253f6abdc5088e6f6522613f53f537a8b 100644 (file)
@@ -7,10 +7,3 @@
  *  version 2 as published by the Free Software Foundation.
  *
  */
-
-#ifndef __ASM_ARCH_DMA_H
-#define __ASM_ARCH_DMA_H
-
-#define MAX_DMA_CHANNELS       0 /* All DMA is internal to CPU */
-
-#endif /* _ASM_ARCH_DMA_H */
index 40c04540461321217fc2dd718f0ed1dbd207b442..d4e73efcb816e3fa08456a0ad728b9dcfd7c07b0 100644 (file)
@@ -21,8 +21,6 @@
 #ifndef __ASM_ARCH_DMA_H
 #define __ASM_ARCH_DMA_H
 
-#define MAX_DMA_CHANNELS               0
-
 /* Hardware registers for omap1 */
 #define OMAP_DMA_BASE                  (0xfffed800)
 #define OMAP_DMA_GCR                   (OMAP_DMA_BASE + 0x400)
index 7402bdafc1639c12796dc4930b04b4ffbbf1097a..3e88a2a02a0fdd01186107439eed4711d38b9a7f 100644 (file)
@@ -12,9 +12,6 @@
 #ifndef __ASM_ARCH_DMA_H
 #define __ASM_ARCH_DMA_H
 
-/* No DMA as the rest of the world see it */
-#define MAX_DMA_CHANNELS       0
-
 /*
  * Descriptor structure for PXA's DMA engine
  * Note: this structure must always be aligned to a 16-byte boundary.
index d595cc90b069103b5f62a2792f314933eefb2fd7..8342e3f9d6eca3681011074e8e6fc6e0b0cb1076 100644 (file)
@@ -18,9 +18,3 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-#ifndef __ASM_ARCH_DMA_H
-#define __ASM_ARCH_DMA_H
-
-#define MAX_DMA_CHANNELS       0
-
-#endif /* _ASM_ARCH_DMA_H */
index e830a40e573a2ed2d8a0bc28d4e40175f0aed873..b011e14f3bc663d6858fb7afc2811eaf7395c3d5 100644 (file)
 #define MAX_DMA_TRANSFER_SIZE   0x100000 /* Data Unit is half word  */
 
 
-/* according to the samsung port, we cannot use the regular
- * dma channels... we must therefore provide our own interface
- * for DMA, and allow our drivers to use that.
- */
-
-#define MAX_DMA_CHANNELS       0
-
-
 /* we have 4 dma channels */
 #define S3C2410_DMA_CHANNELS        (4)
 
index a79c2d37c6690d6c654d6c57de8dc0f88d365cce..02575d72ac6bcd9548c870ac5987aa71a95d7bc5 100644 (file)
 #include "hardware.h"
 
 
-/*
- * The regular generic DMA interface is inappropriate for the
- * SA1100 DMA model.  None of the SA1100 specific drivers using
- * DMA are portable anyway so it's pointless to try to twist the
- * regular DMA API to accommodate them.
- */
-#define MAX_DMA_CHANNELS       0
-
 /*
  * The SA1100 has six internal DMA channels.
  */
index 94b3fc5a6321fba1f9e553f3d90606834cce99eb..6425773486239ab0fced894ae331cc9cccd30d0a 100644 (file)
@@ -18,9 +18,3 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-#ifndef __ASM_ARCH_DMA_H
-#define __ASM_ARCH_DMA_H
-
-#define MAX_DMA_CHANNELS       0
-
-#endif /* _ASM_ARCH_DMA_H */