Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f220baad authored by Alexander Gordeev's avatar Alexander Gordeev Committed by Jon Mason
Browse files

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: default avatarAlexander Gordeev <agordeev@redhat.com>
Signed-off-by: default avatarJon Mason <jon.mason@intel.com>
parent 53a788a7

drivers/ntb/ntb_hw.c

+5 −15
Original line number Diff line number Diff line
@@ -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];