mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

cleanup floppy.h 

AUTO_DMA and FLOPPY_MOTOR_MASK in include/asm-*/floppy.h are dead symbols -
remove them.

Signed-off-by: Jan Beulich <jbeulich@novell.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Jan Beulich 2007-10-16 23:27:33 -07:00 committed by Linus Torvalds
parent 2e9c47cd4d
commit 9c6cdad7fe
12 changed files with 0 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/asm-alpha/floppy.h
View File

@ -91,8 +91,6 @@ static int FDC2 = -1;
#define N_FDC 2
#define N_DRIVE 8
#define FLOPPY_MOTOR_MASK 0xf0
/*
* Most Alphas have no problems with floppy DMA crossing 64k borders,
* except for certain ones, like XL and RUFFIAN.

2
include/asm-arm/floppy.h
View File

@ -128,8 +128,6 @@ static inline void fd_scandrives (void)
#define N_FDC 1
#define N_DRIVE 4
#define FLOPPY_MOTOR_MASK 0xf0
#define CROSS_64KB(a,s) (0)
/*

3
include/asm-m68k/floppy.h
View File

@ -31,9 +31,6 @@ asmlinkage irqreturn_t floppy_hardint(int irq, void *dev_id);
#define FLOPPY0_TYPE (MACH_IS_Q40 ? 6 : 4)
#define FLOPPY1_TYPE 0
#define FLOPPY_MOTOR_MASK 0xf0
/* basically PC init + set use_virtual_dma */
#define FDC1 m68k_floppy_init()

2
include/asm-mips/floppy.h
View File

@ -34,8 +34,6 @@ static inline void fd_cacheflush(char * addr, long size)
#define N_FDC 1 /* do you *really* want a second controller? */
#define N_DRIVE 8
#define FLOPPY_MOTOR_MASK 0xf0
/*
* The DMA channel used by the floppy controller cannot access data at
* addresses >= 16MB

4
include/asm-parisc/floppy.h
View File

@ -266,10 +266,6 @@ static int FDC2 = -1;
#define N_FDC 1
#define N_DRIVE 8
#define FLOPPY_MOTOR_MASK 0xf0
#define AUTO_DMA
#define EXTRA_FLOPPY_PARAMS
#endif /* __ASM_PARISC_FLOPPY_H */

2
include/asm-powerpc/floppy.h
View File

@ -202,8 +202,6 @@ static int FDC2 = -1;
#define N_FDC 2 /* Don't change this! */
#define N_DRIVE 8
#define FLOPPY_MOTOR_MASK 0xf0
/*
* The PowerPC has no problems with floppy DMA crossing 64k borders.
*/

2
include/asm-ppc/floppy.h
View File

@ -166,8 +166,6 @@ static int FDC2 = -1;
#define N_FDC 2 /* Don't change this! */
#define N_DRIVE 8
#define FLOPPY_MOTOR_MASK 0xf0
/*
* The PowerPC has no problems with floppy DMA crossing 64k borders.
*/

4
include/asm-sh/floppy.h
View File

@ -263,10 +263,6 @@ static int FDC2 = -1;
#define N_FDC 2
#define N_DRIVE 8
#define FLOPPY_MOTOR_MASK 0xf0
#define AUTO_DMA
#define EXTRA_FLOPPY_PARAMS
#endif /* __ASM_SH_FLOPPY_H */

2
include/asm-sparc/floppy.h
View File

@ -77,8 +77,6 @@ static struct sun_floppy_ops sun_fdops;
#define fd_dma_mem_free(addr,size) (vfree((void *)(addr)))
#endif
#define FLOPPY_MOTOR_MASK 0x10
/* XXX This isn't really correct. XXX */
#define get_dma_residue(x) (0)

4
include/asm-sparc64/floppy.h
View File

@ -84,8 +84,6 @@ static struct sun_floppy_ops sun_fdops;
#define fd_free_irq() sun_fdops.fd_free_irq()
#define fd_eject(drive) sun_fdops.fd_eject(drive)
static int FLOPPY_MOTOR_MASK = 0x10;
/* Super paranoid... */
#undef HAVE_DISABLE_HLT
@ -622,7 +620,6 @@ isa_done:
sun_fdops.fd_eject = sun_pci_fd_eject;
fdc_status = (unsigned long) &sun_fdc->status_82077;
FLOPPY_MOTOR_MASK = 0xf0;
allowed_drive_mask = 0;
sun_floppy_types[0] = 0;
@ -729,7 +726,6 @@ static unsigned long __init sun_floppy_init(void)
sun_fdops.fd_eject = sun_pci_fd_eject;
fdc_status = (unsigned long) &sun_fdc->status_82077;
FLOPPY_MOTOR_MASK = 0xf0;
/*
* XXX: Find out on which machines this is really needed.

4
include/asm-x86/floppy_32.h
View File

@ -275,10 +275,6 @@ static int FDC2 = -1;
#define N_FDC 2
#define N_DRIVE 8
#define FLOPPY_MOTOR_MASK 0xf0
#define AUTO_DMA
#define EXTRA_FLOPPY_PARAMS
#endif /* __ASM_I386_FLOPPY_H */

4
include/asm-x86/floppy_64.h
View File

@ -274,10 +274,6 @@ static int FDC2 = -1;
#define N_FDC 2
#define N_DRIVE 8
#define FLOPPY_MOTOR_MASK 0xf0
#define AUTO_DMA
#define EXTRA_FLOPPY_PARAMS
#endif /* __ASM_X86_64_FLOPPY_H */