From: Matt Mackall The floppy driver is already calling add_disk_randomness as it should, so this was redundant. Signed-off-by: Matt Mackall Signed-off-by: Andrew Morton --- include/asm-alpha/floppy.h | 5 ++--- include/asm-arm/floppy.h | 2 +- include/asm-arm26/floppy.h | 2 +- include/asm-i386/floppy.h | 5 ++--- include/asm-mips/mach-generic/floppy.h | 2 +- include/asm-mips/mach-jazz/floppy.h | 2 +- include/asm-parisc/floppy.h | 6 ++---- include/asm-powerpc/floppy.h | 3 +-- include/asm-ppc/floppy.h | 6 ++---- include/asm-sh/floppy.h | 7 +++---- include/asm-x86_64/floppy.h | 6 ++---- 11 files changed, 18 insertions(+), 28 deletions(-) diff -puN include/asm-alpha/floppy.h~random-remove-sa_sample_random-from-floppy-driver include/asm-alpha/floppy.h --- devel/include/asm-alpha/floppy.h~random-remove-sa_sample_random-from-floppy-driver 2006-05-11 15:19:04.000000000 -0700 +++ devel-akpm/include/asm-alpha/floppy.h 2006-05-11 15:19:04.000000000 -0700 @@ -25,9 +25,8 @@ #define fd_enable_irq() enable_irq(FLOPPY_IRQ) #define fd_disable_irq() disable_irq(FLOPPY_IRQ) #define fd_cacheflush(addr,size) /* nothing */ -#define fd_request_irq() request_irq(FLOPPY_IRQ, floppy_interrupt, \ - SA_INTERRUPT|SA_SAMPLE_RANDOM, \ - "floppy", NULL) +#define fd_request_irq() request_irq(FLOPPY_IRQ, floppy_interrupt,\ + SA_INTERRUPT, "floppy", NULL) #define fd_free_irq() free_irq(FLOPPY_IRQ, NULL); #ifdef CONFIG_PCI diff -puN include/asm-arm26/floppy.h~random-remove-sa_sample_random-from-floppy-driver include/asm-arm26/floppy.h --- devel/include/asm-arm26/floppy.h~random-remove-sa_sample_random-from-floppy-driver 2006-05-11 15:19:04.000000000 -0700 +++ devel-akpm/include/asm-arm26/floppy.h 2006-05-11 15:19:04.000000000 -0700 @@ -22,7 +22,7 @@ #define fd_inb(port) inb((port)) #define fd_request_irq() request_irq(IRQ_FLOPPYDISK,floppy_interrupt,\ - SA_INTERRUPT|SA_SAMPLE_RANDOM,"floppy",NULL) + SA_INTERRUPT,"floppy",NULL) #define fd_free_irq() free_irq(IRQ_FLOPPYDISK,NULL) #define fd_disable_irq() disable_irq(IRQ_FLOPPYDISK) #define fd_enable_irq() enable_irq(IRQ_FLOPPYDISK) diff -puN include/asm-arm/floppy.h~random-remove-sa_sample_random-from-floppy-driver include/asm-arm/floppy.h --- devel/include/asm-arm/floppy.h~random-remove-sa_sample_random-from-floppy-driver 2006-05-11 15:19:04.000000000 -0700 +++ devel-akpm/include/asm-arm/floppy.h 2006-05-11 15:19:04.000000000 -0700 @@ -25,7 +25,7 @@ #define fd_inb(port) inb((port)) #define fd_request_irq() request_irq(IRQ_FLOPPYDISK,floppy_interrupt,\ - SA_INTERRUPT|SA_SAMPLE_RANDOM,"floppy",NULL) + SA_INTERRUPT,"floppy",NULL) #define fd_free_irq() free_irq(IRQ_FLOPPYDISK,NULL) #define fd_disable_irq() disable_irq(IRQ_FLOPPYDISK) #define fd_enable_irq() enable_irq(IRQ_FLOPPYDISK) diff -puN include/asm-i386/floppy.h~random-remove-sa_sample_random-from-floppy-driver include/asm-i386/floppy.h --- devel/include/asm-i386/floppy.h~random-remove-sa_sample_random-from-floppy-driver 2006-05-11 15:19:04.000000000 -0700 +++ devel-akpm/include/asm-i386/floppy.h 2006-05-11 15:19:04.000000000 -0700 @@ -147,9 +147,8 @@ static int fd_request_irq(void) return request_irq(FLOPPY_IRQ, floppy_hardint,SA_INTERRUPT, "floppy", NULL); else - return request_irq(FLOPPY_IRQ, floppy_interrupt, - SA_INTERRUPT|SA_SAMPLE_RANDOM, - "floppy", NULL); + return request_irq(FLOPPY_IRQ, floppy_interrupt, SA_INTERRUPT, + "floppy", NULL); } diff -puN include/asm-mips/mach-generic/floppy.h~random-remove-sa_sample_random-from-floppy-driver include/asm-mips/mach-generic/floppy.h --- devel/include/asm-mips/mach-generic/floppy.h~random-remove-sa_sample_random-from-floppy-driver 2006-05-11 15:19:04.000000000 -0700 +++ devel-akpm/include/asm-mips/mach-generic/floppy.h 2006-05-11 15:19:04.000000000 -0700 @@ -98,7 +98,7 @@ static inline void fd_disable_irq(void) static inline int fd_request_irq(void) { return request_irq(FLOPPY_IRQ, floppy_interrupt, - SA_INTERRUPT | SA_SAMPLE_RANDOM, "floppy", NULL); + SA_INTERRUPT, "floppy", NULL); } static inline void fd_free_irq(void) diff -puN include/asm-mips/mach-jazz/floppy.h~random-remove-sa_sample_random-from-floppy-driver include/asm-mips/mach-jazz/floppy.h --- devel/include/asm-mips/mach-jazz/floppy.h~random-remove-sa_sample_random-from-floppy-driver 2006-05-11 15:19:04.000000000 -0700 +++ devel-akpm/include/asm-mips/mach-jazz/floppy.h 2006-05-11 15:19:04.000000000 -0700 @@ -90,7 +90,7 @@ static inline void fd_disable_irq(void) static inline int fd_request_irq(void) { return request_irq(FLOPPY_IRQ, floppy_interrupt, - SA_INTERRUPT | SA_SAMPLE_RANDOM, "floppy", NULL); + SA_INTERRUPT, "floppy", NULL); } static inline void fd_free_irq(void) diff -puN include/asm-parisc/floppy.h~random-remove-sa_sample_random-from-floppy-driver include/asm-parisc/floppy.h --- devel/include/asm-parisc/floppy.h~random-remove-sa_sample_random-from-floppy-driver 2006-05-11 15:19:04.000000000 -0700 +++ devel-akpm/include/asm-parisc/floppy.h 2006-05-11 15:19:04.000000000 -0700 @@ -159,10 +159,8 @@ static int fd_request_irq(void) return request_irq(FLOPPY_IRQ, floppy_hardint,SA_INTERRUPT, "floppy", NULL); else - return request_irq(FLOPPY_IRQ, floppy_interrupt, - SA_INTERRUPT|SA_SAMPLE_RANDOM, - "floppy", NULL); - + return request_irq(FLOPPY_IRQ, floppy_interrupt, SA_INTERRUPT, + "floppy", NULL); } static unsigned long dma_mem_alloc(unsigned long size) diff -puN include/asm-powerpc/floppy.h~random-remove-sa_sample_random-from-floppy-driver include/asm-powerpc/floppy.h --- devel/include/asm-powerpc/floppy.h~random-remove-sa_sample_random-from-floppy-driver 2006-05-11 15:19:04.000000000 -0700 +++ devel-akpm/include/asm-powerpc/floppy.h 2006-05-11 15:19:04.000000000 -0700 @@ -27,8 +27,7 @@ #define fd_disable_irq() disable_irq(FLOPPY_IRQ) #define fd_cacheflush(addr,size) /* nothing */ #define fd_request_irq() request_irq(FLOPPY_IRQ, floppy_interrupt, \ - SA_INTERRUPT|SA_SAMPLE_RANDOM, \ - "floppy", NULL) + SA_INTERRUPT, "floppy", NULL) #define fd_free_irq() free_irq(FLOPPY_IRQ, NULL); #ifdef CONFIG_PCI diff -puN include/asm-ppc/floppy.h~random-remove-sa_sample_random-from-floppy-driver include/asm-ppc/floppy.h --- devel/include/asm-ppc/floppy.h~random-remove-sa_sample_random-from-floppy-driver 2006-05-11 15:19:04.000000000 -0700 +++ devel-akpm/include/asm-ppc/floppy.h 2006-05-11 15:19:04.000000000 -0700 @@ -99,10 +99,8 @@ static int fd_request_irq(void) return request_irq(FLOPPY_IRQ, floppy_hardint,SA_INTERRUPT, "floppy", NULL); else - return request_irq(FLOPPY_IRQ, floppy_interrupt, - SA_INTERRUPT|SA_SAMPLE_RANDOM, - "floppy", NULL); - + return request_irq(FLOPPY_IRQ, floppy_interrupt, SA_INTERRUPT, + "floppy", NULL); } static int vdma_dma_setup(char *addr, unsigned long size, int mode, int io) diff -puN include/asm-sh/floppy.h~random-remove-sa_sample_random-from-floppy-driver include/asm-sh/floppy.h --- devel/include/asm-sh/floppy.h~random-remove-sa_sample_random-from-floppy-driver 2006-05-11 15:19:04.000000000 -0700 +++ devel-akpm/include/asm-sh/floppy.h 2006-05-11 15:19:04.000000000 -0700 @@ -147,11 +147,10 @@ static int fd_request_irq(void) { if(can_use_virtual_dma) return request_irq(FLOPPY_IRQ, floppy_hardint,SA_INTERRUPT, - "floppy", NULL); + "floppy", NULL); else - return request_irq(FLOPPY_IRQ, floppy_interrupt, - SA_INTERRUPT|SA_SAMPLE_RANDOM, - "floppy", NULL); + return request_irq(FLOPPY_IRQ, floppy_interrupt, SA_INTERRUPT, + "floppy", NULL); } diff -puN include/asm-x86_64/floppy.h~random-remove-sa_sample_random-from-floppy-driver include/asm-x86_64/floppy.h --- devel/include/asm-x86_64/floppy.h~random-remove-sa_sample_random-from-floppy-driver 2006-05-11 15:19:04.000000000 -0700 +++ devel-akpm/include/asm-x86_64/floppy.h 2006-05-11 15:19:04.000000000 -0700 @@ -147,10 +147,8 @@ static int fd_request_irq(void) return request_irq(FLOPPY_IRQ, floppy_hardint,SA_INTERRUPT, "floppy", NULL); else - return request_irq(FLOPPY_IRQ, floppy_interrupt, - SA_INTERRUPT|SA_SAMPLE_RANDOM, - "floppy", NULL); - + return request_irq(FLOPPY_IRQ, floppy_interrupt, SA_INTERRUPT, + "floppy", NULL); } static unsigned long dma_mem_alloc(unsigned long size) _