From: Matt Mackall The scsi layer is already calling add_disk_randomness in scsi_end_request. ps: ninjas rule! Signed-off-by: Matt Mackall Signed-off-by: Andrew Morton --- drivers/scsi/nsp32.c | 3 +-- drivers/scsi/pcmcia/nsp_cs.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff -puN drivers/scsi/nsp32.c~random-remove-redundant-sa_sample_random-from-ninjascsi drivers/scsi/nsp32.c --- devel/drivers/scsi/nsp32.c~random-remove-redundant-sa_sample_random-from-ninjascsi 2006-05-11 01:42:04.000000000 -0700 +++ devel-akpm/drivers/scsi/nsp32.c 2006-05-11 01:42:04.000000000 -0700 @@ -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); diff -puN drivers/scsi/pcmcia/nsp_cs.c~random-remove-redundant-sa_sample_random-from-ninjascsi drivers/scsi/pcmcia/nsp_cs.c --- devel/drivers/scsi/pcmcia/nsp_cs.c~random-remove-redundant-sa_sample_random-from-ninjascsi 2006-05-11 01:42:04.000000000 -0700 +++ devel-akpm/drivers/scsi/pcmcia/nsp_cs.c 2006-05-11 01:42:04.000000000 -0700 @@ -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; _