aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/qlogic/netxen
diff options
context:
space:
mode:
authorYijing Wang <wangyijing@huawei.com>2013-08-08 09:02:56 -0400
committerDavid S. Miller <davem@davemloft.net>2013-08-09 16:49:51 -0400
commitb83082e95ecb95b5da9e6c54d4714ea73c49b58d (patch)
tree1c631cfd1b1e705b4e8276427842d1956cade4bd /drivers/net/ethernet/qlogic/netxen
parent40b295625053954f69d6840d59f2b4d8be251ed3 (diff)
netxen: clean up unnecessary MSI/MSI-X capability find
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@huawei.com> Cc: Manish Chopra <manish.chopra@qlogic.com> Cc: Sony Chacko <sony.chacko@qlogic.com> Cc: Rajesh Borundia <rajesh.borundia@qlogic.com> Cc: netdev@vger.kernel.org Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/qlogic/netxen')
-rw-r--r--drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
index c401b0b4353d..1046e9461509 100644
--- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
+++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
@@ -459,16 +459,14 @@ static void netxen_pcie_strap_init(struct netxen_adapter *adapter)
459static void netxen_set_msix_bit(struct pci_dev *pdev, int enable) 459static void netxen_set_msix_bit(struct pci_dev *pdev, int enable)
460{ 460{
461 u32 control; 461 u32 control;
462 int pos;
463 462
464 pos = pci_find_capability(pdev, PCI_CAP_ID_MSIX); 463 if (pdev->msix_cap) {
465 if (pos) { 464 pci_read_config_dword(pdev, pdev->msix_cap, &control);
466 pci_read_config_dword(pdev, pos, &control);
467 if (enable) 465 if (enable)
468 control |= PCI_MSIX_FLAGS_ENABLE; 466 control |= PCI_MSIX_FLAGS_ENABLE;
469 else 467 else
470 control = 0; 468 control = 0;
471 pci_write_config_dword(pdev, pos, control); 469 pci_write_config_dword(pdev, pdev->msix_cap, control);
472 } 470 }
473} 471}
474 472