aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorMatt Mackall <mpm@selenic.com>2006-06-25 08:47:12 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-25 13:01:00 -0400
commit0f41a53a6699209216327cd4b506711610ad24c5 (patch)
tree8f10fa4f404053e2bd4cb057fb4d2797c27d8d5a /drivers/block
parent8bd0b97e95d378df57938d4773ad674194278ac1 (diff)
[PATCH] random: 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> Cc: <mike.miller@hp.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/cpqarray.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c
index b6ea2f0c7276..79d4184658df 100644
--- a/drivers/block/cpqarray.c
+++ b/drivers/block/cpqarray.c
@@ -410,8 +410,7 @@ static int cpqarray_register_ctlr( int i, struct pci_dev *pdev)
410 } 410 }
411 hba[i]->access.set_intr_mask(hba[i], 0); 411 hba[i]->access.set_intr_mask(hba[i], 0);
412 if (request_irq(hba[i]->intr, do_ida_intr, 412 if (request_irq(hba[i]->intr, do_ida_intr,
413 SA_INTERRUPT|SA_SHIRQ|SA_SAMPLE_RANDOM, 413 SA_INTERRUPT|SA_SHIRQ, hba[i]->devname, hba[i]))
414 hba[i]->devname, hba[i]))
415 { 414 {
416 printk(KERN_ERR "cpqarray: Unable to get irq %d for %s\n", 415 printk(KERN_ERR "cpqarray: Unable to get irq %d for %s\n",
417 hba[i]->intr, hba[i]->devname); 416 hba[i]->intr, hba[i]->devname);
@@ -1036,6 +1035,8 @@ static inline void complete_command(cmdlist_t *cmd, int timeout)
1036 1035
1037 complete_buffers(cmd->rq->bio, ok); 1036 complete_buffers(cmd->rq->bio, ok);
1038 1037
1038 add_disk_randomness(cmd->rq->rq_disk);
1039
1039 DBGPX(printk("Done with %p\n", cmd->rq);); 1040 DBGPX(printk("Done with %p\n", cmd->rq););
1040 end_that_request_last(cmd->rq, ok ? 1 : -EIO); 1041 end_that_request_last(cmd->rq, ok ? 1 : -EIO);
1041} 1042}