redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

[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>
hifive-unleashed-5.1
Mike Miller 2006-12-06 20:35:13 -08:00 committed by Linus Torvalds
parent 799202cbd0
commit 1ecb9c0f3c
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/block/cciss.c
View File

@ -2788,23 +2788,21 @@ static void __devinit cciss_interrupt_mode(ctlr_info_t *c,
if (err > 0) {
printk(KERN_WARNING "cciss: only %d MSI-X vectors "
"available\n", err);
goto default_int_mode;
} else {
printk(KERN_WARNING "cciss: MSI-X init failed %d\n",
err);
goto default_int_mode;
}
}
if (pci_find_capability(pdev, PCI_CAP_ID_MSI)) {
if (!pci_enable_msi(pdev)) {
c->intr[SIMPLE_MODE_INT] = pdev->irq;
c->msi_vector = 1;
return;
} else {
printk(KERN_WARNING "cciss: MSI init failed\n");
c->intr[SIMPLE_MODE_INT] = pdev->irq;
return;
}
}
default_int_mode:
default_int_mode:
#endif /* CONFIG_PCI_MSI */
/* if we get here we're going to use the default interrupt mode */
c->intr[SIMPLE_MODE_INT] = pdev->irq;