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

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

qlge: 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: Shahed Shaikh <shahed.shaikh@qlogic.com>
Cc: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>
Cc: Ron Mercer <ron.mercer@qlogic.com>
Cc: linux-driver@qlogic.com
Cc: netdev@vger.kernel.org
Cc: linux-pci@vger.kernel.org
Acked-by: default avatarJitendra Kalsaria <jitendra.kalsaria@qlogic.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7f8358c9

drivers/net/ethernet/qlogic/qlge/qlge_main.c

+4 −11
Original line number Diff line number Diff line
@@ -3331,23 +3331,16 @@ static void ql_enable_msix(struct ql_adapter *qdev) 
		for (i = 0; i < qdev->intr_count; i++)

			qdev->msi_x_entry[i].entry = i;



		/* Loop to get our vectors.  We start with

		 * what we want and settle for what we get.

		 */

		do {

			err = pci_enable_msix(qdev->pdev,

				qdev->msi_x_entry, qdev->intr_count);

			if (err > 0)

				qdev->intr_count = err;

		} while (err > 0);



		err = pci_enable_msix_range(qdev->pdev, qdev->msi_x_entry,

					    1, qdev->intr_count);

		if (err < 0) {

			kfree(qdev->msi_x_entry);

			qdev->msi_x_entry = NULL;

			netif_warn(qdev, ifup, qdev->ndev,

				   "MSI-X Enable failed, trying MSI.\n");

			qlge_irq_type = MSI_IRQ;

		} else if (err == 0) {

		} else {

			qdev->intr_count = err;

			set_bit(QL_MSIX_ENABLED, &qdev->flags);

			netif_info(qdev, ifup, qdev->ndev,

				   "MSI-X Enabled, got %d vectors.\n",