diff options
| author | Matt Mackall <mpm@selenic.com> | 2006-06-25 10:58:54 +0200 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-26 23:33:45 +0200 |
| commit | 99d19bb75b88cc997d3cd611903908714c735981 (patch) | |
| tree | 19a2c563eaf41dffefa7e62906a698f2fe1431df | |
| parent | [SCSI] Bogus disk geometry on large disks (diff) | |
| download | linux-99d19bb75b88cc997d3cd611903908714c735981.tar.xz linux-99d19bb75b88cc997d3cd611903908714c735981.zip | |
[SCSI] random: remove redundant SA_SAMPLE_RANDOM from NinjaSCSI
The scsi layer is already calling add_disk_randomness in scsi_end_request.
Signed-off-by: Matt Mackall <mpm@selenic.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
| -rw-r--r-- | drivers/scsi/nsp32.c | 3 | ||||
| -rw-r--r-- | drivers/scsi/pcmcia/nsp_cs.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/scsi/nsp32.c b/drivers/scsi/nsp32.c index 159fd5d8f98d..4190788f14be 100644 --- a/drivers/scsi/nsp32.c +++ b/drivers/scsi/nsp32.c @@ -2866,8 +2866,7 @@ static int nsp32_detect(struct scsi_host_template *sht) */ 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 --git a/drivers/scsi/pcmcia/nsp_cs.c b/drivers/scsi/pcmcia/nsp_cs.c index 231f9c311c69..bb81218b8d19 100644 --- a/drivers/scsi/pcmcia/nsp_cs.c +++ b/drivers/scsi/pcmcia/nsp_cs.c @@ -1623,7 +1623,7 @@ static int nsp_cs_probe(struct pcmcia_device *link) /* 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; |