[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>
This commit is contained in:
parent
065909b915
commit
95ba9fb06b
|
@ -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);
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -15,7 +15,6 @@
|
|||
* bytes of RAM.
|
||||
*/
|
||||
#define MAX_DMA_ADDRESS 0xd0000000
|
||||
#define MAX_DMA_CHANNELS 0
|
||||
|
||||
#define DMA_S0 0
|
||||
|
||||
|
|
|
@ -17,10 +17,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 */
|
||||
|
||||
|
|
|
@ -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 */
|
||||
|
||||
|
|
|
@ -17,10 +17,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 */
|
||||
|
||||
|
|
|
@ -20,8 +20,6 @@
|
|||
#ifndef __ASM_ARCH_DMA_H
|
||||
#define __ASM_ARCH_DMA_H
|
||||
|
||||
#define MAX_DMA_CHANNELS 0
|
||||
|
||||
/*
|
||||
* DMA registration
|
||||
*/
|
||||
|
|
|
@ -17,10 +17,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 */
|
||||
|
||||
|
|
|
@ -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 */
|
||||
|
|
|
@ -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 */
|
||||
|
|
|
@ -20,7 +20,4 @@
|
|||
|
||||
#define MAX_DMA_ADDRESS (PAGE_OFFSET + SZ_64M)
|
||||
|
||||
/* No DMA */
|
||||
#define MAX_DMA_CHANNELS 0
|
||||
|
||||
#endif /* _ASM_ARCH_DMA_H */
|
||||
|
|
|
@ -17,7 +17,6 @@
|
|||
* bytes of RAM.
|
||||
*/
|
||||
#define MAX_DMA_ADDRESS 0xd0000000
|
||||
#define MAX_DMA_CHANNELS 0
|
||||
|
||||
#define DMA_S0 0
|
||||
|
||||
|
|
|
@ -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 */
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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.
|
||||
|
|
|
@ -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 */
|
||||
|
|
|
@ -31,14 +31,6 @@
|
|||
#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)
|
||||
|
||||
|
|
|
@ -14,14 +14,6 @@
|
|||
#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.
|
||||
*/
|
||||
|
|
|
@ -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 */
|
||||
|
|
Loading…
Reference in New Issue