|
@@ -3209,7 +3209,7 @@ static int find_PCI_BAR_index(struct pci_dev *pdev, unsigned long pci_bar_addr)
|
|
|
* controllers that are capable. If not, we use IO-APIC mode.
|
|
|
*/
|
|
|
|
|
|
-static void __devinit hpsa_interrupt_mode(struct ctlr_info *h, u32 board_id)
|
|
|
+static void __devinit hpsa_interrupt_mode(struct ctlr_info *h)
|
|
|
{
|
|
|
#ifdef CONFIG_PCI_MSI
|
|
|
int err;
|
|
@@ -3218,9 +3218,8 @@ static void __devinit hpsa_interrupt_mode(struct ctlr_info *h, u32 board_id)
|
|
|
};
|
|
|
|
|
|
/* Some boards advertise MSI but don't really support it */
|
|
|
- if ((board_id == 0x40700E11) ||
|
|
|
- (board_id == 0x40800E11) ||
|
|
|
- (board_id == 0x40820E11) || (board_id == 0x40830E11))
|
|
|
+ if ((h->board_id == 0x40700E11) || (h->board_id == 0x40800E11) ||
|
|
|
+ (h->board_id == 0x40820E11) || (h->board_id == 0x40830E11))
|
|
|
goto default_int_mode;
|
|
|
if (pci_find_capability(h->pdev, PCI_CAP_ID_MSIX)) {
|
|
|
dev_info(&h->pdev->dev, "MSIX\n");
|
|
@@ -3317,11 +3316,7 @@ static int __devinit hpsa_pci_init(struct ctlr_info *h)
|
|
|
"cannot obtain PCI resources, aborting\n");
|
|
|
return err;
|
|
|
}
|
|
|
-
|
|
|
- /* If the kernel supports MSI/MSI-X we will try to enable that,
|
|
|
- * else we use the IO-APIC interrupt assigned to us by system ROM.
|
|
|
- */
|
|
|
- hpsa_interrupt_mode(h, h->board_id);
|
|
|
+ hpsa_interrupt_mode(h);
|
|
|
|
|
|
/* find the memory BAR */
|
|
|
for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) {
|