* [PATCH 1/6] random: Remove SA_SAMPLE_RANDOM from floppy driver
@ 2006-05-09 19:50 Matt Mackall
2006-05-09 19:50 ` [PATCH 5/6] random: Remove bogus SA_SAMPLE_RANDOM from at91 compact flash driver Matt Mackall
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: Matt Mackall @ 2006-05-09 19:50 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-kernel, zwane
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>
Index: 2.6/include/asm-alpha/floppy.h
===================================================================
--- 2.6.orig/include/asm-alpha/floppy.h 2005-10-27 19:02:08.000000000 -0500
+++ 2.6/include/asm-alpha/floppy.h 2006-05-03 11:18:46.000000000 -0500
@@ -26,9 +26,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
Index: 2.6/include/asm-arm/floppy.h
===================================================================
--- 2.6.orig/include/asm-arm/floppy.h 2005-10-27 19:02:08.000000000 -0500
+++ 2.6/include/asm-arm/floppy.h 2006-05-03 11:19:14.000000000 -0500
@@ -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)
Index: 2.6/include/asm-arm26/floppy.h
===================================================================
--- 2.6.orig/include/asm-arm26/floppy.h 2005-10-27 19:02:08.000000000 -0500
+++ 2.6/include/asm-arm26/floppy.h 2006-05-03 11:13:31.000000000 -0500
@@ -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)
Index: 2.6/include/asm-i386/floppy.h
===================================================================
--- 2.6.orig/include/asm-i386/floppy.h 2006-05-02 17:28:46.000000000 -0500
+++ 2.6/include/asm-i386/floppy.h 2006-05-03 11:03:21.000000000 -0500
@@ -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);
}
Index: 2.6/include/asm-mips/mach-generic/floppy.h
===================================================================
--- 2.6.orig/include/asm-mips/mach-generic/floppy.h 2005-10-27 19:02:08.000000000 -0500
+++ 2.6/include/asm-mips/mach-generic/floppy.h 2006-05-03 11:11:14.000000000 -0500
@@ -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)
Index: 2.6/include/asm-mips/mach-jazz/floppy.h
===================================================================
--- 2.6.orig/include/asm-mips/mach-jazz/floppy.h 2005-10-27 19:02:08.000000000 -0500
+++ 2.6/include/asm-mips/mach-jazz/floppy.h 2006-05-03 11:11:44.000000000 -0500
@@ -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)
Index: 2.6/include/asm-parisc/floppy.h
===================================================================
--- 2.6.orig/include/asm-parisc/floppy.h 2005-10-27 19:02:08.000000000 -0500
+++ 2.6/include/asm-parisc/floppy.h 2006-05-03 11:12:56.000000000 -0500
@@ -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)
Index: 2.6/include/asm-powerpc/floppy.h
===================================================================
--- 2.6.orig/include/asm-powerpc/floppy.h 2006-05-02 17:28:46.000000000 -0500
+++ 2.6/include/asm-powerpc/floppy.h 2006-05-03 11:15:32.000000000 -0500
@@ -28,8 +28,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
Index: 2.6/include/asm-ppc/floppy.h
===================================================================
--- 2.6.orig/include/asm-ppc/floppy.h 2005-10-27 19:02:08.000000000 -0500
+++ 2.6/include/asm-ppc/floppy.h 2006-05-03 11:10:41.000000000 -0500
@@ -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)
Index: 2.6/include/asm-sh/floppy.h
===================================================================
--- 2.6.orig/include/asm-sh/floppy.h 2005-10-27 19:02:08.000000000 -0500
+++ 2.6/include/asm-sh/floppy.h 2006-05-03 11:04:48.000000000 -0500
@@ -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);
}
Index: 2.6/include/asm-x86_64/floppy.h
===================================================================
--- 2.6.orig/include/asm-x86_64/floppy.h 2006-05-02 17:28:46.000000000 -0500
+++ 2.6/include/asm-x86_64/floppy.h 2006-05-03 11:09:30.000000000 -0500
@@ -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)
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 4/6] random: Change cpqarray to use add_disk_randomness
2006-05-09 19:50 [PATCH 1/6] random: Remove SA_SAMPLE_RANDOM from floppy driver Matt Mackall
2006-05-09 19:50 ` [PATCH 5/6] random: Remove bogus SA_SAMPLE_RANDOM from at91 compact flash driver Matt Mackall
2006-05-09 19:50 ` [PATCH 3/6] random: Make CCISS use add_disk_randomness Matt Mackall
@ 2006-05-09 19:50 ` Matt Mackall
2006-05-09 19:50 ` [PATCH 2/6] random: Remove redundant SA_SAMPLE_RANDOM from NinjaSCSI Matt Mackall
2006-05-09 19:50 ` [PATCH 6/6] random: Remove redundant SA_SAMPLE_RANDOM from touchscreen drivers Matt Mackall
4 siblings, 0 replies; 6+ messages in thread
From: Matt Mackall @ 2006-05-09 19:50 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-kernel, iss_storagedev
Change cpqarray to use add_disk_randomness
Disk devices should use add_disk_randomness rather than SA_SAMPLE_RANDOM
Signed-off-by: Matt Mackall <mpm@selenic.com>
Index: 2.6/drivers/block/cpqarray.c
===================================================================
--- 2.6.orig/drivers/block/cpqarray.c 2006-05-02 17:29:26.000000000 -0500
+++ 2.6/drivers/block/cpqarray.c 2006-05-03 11:25:55.000000000 -0500
@@ -408,8 +408,7 @@ static int cpqarray_register_ctlr( int i
}
hba[i]->access.set_intr_mask(hba[i], 0);
if (request_irq(hba[i]->intr, do_ida_intr,
- SA_INTERRUPT|SA_SHIRQ|SA_SAMPLE_RANDOM,
- hba[i]->devname, hba[i]))
+ SA_INTERRUPT|SA_SHIRQ, hba[i]->devname, hba[i]))
{
printk(KERN_ERR "cpqarray: Unable to get irq %d for %s\n",
hba[i]->intr, hba[i]->devname);
@@ -1034,6 +1033,8 @@ static inline void complete_command(cmdl
complete_buffers(cmd->rq->bio, ok);
+ add_disk_randomness(cmd->rq->rq_disk);
+
DBGPX(printk("Done with %p\n", cmd->rq););
end_that_request_last(cmd->rq, ok ? 1 : -EIO);
}
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 5/6] random: Remove bogus SA_SAMPLE_RANDOM from at91 compact flash driver
2006-05-09 19:50 [PATCH 1/6] random: Remove SA_SAMPLE_RANDOM from floppy driver Matt Mackall
@ 2006-05-09 19:50 ` Matt Mackall
2006-05-09 19:50 ` [PATCH 3/6] random: Make CCISS use add_disk_randomness Matt Mackall
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Matt Mackall @ 2006-05-09 19:50 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-kernel, dbrownell
Remove bogus SA_SAMPLE_RANDOM from at91 compact flash driver
Flash doesn't possess the same unpredictable performance
characteristics as traditional media.
Signed-off-by: Matt Mackall <mpm@selenic.com>
Index: 2.6/drivers/pcmcia/at91_cf.c
===================================================================
--- 2.6.orig/drivers/pcmcia/at91_cf.c 2006-05-02 17:28:44.000000000 -0500
+++ 2.6/drivers/pcmcia/at91_cf.c 2006-05-03 11:28:06.000000000 -0500
@@ -267,8 +267,7 @@ static int __init at91_cf_probe(struct d
);
/* must be a GPIO; ergo must trigger on both edges */
- status = request_irq(board->det_pin, at91_cf_irq,
- SA_SAMPLE_RANDOM, driver_name, cf);
+ status = request_irq(board->det_pin, at91_cf_irq, 0, driver_name, cf);
if (status < 0)
goto fail0;
Index: 2.6/drivers/mmc/at91_mci.c
===================================================================
--- 2.6.orig/drivers/mmc/at91_mci.c 2006-05-02 17:28:43.000000000 -0500
+++ 2.6/drivers/mmc/at91_mci.c 2006-05-03 11:33:40.000000000 -0500
@@ -889,7 +889,7 @@ static int at91_mci_probe(struct platfor
*/
if (host->board->det_pin) {
ret = request_irq(host->board->det_pin, at91_mmc_det_irq,
- SA_SAMPLE_RANDOM, DRIVER_NAME, host);
+ 0, DRIVER_NAME, host);
if (ret)
DBG("couldn't allocate MMC detect irq\n");
}
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 3/6] random: Make CCISS use add_disk_randomness
2006-05-09 19:50 [PATCH 1/6] random: Remove SA_SAMPLE_RANDOM from floppy driver Matt Mackall
2006-05-09 19:50 ` [PATCH 5/6] random: Remove bogus SA_SAMPLE_RANDOM from at91 compact flash driver Matt Mackall
@ 2006-05-09 19:50 ` Matt Mackall
2006-05-09 19:50 ` [PATCH 4/6] random: Change cpqarray to " Matt Mackall
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Matt Mackall @ 2006-05-09 19:50 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-kernel, iss_storagedev
Make CCISS use add_disk_randomness
Disk devices should use the add_disk_randomness API rather than
SA_SAMPLE_RANDOM.
Signed-off-by: Matt Mackall <mpm@selenic.com>
Index: 2.6/drivers/block/cciss.c
===================================================================
--- 2.6.orig/drivers/block/cciss.c 2006-05-02 17:29:26.000000000 -0500
+++ 2.6/drivers/block/cciss.c 2006-05-03 11:22:54.000000000 -0500
@@ -1221,6 +1221,7 @@ static void cciss_softirq_done(struct re
printk("Done with %p\n", rq);
#endif /* CCISS_DEBUG */
+ add_disk_randomness(rq->rq_disk);
spin_lock_irqsave(&h->lock, flags);
end_that_request_last(rq, rq->errors);
cmd_free(h, cmd,1);
@@ -3152,8 +3153,7 @@ static int __devinit cciss_init_one(stru
/* make sure the board interrupts are off */
hba[i]->access.set_intr_mask(hba[i], CCISS_INTR_OFF);
if( request_irq(hba[i]->intr[SIMPLE_MODE_INT], do_cciss_intr,
- SA_INTERRUPT | SA_SHIRQ | SA_SAMPLE_RANDOM,
- hba[i]->devname, hba[i])) {
+ SA_INTERRUPT | SA_SHIRQ, hba[i]->devname, hba[i])) {
printk(KERN_ERR "cciss: Unable to get irq %d for %s\n",
hba[i]->intr[SIMPLE_MODE_INT], hba[i]->devname);
goto clean2;
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 2/6] random: Remove redundant SA_SAMPLE_RANDOM from NinjaSCSI
2006-05-09 19:50 [PATCH 1/6] random: Remove SA_SAMPLE_RANDOM from floppy driver Matt Mackall
` (2 preceding siblings ...)
2006-05-09 19:50 ` [PATCH 4/6] random: Change cpqarray to " Matt Mackall
@ 2006-05-09 19:50 ` Matt Mackall
2006-05-09 19:50 ` [PATCH 6/6] random: Remove redundant SA_SAMPLE_RANDOM from touchscreen drivers Matt Mackall
4 siblings, 0 replies; 6+ messages in thread
From: Matt Mackall @ 2006-05-09 19:50 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-kernel, yokota
Remove redundant SA_SAMPLE_RANDOM from NinjaSCSI
The scsi layer is already calling add_disk_randomness in scsi_end_request.
ps: ninjas rule!
Signed-off-by: Matt Mackall <mpm@selenic.com>
Index: 2.6/drivers/scsi/nsp32.c
===================================================================
--- 2.6.orig/drivers/scsi/nsp32.c 2006-05-02 17:28:45.000000000 -0500
+++ 2.6/drivers/scsi/nsp32.c 2006-05-03 11:40:26.000000000 -0500
@@ -2866,8 +2866,7 @@ static int nsp32_detect(struct scsi_host
*/
nsp32_do_bus_reset(data);
- ret = request_irq(host->irq, do_nsp32_isr,
- SA_SHIRQ | SA_SAMPLE_RANDOM, "nsp32", data);
+ ret = request_irq(host->irq, do_nsp32_isr, SA_SHIRQ, "nsp32", data);
if (ret < 0) {
nsp32_msg(KERN_ERR, "Unable to allocate IRQ for NinjaSCSI32 "
"SCSI PCI controller. Interrupt: %d", host->irq);
Index: 2.6/drivers/scsi/pcmcia/nsp_cs.c
===================================================================
--- 2.6.orig/drivers/scsi/pcmcia/nsp_cs.c 2006-05-02 17:28:45.000000000 -0500
+++ 2.6/drivers/scsi/pcmcia/nsp_cs.c 2006-05-03 11:39:43.000000000 -0500
@@ -1623,7 +1623,7 @@ static int nsp_cs_probe(struct pcmcia_de
/* Interrupt handler */
link->irq.Handler = &nspintr;
link->irq.Instance = info;
- link->irq.Attributes |= (SA_SHIRQ | SA_SAMPLE_RANDOM);
+ link->irq.Attributes |= SA_SHIRQ;
/* General socket configuration */
link->conf.Attributes = CONF_ENABLE_IRQ;
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 6/6] random: Remove redundant SA_SAMPLE_RANDOM from touchscreen drivers
2006-05-09 19:50 [PATCH 1/6] random: Remove SA_SAMPLE_RANDOM from floppy driver Matt Mackall
` (3 preceding siblings ...)
2006-05-09 19:50 ` [PATCH 2/6] random: Remove redundant SA_SAMPLE_RANDOM from NinjaSCSI Matt Mackall
@ 2006-05-09 19:50 ` Matt Mackall
4 siblings, 0 replies; 6+ messages in thread
From: Matt Mackall @ 2006-05-09 19:50 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-kernel, dtor_core
Remove redundant SA_SAMPLE_RANDOM from touchscreen drivers
The core input layer is already calling add_input_randomness.
Signed-off-by: Matt Mackall <mpm@selenic.com>
Index: 2.6/drivers/input/touchscreen/ads7846.c
===================================================================
--- 2.6.orig/drivers/input/touchscreen/ads7846.c 2006-05-02 17:29:26.000000000 -0500
+++ 2.6/drivers/input/touchscreen/ads7846.c 2006-05-03 11:58:51.000000000 -0500
@@ -770,8 +770,7 @@ static int __devinit ads7846_probe(struc
ts->last_msg = m;
- if (request_irq(spi->irq, ads7846_irq,
- SA_SAMPLE_RANDOM | SA_TRIGGER_FALLING,
+ if (request_irq(spi->irq, ads7846_irq, SA_TRIGGER_FALLING,
spi->dev.bus_id, ts)) {
dev_dbg(&spi->dev, "irq %d busy?\n", spi->irq);
err = -EBUSY;
Index: 2.6/drivers/input/touchscreen/h3600_ts_input.c
===================================================================
--- 2.6.orig/drivers/input/touchscreen/h3600_ts_input.c 2006-04-20 17:00:40.000000000 -0500
+++ 2.6/drivers/input/touchscreen/h3600_ts_input.c 2006-05-03 11:58:13.000000000 -0500
@@ -399,16 +399,14 @@ static int h3600ts_connect(struct serio
set_GPIO_IRQ_edge(GPIO_BITSY_NPOWER_BUTTON, GPIO_RISING_EDGE);
if (request_irq(IRQ_GPIO_BITSY_ACTION_BUTTON, action_button_handler,
- SA_SHIRQ | SA_INTERRUPT | SA_SAMPLE_RANDOM,
- "h3600_action", &ts->dev)) {
+ SA_SHIRQ | SA_INTERRUPT, "h3600_action", &ts->dev)) {
printk(KERN_ERR "h3600ts.c: Could not allocate Action Button IRQ!\n");
err = -EBUSY;
goto fail2;
}
if (request_irq(IRQ_GPIO_BITSY_NPOWER_BUTTON, npower_button_handler,
- SA_SHIRQ | SA_INTERRUPT | SA_SAMPLE_RANDOM,
- "h3600_suspend", &ts->dev)) {
+ SA_SHIRQ | SA_INTERRUPT, "h3600_suspend", &ts->dev)) {
printk(KERN_ERR "h3600ts.c: Could not allocate Power Button IRQ!\n");
err = -EBUSY;
goto fail3;
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2006-05-09 19:53 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-05-09 19:50 [PATCH 1/6] random: Remove SA_SAMPLE_RANDOM from floppy driver Matt Mackall
2006-05-09 19:50 ` [PATCH 5/6] random: Remove bogus SA_SAMPLE_RANDOM from at91 compact flash driver Matt Mackall
2006-05-09 19:50 ` [PATCH 3/6] random: Make CCISS use add_disk_randomness Matt Mackall
2006-05-09 19:50 ` [PATCH 4/6] random: Change cpqarray to " Matt Mackall
2006-05-09 19:50 ` [PATCH 2/6] random: Remove redundant SA_SAMPLE_RANDOM from NinjaSCSI Matt Mackall
2006-05-09 19:50 ` [PATCH 6/6] random: Remove redundant SA_SAMPLE_RANDOM from touchscreen drivers Matt Mackall
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.