cciss: make sure we request the performant mode irq

Make sure we register the performant mode interrupt Another blunder.
Seemed to work because the call to put_controller_into_performant_mode was
never called.

Signed-off-by: Mike Miller <mike.miller@hp.com>
Cc: Stephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>

diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 5e215ff..4f59f03 100644 (file)
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -4483,18 +4483,18 @@ static int __devinit cciss_init_one(struct pci_dev *pdev,
        /* make sure the board interrupts are off */
        hba[i]->access.set_intr_mask(hba[i], CCISS_INTR_OFF);
        if (hba[i]->msi_vector || hba[i]->msix_vector) {
-               if (request_irq(hba[i]->intr[SIMPLE_MODE_INT],
+               if (request_irq(hba[i]->intr[PERF_MODE_INT],
                                do_cciss_msix_intr,
                                IRQF_DISABLED, hba[i]->devname, hba[i])) {
                        printk(KERN_ERR "cciss: Unable to get irq %d for %s\n",
-                              hba[i]->intr[SIMPLE_MODE_INT], hba[i]->devname);
+                              hba[i]->intr[PERF_MODE_INT], hba[i]->devname);
                        goto clean2;
                }
        } else {
-               if (request_irq(hba[i]->intr[SIMPLE_MODE_INT], do_cciss_intx,
+               if (request_irq(hba[i]->intr[PERF_MODE_INT], do_cciss_intx,
                                IRQF_DISABLED, hba[i]->devname, hba[i])) {
                        printk(KERN_ERR "cciss: Unable to get irq %d for %s\n",
-                              hba[i]->intr[SIMPLE_MODE_INT], hba[i]->devname);
+                              hba[i]->intr[PERF_MODE_INT], hba[i]->devname);
                        goto clean2;
                }
        }