Commit afedfd01 authored by Matt Mackall's avatar Matt Mackall Committed by Linus Torvalds
Browse files

[PATCH] random: remove SA_SAMPLE_RANDOM from floppy driver 



The floppy driver is already calling add_disk_randomness as it should, so this
was redundant.

Signed-off-by: default avatarMatt Mackall <mpm@selenic.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 51849738

include/asm-alpha/floppy.h

+2 −3
Original line number Diff line number Diff line
@@ -26,8 +26,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

include/asm-arm/floppy.h

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

include/asm-arm26/floppy.h

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

include/asm-i386/floppy.h

+2 −3
Original line number Diff line number Diff line
@@ -147,8 +147,7 @@ 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,

		return request_irq(FLOPPY_IRQ, floppy_interrupt, SA_INTERRUPT,

				   "floppy", NULL);



}

include/asm-mips/mach-generic/floppy.h

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