diff options
author | Matt Mackall <mpm@selenic.com> | 2006-06-25 08:47:11 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-25 13:01:00 -0400 |
commit | 8bd0b97e95d378df57938d4773ad674194278ac1 (patch) | |
tree | a3e27bb7eb4006f52da25cc6118395de9c4c27b7 /drivers/block/cciss.c | |
parent | afedfd016a78ea1b678886ab6236acbc7650fcfb (diff) |
[PATCH] random: make CCISS use add_disk_randomness
Disk devices should use the add_disk_randomness API 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/cciss.c')
-rw-r--r-- | drivers/block/cciss.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c index 25c3c4a5da81..e2df9eb6b90d 100644 --- a/drivers/block/cciss.c +++ b/drivers/block/cciss.c | |||
@@ -1221,6 +1221,7 @@ static void cciss_softirq_done(struct request *rq) | |||
1221 | printk("Done with %p\n", rq); | 1221 | printk("Done with %p\n", rq); |
1222 | #endif /* CCISS_DEBUG */ | 1222 | #endif /* CCISS_DEBUG */ |
1223 | 1223 | ||
1224 | add_disk_randomness(rq->rq_disk); | ||
1224 | spin_lock_irqsave(&h->lock, flags); | 1225 | spin_lock_irqsave(&h->lock, flags); |
1225 | end_that_request_last(rq, rq->errors); | 1226 | end_that_request_last(rq, rq->errors); |
1226 | cmd_free(h, cmd,1); | 1227 | cmd_free(h, cmd,1); |
@@ -3152,8 +3153,7 @@ static int __devinit cciss_init_one(struct pci_dev *pdev, | |||
3152 | /* make sure the board interrupts are off */ | 3153 | /* make sure the board interrupts are off */ |
3153 | hba[i]->access.set_intr_mask(hba[i], CCISS_INTR_OFF); | 3154 | hba[i]->access.set_intr_mask(hba[i], CCISS_INTR_OFF); |
3154 | if( request_irq(hba[i]->intr[SIMPLE_MODE_INT], do_cciss_intr, | 3155 | if( request_irq(hba[i]->intr[SIMPLE_MODE_INT], do_cciss_intr, |
3155 | SA_INTERRUPT | SA_SHIRQ | SA_SAMPLE_RANDOM, | 3156 | SA_INTERRUPT | SA_SHIRQ, hba[i]->devname, hba[i])) { |
3156 | hba[i]->devname, hba[i])) { | ||
3157 | printk(KERN_ERR "cciss: Unable to get irq %d for %s\n", | 3157 | printk(KERN_ERR "cciss: Unable to get irq %d for %s\n", |
3158 | hba[i]->intr[SIMPLE_MODE_INT], hba[i]->devname); | 3158 | hba[i]->intr[SIMPLE_MODE_INT], hba[i]->devname); |
3159 | goto clean2; | 3159 | goto clean2; |