From f3ce5d8c06621e795cc556ce616ed1ab8b538d33 Mon Sep 17 00:00:00 2001 From: "Stephen M. Cameron" Date: Thu, 27 May 2010 15:13:02 -0500 Subject: [PATCH] --- yaml --- r: 204053 b: refs/heads/master c: 6b3f4c52b29eee17285a6cd57071c9ac7736d172 h: refs/heads/master i: 204051: cb597b8905c926e729e737147a86413d19267e4c v: v3 --- [refs] | 2 +- trunk/drivers/scsi/hpsa.c | 13 ++++--------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 7a66ffe24a61..15e20aba54d6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 85bdbabbd97ff797f91e6ec839ab053776bc72b4 +refs/heads/master: 6b3f4c52b29eee17285a6cd57071c9ac7736d172 diff --git a/trunk/drivers/scsi/hpsa.c b/trunk/drivers/scsi/hpsa.c index 4233b932ef55..66b7dcfb7276 100644 --- a/trunk/drivers/scsi/hpsa.c +++ b/trunk/drivers/scsi/hpsa.c @@ -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++) {