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

Commit fc1d0bf1 authored by Alexander Gordeev's avatar Alexander Gordeev Committed by David S. Miller
Browse files

cxgb3: 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() and pci_enable_msix_range()
interfaces.

Signed-off-by: default avatarAlexander Gordeev <agordeev@redhat.com>
Cc: Santosh Raspatur <santosh@chelsio.com>
Cc: netdev@vger.kernel.org
Cc: linux-pci@vger.kernel.org
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c0b25516

drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c

+9 −14
Original line number Diff line number Diff line
@@ -3088,27 +3088,22 @@ static int cxgb_enable_msix(struct adapter *adap) 
{

	struct msix_entry entries[SGE_QSETS + 1];

	int vectors;

	int i, err;

	int i;



	vectors = ARRAY_SIZE(entries);

	for (i = 0; i < vectors; ++i)

		entries[i].entry = i;



	while ((err = pci_enable_msix(adap->pdev, entries, vectors)) > 0)

		vectors = err;



	if (!err && vectors < (adap->params.nports + 1)) {

		pci_disable_msix(adap->pdev);

		err = -1;

	}

	vectors = pci_enable_msix_range(adap->pdev, entries,

					adap->params.nports + 1, vectors);

	if (vectors < 0)

		return vectors;



	if (!err) {

	for (i = 0; i < vectors; ++i)

		adap->msix_info[i].vec = entries[i].vector;

	adap->msix_nvectors = vectors;

	}



	return err;

	return 0;

}



static void print_port_info(struct adapter *adap, const struct adapter_info *ai)