Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Alexander Gordeev and committed by
Jon Mason
f220baad 53a788a7

+5 -15
+5 -15
drivers/ntb/ntb_hw.c
··· 1089 1089 if (msix_entries < ndev->limits.msix_cnt) 1090 1090 return -ENOSPC; 1091 1091 1092 - rc = pci_enable_msix(pdev, ndev->msix_entries, msix_entries); 1092 + rc = pci_enable_msix_exact(pdev, ndev->msix_entries, msix_entries); 1093 1093 if (rc < 0) 1094 1094 return rc; 1095 - else if (rc > 0) 1096 - return -ENOSPC; 1097 1095 1098 1096 for (i = 0; i < msix_entries; i++) { 1099 1097 msix = &ndev->msix_entries[i]; ··· 1137 1139 struct msix_entry *msix; 1138 1140 int rc, i; 1139 1141 1140 - retry: 1141 - rc = pci_enable_msix(pdev, ndev->msix_entries, msix_entries); 1142 - if (rc < 0) 1143 - return rc; 1144 - else if (rc > 0) { 1145 - dev_warn(&pdev->dev, 1146 - "Only %d MSI-X vectors. " 1147 - "Limiting the number of queues to that number.\n", 1148 - rc); 1149 - msix_entries = rc; 1150 - goto retry; 1151 - } 1142 + msix_entries = pci_enable_msix_range(pdev, ndev->msix_entries, 1143 + 1, msix_entries); 1144 + if (msix_entries < 0) 1145 + return msix_entries; 1152 1146 1153 1147 for (i = 0; i < msix_entries; i++) { 1154 1148 msix = &ndev->msix_entries[i];