Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ecb9c0f authored by Mike Miller's avatar Mike Miller Committed by Linus Torvalds
Browse files

[PATCH] cciss: cleanup cciss_interrupt mode 



A pretty simple cleanup for cciss_interrupt_mode.

Signed-off-by: default avatarMike Miller <mike.miller@hp.com>
Cc: Jens Axboe <jens.axboe@oracle.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 799202cb

drivers/block/cciss.c

+3 −5
Original line number Diff line number Diff line
@@ -2788,20 +2788,18 @@ 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: