Merge mulgrave-w:git/scsi-misc-2.6

[pandora-kernel.git] / drivers / scsi / megaraid / megaraid_sas.c

diff --git a/drivers/scsi/megaraid/megaraid_sas.c b/drivers/scsi/megaraid/megaraid_sas.c
index 3e6f9fe..4cab5b5 100644 (file)
--- a/drivers/scsi/megaraid/megaraid_sas.c
+++ b/drivers/scsi/megaraid/megaraid_sas.c
@@ -53,31 +53,15 @@ MODULE_DESCRIPTION("LSI Logic MegaRAID SAS Driver");
  */
 static struct pci_device_id megasas_pci_table[] = {
 
-       {
-        PCI_VENDOR_ID_LSI_LOGIC,
-        PCI_DEVICE_ID_LSI_SAS1064R, /* xscale IOP */
-        PCI_ANY_ID,
-        PCI_ANY_ID,
-        },
-       {
-        PCI_VENDOR_ID_LSI_LOGIC,
-        PCI_DEVICE_ID_LSI_SAS1078R, /* ppc IOP */
-        PCI_ANY_ID,
-        PCI_ANY_ID,
-       },
-       {
-        PCI_VENDOR_ID_LSI_LOGIC,
-        PCI_DEVICE_ID_LSI_VERDE_ZCR,   /* xscale IOP, vega */
-        PCI_ANY_ID,
-        PCI_ANY_ID,
-        },
-       {
-        PCI_VENDOR_ID_DELL,
-        PCI_DEVICE_ID_DELL_PERC5, /* xscale IOP */
-        PCI_ANY_ID,
-        PCI_ANY_ID,
-        },
-       {0}                     /* Terminating entry */
+       {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_SAS1064R)},
+       /* xscale IOP */
+       {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_SAS1078R)},
+       /* ppc IOP */
+       {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_VERDE_ZCR)},
+       /* xscale IOP, vega */
+       {PCI_DEVICE(PCI_VENDOR_ID_DELL, PCI_DEVICE_ID_DELL_PERC5)},
+       /* xscale IOP */
+       {}
 };
 
 MODULE_DEVICE_TABLE(pci, megasas_pci_table);
@@ -2207,7 +2191,7 @@ megasas_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
        /*
         * Register IRQ
         */
-       if (request_irq(pdev->irq, megasas_isr, SA_SHIRQ, "megasas", instance)) {
+       if (request_irq(pdev->irq, megasas_isr, IRQF_SHARED, "megasas", instance)) {
                printk(KERN_DEBUG "megasas: Failed to register IRQ\n");
                goto fail_irq;
        }
@@ -2854,7 +2838,7 @@ static int __init megasas_init(void)
        /*
         * Register ourselves as PCI hotplug module
         */
-       rval = pci_module_init(&megasas_pci_driver);
+       rval = pci_register_driver(&megasas_pci_driver);
 
        if (rval) {
                printk(KERN_DEBUG "megasas: PCI hotplug regisration failed \n");