niu: 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: Alexander Gordeev <agordeev@redhat.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Jingoo Han <jg1.han@samsung.com>
Cc: netdev@vger.kernel.org
Cc: linux-pci@vger.kernel.org
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/sun/niu.c b/drivers/net/ethernet/sun/niu.c
index 8e2266e1f26070614559c12d5d5de50281aad813..79606f47a08e0989396203e5ba54485dba33a04f 100644 (file)
--- a/drivers/net/ethernet/sun/niu.c
+++ b/drivers/net/ethernet/sun/niu.c
@@ -9041,7 +9041,7 @@ static void niu_try_msix(struct niu *np, u8 *ldg_num_map)
        struct msix_entry msi_vec[NIU_NUM_LDG];
        struct niu_parent *parent = np->parent;
        struct pci_dev *pdev = np->pdev;
-       int i, num_irqs, err;
+       int i, num_irqs;
        u8 first_ldg;
 
        first_ldg = (NIU_NUM_LDG / parent->num_ports) * np->port;
@@ -9053,21 +9053,16 @@ static void niu_try_msix(struct niu *np, u8 *ldg_num_map)
                    (np->port == 0 ? 3 : 1));
        BUG_ON(num_irqs > (NIU_NUM_LDG / parent->num_ports));
 
-retry:
        for (i = 0; i < num_irqs; i++) {
                msi_vec[i].vector = 0;
                msi_vec[i].entry = i;
        }
 
-       err = pci_enable_msix(pdev, msi_vec, num_irqs);
-       if (err < 0) {
+       num_irqs = pci_enable_msix_range(pdev, msi_vec, 1, num_irqs);
+       if (num_irqs < 0) {
                np->flags &= ~NIU_FLAGS_MSIX;
                return;
        }
-       if (err > 0) {
-               num_irqs = err;
-               goto retry;
-       }
 
        np->flags |= NIU_FLAGS_MSIX;
        for (i = 0; i < num_irqs; i++)