Skip to content

Commit

Permalink
[SCSI] random: remove redundant SA_SAMPLE_RANDOM from NinjaSCSI
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Matt Mackall authored and James Bottomley committed Jun 26, 2006
1 parent 8d55a78 commit 99d19bb
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
3 changes: 1 addition & 2 deletions drivers/scsi/nsp32.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion drivers/scsi/pcmcia/nsp_cs.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 99d19bb

Please sign in to comment.