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

[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

arch/arm/kernel/dma.c

+0 −28
Original line number Diff line number Diff line
@@ -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);

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

+0 −7
Original line number Diff line number Diff line
@@ -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

include/asm-arm/arch-cl7500/dma.h

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
 * bytes of RAM.

 */

#define MAX_DMA_ADDRESS		0xd0000000

#define MAX_DMA_CHANNELS	0



#define DMA_S0			0

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

+0 −7
Original line number Diff line number Diff line
@@ -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 */

include/asm-arm/arch-ebsa110/dma.h

+0 −7
Original line number Diff line number Diff line
@@ -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 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE