From: Mike Miller Date: Thu, 7 Dec 2006 04:35:13 +0000 (-0800) Subject: [PATCH] cciss: cleanup cciss_interrupt mode X-Git-Tag: v3.12-rc1~32283^2~14^2~255 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1ecb9c0f3c9ef6af77c39a9f584940691847ccf4;p=kernel%2Fkernel-generic.git [PATCH] cciss: cleanup cciss_interrupt mode A pretty simple cleanup for cciss_interrupt_mode. Signed-off-by: Mike Miller Cc: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c index c99cb7e..892e092 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, 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;