random: Remove SA_SAMPLE_RANDOM from floppy driver
Subsystems (8)
PATCH 6/6 random: Remove redundant SA_SAMPLE_RANDOM from touchscreen drivers
In reply to Matt MackallRemove redundant SA_SAMPLE_RANDOM from touchscreen drivers
The core input layer is already calling add_input_randomness.
drivers/input/touchscreen/ads7846.c +1 -2
@@ -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 ;
drivers/input/touchscreen/h3600_ts_input.c +2 -4
@@ -399,16 +399,14 @@ static int h3600ts_connect(struct serioset_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;
PATCH 4/6 random: Change cpqarray to use add_disk_randomness
In reply to Matt MackallChange cpqarray to use add_disk_randomness
Disk devices should use add_disk_randomness rather than SA_SAMPLE_RANDOM
drivers/block/cpqarray.c +3 -2
@@ -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(cmdlcomplete_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 ); }
PATCH 3/6 random: Make CCISS use add_disk_randomness
In reply to Matt MackallMake CCISS use add_disk_randomness
Disk devices should use the add_disk_randomness API rather than SA_SAMPLE_RANDOM.
drivers/block/cciss.c +2 -2
@@ -1221,6 +1221,7 @@ static void cciss_softirq_done(struct reprintk ("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;
PATCH 2/6 random: Remove redundant SA_SAMPLE_RANDOM from NinjaSCSI
In reply to Matt MackallRemove redundant SA_SAMPLE_RANDOM from NinjaSCSI
The scsi layer is already calling add_disk_randomness in scsi_end_request.
ps: ninjas rule!
drivers/scsi/nsp32.c +1 -2
@@ -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);
drivers/scsi/pcmcia/nsp_cs.c +1 -1
@@ -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 ;
PATCH 5/6 random: Remove bogus SA_SAMPLE_RANDOM from at91 compact flash driver
In reply to Matt MackallRemove bogus SA_SAMPLE_RANDOM from at91 compact flash driver
Flash doesn't possess the same unpredictable performance characteristics as traditional media.
drivers/pcmcia/at91_cf.c +1 -2
@@ -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;
drivers/mmc/at91_mci.c +1 -1
@@ -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" ); }
PATCH 1/6 random: Remove SA_SAMPLE_RANDOM from floppy driver
Remove SA_SAMPLE_RANDOM from floppy driver
The floppy driver is already calling add_disk_randomness as it should, so this was redundant.
include/asm-alpha/floppy.h +2 -3
@@ -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
include/asm-arm/floppy.h +1 -1
@@ -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
@@ -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
@@ -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 ); }
include/asm-mips/mach-generic/floppy.h +1 -1
@@ -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 )
include/asm-mips/mach-jazz/floppy.h +1 -1
@@ -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 )
include/asm-parisc/floppy.h +2 -4
@@ -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)
include/asm-powerpc/floppy.h +1 -2
@@ -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
include/asm-ppc/floppy.h +2 -4
@@ -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)
include/asm-sh/floppy.h +3 -4
@@ -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 ); }
include/asm-x86_64/floppy.h +2 -4
@@ -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)