diff options
| author | Alexander Gordeev <agordeev@redhat.com> | 2014-02-21 16:49:30 +0100 |
|---|---|---|
| committer | Jon Mason <jon.mason@intel.com> | 2014-04-07 10:59:19 -0700 |
| commit | 77733513c481d741d997139a1cac5d0d10bf3639 (patch) | |
| tree | 1dbe18d5fbfb38f638284b9d18cf1520ca2a4d0c /drivers/ntb | |
| parent | 53ca4fea0bbe966b3123509125898b286a136f47 (diff) | |
| download | linux-77733513c481d741d997139a1cac5d0d10bf3639.tar.gz linux-77733513c481d741d997139a1cac5d0d10bf3639.tar.bz2 linux-77733513c481d741d997139a1cac5d0d10bf3639.zip | |
ntb: Use pci_msix_vec_count() to obtain number of MSI-Xs
Signed-off-by: Alexander Gordeev <agordeev@redhat.com>
Signed-off-by: Jon Mason <jon.mason@intel.com>
Diffstat (limited to 'drivers/ntb')
| -rw-r--r-- | drivers/ntb/ntb_hw.c | 15 | ||||
| -rw-r--r-- | drivers/ntb/ntb_hw.h | 2 |
2 files changed, 4 insertions, 13 deletions
diff --git a/drivers/ntb/ntb_hw.c b/drivers/ntb/ntb_hw.c index eba1ed58471d..06d605c6f362 100644 --- a/drivers/ntb/ntb_hw.c +++ b/drivers/ntb/ntb_hw.c @@ -1086,19 +1086,12 @@ static int ntb_setup_msix(struct ntb_device *ndev) struct msix_entry *msix; int msix_entries; int rc, i; - u16 val; - if (!pdev->msix_cap) { - rc = -EIO; - goto err; - } - - rc = pci_read_config_word(pdev, pdev->msix_cap + PCI_MSIX_FLAGS, &val); - if (rc) + msix_entries = pci_msix_vec_count(pdev); + if (msix_entries < 0) { + rc = msix_entries; goto err; - - msix_entries = msix_table_size(val); - if (msix_entries > ndev->limits.msix_cnt) { + } else if (msix_entries > ndev->limits.msix_cnt) { rc = -EINVAL; goto err; } diff --git a/drivers/ntb/ntb_hw.h b/drivers/ntb/ntb_hw.h index 923a0fbb0eb8..465517b7393e 100644 --- a/drivers/ntb/ntb_hw.h +++ b/drivers/ntb/ntb_hw.h @@ -61,8 +61,6 @@ #define PCI_DEVICE_ID_INTEL_NTB_SS_HSX 0x2F0F #define PCI_DEVICE_ID_INTEL_NTB_B2B_BWD 0x0C4E -#define msix_table_size(control) ((control & PCI_MSIX_FLAGS_QSIZE)+1) - #ifndef readq static inline u64 readq(void __iomem *addr) { |