Skip to content

L
linux
Commit 95ba9fb0 authored by Russell King's avatar Russell King Committed by Russell King
Browse files
Options

[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: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 065909b9
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 122 deletions
arch/arm/kernel/dma.c
View file @ 95ba9fb0
...@@ -22,8 +22,6 @@ ...@@ -22,8 +22,6 @@
DEFINE_SPINLOCK(dma_spin_lock); DEFINE_SPINLOCK(dma_spin_lock);
#if MAX_DMA_CHANNELS > 0
static dma_t dma_chan[MAX_DMA_CHANNELS]; static dma_t dma_chan[MAX_DMA_CHANNELS];
/* /*
...@@ -256,32 +254,6 @@ static int __init init_dma(void) ...@@ -256,32 +254,6 @@ static int __init init_dma(void)
core_initcall(init_dma); 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(request_dma);
EXPORT_SYMBOL(free_dma); EXPORT_SYMBOL(free_dma);
EXPORT_SYMBOL(enable_dma); EXPORT_SYMBOL(enable_dma);
......
include/asm-arm/arch-aaec2000/dma.h
View file @ 95ba9fb0
...@@ -7,10 +7,3 @@ ...@@ -7,10 +7,3 @@
* it under the terms of the GNU General Public License version 2 as * it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation. * published by the Free Software Foundation.
*/ */
#ifndef __ASM_ARCH_DMA_H
#define __ASM_ARCH_DMA_H
#define MAX_DMA_CHANNELS 0
#endif
include/asm-arm/arch-cl7500/dma.h
View file @ 95ba9fb0
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
* bytes of RAM. * bytes of RAM.
*/ */
#define MAX_DMA_ADDRESS 0xd0000000 #define MAX_DMA_ADDRESS 0xd0000000
#define MAX_DMA_CHANNELS 0
#define DMA_S0 0 #define DMA_S0 0
......
include/asm-arm/arch-clps711x/dma.h
View file @ 95ba9fb0
...@@ -17,10 +17,3 @@ ...@@ -17,10 +17,3 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * 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 */
include/asm-arm/arch-ebsa110/dma.h
View file @ 95ba9fb0
...@@ -9,10 +9,3 @@ ...@@ -9,10 +9,3 @@
* *
* EBSA110 DMA definitions * EBSA110 DMA definitions
*/ */
#ifndef __ASM_ARCH_DMA_H
#define __ASM_ARCH_DMA_H
#define MAX_DMA_CHANNELS 0
#endif /* _ASM_ARCH_DMA_H */
include/asm-arm/arch-epxa10db/dma.h
View file @ 95ba9fb0
...@@ -17,10 +17,3 @@ ...@@ -17,10 +17,3 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * 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 */
include/asm-arm/arch-imx/dma.h
View file @ 95ba9fb0
...@@ -20,8 +20,6 @@ ...@@ -20,8 +20,6 @@
#ifndef __ASM_ARCH_DMA_H #ifndef __ASM_ARCH_DMA_H
#define __ASM_ARCH_DMA_H #define __ASM_ARCH_DMA_H
#define MAX_DMA_CHANNELS 0
/* /*
* DMA registration * DMA registration
*/ */
......
include/asm-arm/arch-integrator/dma.h
View file @ 95ba9fb0
...@@ -17,10 +17,3 @@ ...@@ -17,10 +17,3 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * 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 */
include/asm-arm/arch-iop3xx/dma.h
View file @ 95ba9fb0
...@@ -7,8 +7,3 @@ ...@@ -7,8 +7,3 @@
* it under the terms of the GNU General Public License version 2 as * it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation. * published by the Free Software Foundation.
*/ */
#ifndef _IOP3XX_DMA_H_P
#define _IOP3XX_DMA_H_P
#endif /* _ASM_ARCH_DMA_H_P */
include/asm-arm/arch-ixp2000/dma.h
View file @ 95ba9fb0
...@@ -7,10 +7,3 @@ ...@@ -7,10 +7,3 @@
* it under the terms of the GNU General Public License version 2 as * it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation. * 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 */
include/asm-arm/arch-ixp4xx/dma.h
View file @ 95ba9fb0
...@@ -20,7 +20,4 @@ ...@@ -20,7 +20,4 @@
#define MAX_DMA_ADDRESS (PAGE_OFFSET + SZ_64M) #define MAX_DMA_ADDRESS (PAGE_OFFSET + SZ_64M)
/* No DMA */
#define MAX_DMA_CHANNELS 0
#endif /* _ASM_ARCH_DMA_H */ #endif /* _ASM_ARCH_DMA_H */
include/asm-arm/arch-l7200/dma.h
View file @ 95ba9fb0
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
* bytes of RAM. * bytes of RAM.
*/ */
#define MAX_DMA_ADDRESS 0xd0000000 #define MAX_DMA_ADDRESS 0xd0000000
#define MAX_DMA_CHANNELS 0
#define DMA_S0 0 #define DMA_S0 0
......
include/asm-arm/arch-lh7a40x/dma.h
View file @ 95ba9fb0
...@@ -7,10 +7,3 @@ ...@@ -7,10 +7,3 @@
* version 2 as published by the Free Software Foundation. * 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 */
include/asm-arm/arch-omap/dma.h
View file @ 95ba9fb0
...@@ -21,8 +21,6 @@ ...@@ -21,8 +21,6 @@
#ifndef __ASM_ARCH_DMA_H #ifndef __ASM_ARCH_DMA_H
#define __ASM_ARCH_DMA_H #define __ASM_ARCH_DMA_H
#define MAX_DMA_CHANNELS 0
/* Hardware registers for omap1 */ /* Hardware registers for omap1 */
#define OMAP_DMA_BASE (0xfffed800) #define OMAP_DMA_BASE (0xfffed800)
#define OMAP_DMA_GCR (OMAP_DMA_BASE + 0x400) #define OMAP_DMA_GCR (OMAP_DMA_BASE + 0x400)
......
include/asm-arm/arch-pxa/dma.h
View file @ 95ba9fb0
...@@ -12,9 +12,6 @@ ...@@ -12,9 +12,6 @@
#ifndef __ASM_ARCH_DMA_H #ifndef __ASM_ARCH_DMA_H
#define __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 * Descriptor structure for PXA's DMA engine
* Note: this structure must always be aligned to a 16-byte boundary. * Note: this structure must always be aligned to a 16-byte boundary.
......
include/asm-arm/arch-realview/dma.h
View file @ 95ba9fb0
...@@ -18,9 +18,3 @@ ...@@ -18,9 +18,3 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * 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 */
include/asm-arm/arch-s3c2410/dma.h
View file @ 95ba9fb0
...@@ -31,14 +31,6 @@ ...@@ -31,14 +31,6 @@
#define MAX_DMA_TRANSFER_SIZE 0x100000 /* Data Unit is half word */ #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 */ /* we have 4 dma channels */
#define S3C2410_DMA_CHANNELS (4) #define S3C2410_DMA_CHANNELS (4)
......
include/asm-arm/arch-sa1100/dma.h
View file @ 95ba9fb0
...@@ -14,14 +14,6 @@ ...@@ -14,14 +14,6 @@
#include "hardware.h" #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. * The SA1100 has six internal DMA channels.
*/ */
......
include/asm-arm/arch-versatile/dma.h
View file @ 95ba9fb0
...@@ -18,9 +18,3 @@ ...@@ -18,9 +18,3 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * 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 */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7