Commit b4b39061 authored by Alexander Gordeev's avatar Alexander Gordeev Committed by David S. Miller

wil6210: Use pci_enable_msi_range() instead of pci_enable_msi_block()

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: Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
Cc: "John W. Linville" <linville@tuxdriver.com>
Cc: wil6210@qca.qualcomm.com
Cc: netdev@vger.kernel.org
Cc: linux-pci@vger.kernel.org
Acked-by: default avatarVladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c0a1be38
...@@ -41,30 +41,28 @@ static int wil_if_pcie_enable(struct wil6210_priv *wil) ...@@ -41,30 +41,28 @@ static int wil_if_pcie_enable(struct wil6210_priv *wil)
switch (use_msi) { switch (use_msi) {
case 3: case 3:
case 1: case 1:
wil_dbg_misc(wil, "Setup %d MSI interrupts\n", use_msi);
break;
case 0: case 0:
wil_dbg_misc(wil, "MSI interrupts disabled, use INTx\n");
break; break;
default: default:
wil_err(wil, "Invalid use_msi=%d, default to 1\n", wil_err(wil, "Invalid use_msi=%d, default to 1\n", use_msi);
use_msi);
use_msi = 1; use_msi = 1;
} }
wil->n_msi = use_msi;
if (wil->n_msi) { if (use_msi == 3 && pci_enable_msi_range(pdev, 3, 3) < 0) {
wil_dbg_misc(wil, "Setup %d MSI interrupts\n", use_msi); wil_err(wil, "3 MSI mode failed, try 1 MSI\n");
rc = pci_enable_msi_block(pdev, wil->n_msi); use_msi = 1;
if (rc && (wil->n_msi == 3)) { }
wil_err(wil, "3 MSI mode failed, try 1 MSI\n");
wil->n_msi = 1; if (use_msi == 1 && pci_enable_msi(pdev)) {
rc = pci_enable_msi_block(pdev, wil->n_msi); wil_err(wil, "pci_enable_msi failed, use INTx\n");
} use_msi = 0;
if (rc) {
wil_err(wil, "pci_enable_msi failed, use INTx\n");
wil->n_msi = 0;
}
} else {
wil_dbg_misc(wil, "MSI interrupts disabled, use INTx\n");
} }
wil->n_msi = use_msi;
rc = wil6210_init_irq(wil, pdev->irq); rc = wil6210_init_irq(wil, pdev->irq);
if (rc) if (rc)
goto stop_master; goto stop_master;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment