[PATCH 11/8] cciss: cleanups for cciss_interrupt_mode

[Mike Miller (OS Dev)]

PATCH 11 of 8

Sorry for messed up sequence. This is the last of this patch set.
This patch is a cleanup for cciss_interrupt_mode.
Please consider this for inclusion.

Thanks,
mikem

Signed-off-by: Mike Miller <mike.miller@xxxxxx>

 cciss.c |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)
--------------------------------------------------------------------------------
diff -urNp linux-2.6-p00010/drivers/block/cciss.c linux-2.6-p00011/drivers/block/cciss.c
--- linux-2.6-p00010/drivers/block/cciss.c	2006-11-02 09:54:35.000000000 -0600
+++ linux-2.6-p00011/drivers/block/cciss.c	2006-11-02 10:03:47.000000000 -0600
@@ -2785,23 +2785,21 @@ static void __devinit cciss_interrupt_mo
 		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;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/