[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: Matt Mackall <mpm@selenic.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/include/asm-alpha/floppy.h b/include/asm-alpha/floppy.h
index e177d4180f83610d92ab5be68853eb3516896dfc..21816d35ef899fb4773dba6b4c390bebf968fa9a 100644 (file)
--- a/include/asm-alpha/floppy.h
+++ b/include/asm-alpha/floppy.h
@@ -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 --git a/include/asm-arm/floppy.h b/include/asm-arm/floppy.h
index 6ea657c886b98859056bf06d9aee865299a985ed..aa0c8d28d8d946ae6b3de0785c5a5aef0b6701e5 100644 (file)
--- a/include/asm-arm/floppy.h
+++ b/include/asm-arm/floppy.h
@@ -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 --git a/include/asm-arm26/floppy.h b/include/asm-arm26/floppy.h
index 9e090ad7e47702047db5cf768495e0ecc5bc1973..a18af069ca28844ea155ad79f23393933f716dc8 100644 (file)
--- a/include/asm-arm26/floppy.h
+++ b/include/asm-arm26/floppy.h
@@ -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 --git a/include/asm-i386/floppy.h b/include/asm-i386/floppy.h
index 03403045c182945230f9729d3bcbebbc380d3580..9cb2793eb211d1597c40ebe19e9cdd7bd6cb819e 100644 (file)
--- a/include/asm-i386/floppy.h
+++ b/include/asm-i386/floppy.h
@@ -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 --git a/include/asm-mips/mach-generic/floppy.h b/include/asm-mips/mach-generic/floppy.h
index 682a5858f8d711ffe04fb187236db84b7377b2f5..83cd69e30ec3f6024a1e316dcbb4531beb1bf96d 100644 (file)
--- a/include/asm-mips/mach-generic/floppy.h
+++ b/include/asm-mips/mach-generic/floppy.h
@@ -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 --git a/include/asm-mips/mach-jazz/floppy.h b/include/asm-mips/mach-jazz/floppy.h
index c9dad99b12324aaaffa8a55c62367b865740266d..9413117915f49716eba65ee75f136b2836c3af3b 100644 (file)
--- a/include/asm-mips/mach-jazz/floppy.h
+++ b/include/asm-mips/mach-jazz/floppy.h
@@ -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 --git a/include/asm-parisc/floppy.h b/include/asm-parisc/floppy.h
index ca3aed768cdc1a8d3a528790bf073401f38acc19..458cdb2a753075d2a2acf2125b1c619a4be75a00 100644 (file)
--- a/include/asm-parisc/floppy.h
+++ b/include/asm-parisc/floppy.h
@@ -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 --git a/include/asm-powerpc/floppy.h b/include/asm-powerpc/floppy.h
index 7e2d169ee8569b74ceccfdfe78e442ef253266c3..9c8d91bf5a0d95c50e28d2883ae520edfa609a41 100644 (file)
--- a/include/asm-powerpc/floppy.h
+++ b/include/asm-powerpc/floppy.h
@@ -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 --git a/include/asm-ppc/floppy.h b/include/asm-ppc/floppy.h
index 8ccd4a276fe99bf68967298edeed96e5a9aa55ed..2ba191eba4482dda70005de3093914f4922912ac 100644 (file)
--- a/include/asm-ppc/floppy.h
+++ b/include/asm-ppc/floppy.h
@@ -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 --git a/include/asm-sh/floppy.h b/include/asm-sh/floppy.h
index 38d7a2942476dff07e61e396cf2175778df08c6a..307d9ce9f9ed6bfbeec86c15fb32f3b6e15ab3b1 100644 (file)
--- a/include/asm-sh/floppy.h
+++ b/include/asm-sh/floppy.h
@@ -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 --git a/include/asm-x86_64/floppy.h b/include/asm-x86_64/floppy.h
index 52825ce689f21a3f897641fa042f52fd4be4b1bd..006291e89b4a12e60b0947fc1d18b9c4f1410aae 100644 (file)
--- a/include/asm-x86_64/floppy.h
+++ b/include/asm-x86_64/floppy.h
@@ -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)