summaryrefslogtreecommitdiff
path: root/drivers/ntb
diff options
context:
space:
mode:
authorAlexander Gordeev <agordeev@redhat.com>2014-03-11 17:00:35 +0100
committerJon Mason <jon.mason@intel.com>2014-04-07 10:59:20 -0700
commitf220baad08963a75c78c80cdc1c9e9492ca0eb2a (patch)
tree914fa5001e629ec93ef026d5b4d4c0f584aed06a /drivers/ntb
parent53a788a765b5336bd5ac5935e6d962bcdd281802 (diff)
ntb: Use pci_enable_msix_range() instead of pci_enable_msix()
As result of deprecation of MSI-X/MSI enablement functions pci_enable_msix() and pci_enable_msi_block() all drivers using these two interfaces need to be updated to use the new pci_enable_msi_range() or pci_enable_msi_exact() and pci_enable_msix_range() or pci_enable_msix_exact() interfaces. 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.c20
1 files changed, 5 insertions, 15 deletions
diff --git a/drivers/ntb/ntb_hw.c b/drivers/ntb/ntb_hw.c
index 22a7eb415d76..372e08c4ffef 100644
--- a/drivers/ntb/ntb_hw.c
+++ b/drivers/ntb/ntb_hw.c
@@ -1089,11 +1089,9 @@ static int ntb_setup_snb_msix(struct ntb_device *ndev, int msix_entries)
if (msix_entries < ndev->limits.msix_cnt)
return -ENOSPC;
- rc = pci_enable_msix(pdev, ndev->msix_entries, msix_entries);
+ rc = pci_enable_msix_exact(pdev, ndev->msix_entries, msix_entries);
if (rc < 0)
return rc;
- else if (rc > 0)
- return -ENOSPC;
for (i = 0; i < msix_entries; i++) {
msix = &ndev->msix_entries[i];
@@ -1139,18 +1137,10 @@ static int ntb_setup_bwd_msix(struct ntb_device *ndev, int msix_entries)
struct msix_entry *msix;
int rc, i;
-retry:
- rc = pci_enable_msix(pdev, ndev->msix_entries, msix_entries);
- if (rc < 0)
- return rc;
- else if (rc > 0) {
- dev_warn(&pdev->dev,
- "Only %d MSI-X vectors. "
- "Limiting the number of queues to that number.\n",
- rc);
- msix_entries = rc;
- goto retry;
- }
+ msix_entries = pci_enable_msix_range(pdev, ndev->msix_entries,
+ 1, msix_entries);
+ if (msix_entries < 0)
+ return msix_entries;
for (i = 0; i < msix_entries; i++) {
msix = &ndev->msix_entries[i];