aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block/cciss.c
diff options
context:
space:
mode:
authorMike Miller <mike.miller@hp.com>2006-12-06 23:35:13 -0500
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-07 11:39:30 -0500
commit1ecb9c0f3c9ef6af77c39a9f584940691847ccf4 (patch)
treec65c2e0315e04de6d57b8eb75a19b79cfdf1c072 /drivers/block/cciss.c
parent799202cbd0ef6a201446d99fcbd78b9f0bda6ae5 (diff)
[PATCH] cciss: cleanup cciss_interrupt mode
A pretty simple cleanup for cciss_interrupt_mode. Signed-off-by: Mike Miller <mike.miller@hp.com> Cc: Jens Axboe <jens.axboe@oracle.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.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index c99cb7ed57f7..892e092afe9a 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -2788,23 +2788,21 @@ static void __devinit cciss_interrupt_mode(ctlr_info_t *c,
2788 if (err > 0) { 2788 if (err > 0) {
2789 printk(KERN_WARNING "cciss: only %d MSI-X vectors " 2789 printk(KERN_WARNING "cciss: only %d MSI-X vectors "
2790 "available\n", err); 2790 "available\n", err);
2791 goto default_int_mode;
2791 } else { 2792 } else {
2792 printk(KERN_WARNING "cciss: MSI-X init failed %d\n", 2793 printk(KERN_WARNING "cciss: MSI-X init failed %d\n",
2793 err); 2794 err);
2795 goto default_int_mode;
2794 } 2796 }
2795 } 2797 }
2796 if (pci_find_capability(pdev, PCI_CAP_ID_MSI)) { 2798 if (pci_find_capability(pdev, PCI_CAP_ID_MSI)) {
2797 if (!pci_enable_msi(pdev)) { 2799 if (!pci_enable_msi(pdev)) {
2798 c->intr[SIMPLE_MODE_INT] = pdev->irq;
2799 c->msi_vector = 1; 2800 c->msi_vector = 1;
2800 return;
2801 } else { 2801 } else {
2802 printk(KERN_WARNING "cciss: MSI init failed\n"); 2802 printk(KERN_WARNING "cciss: MSI init failed\n");
2803 c->intr[SIMPLE_MODE_INT] = pdev->irq;
2804 return;
2805 } 2803 }
2806 } 2804 }
2807 default_int_mode: 2805default_int_mode:
2808#endif /* CONFIG_PCI_MSI */ 2806#endif /* CONFIG_PCI_MSI */
2809 /* if we get here we're going to use the default interrupt mode */ 2807 /* if we get here we're going to use the default interrupt mode */
2810 c->intr[SIMPLE_MODE_INT] = pdev->irq; 2808 c->intr[SIMPLE_MODE_INT] = pdev->irq;