[PATCH 03/16] cciss: clean up unnecessary MSI/MSI-X capability find

[Yijing Wang]

PCI core will initialize device MSI/MSI-X capability in
pci_msi_init_pci_dev(). So device driver should use
pci_dev->msi_cap/msix_cap to determine whether the device
support MSI/MSI-X instead of using
pci_find_capability(pci_dev, PCI_CAP_ID_MSI/MSIX).
Access to PCIe device config space again will consume more time.

Signed-off-by: Yijing Wang <wangyijing@xxxxxxxxxx>
Cc: Mike Miller <mike.miller@xxxxxx>
Cc: iss_storagedev@xxxxxx
Cc: linux-kernel@xxxxxxxxxxxxxxx
---
 drivers/block/cciss.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 62b6c2c..883715a 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -4078,7 +4078,7 @@ static void cciss_interrupt_mode(ctlr_info_t *h)
 	    (h->board_id == 0x40820E11) || (h->board_id == 0x40830E11))
 		goto default_int_mode;
 
-	if (pci_find_capability(h->pdev, PCI_CAP_ID_MSIX)) {
+	if (h->pdev->msix_cap) {
 		err = pci_enable_msix(h->pdev, cciss_msix_entries, 4);
 		if (!err) {
 			h->intr[0] = cciss_msix_entries[0].vector;
@@ -4098,7 +4098,7 @@ static void cciss_interrupt_mode(ctlr_info_t *h)
 			goto default_int_mode;
 		}
 	}
-	if (pci_find_capability(h->pdev, PCI_CAP_ID_MSI)) {
+	if (h->pdev->msi_cap) {
 		if (!pci_enable_msi(h->pdev))
 			h->msi_vector = 1;
 		else
-- 
1.7.1


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/